[tor-commits] [translation/vidalia] Update translations for vidalia

translation at torproject.org translation at torproject.org
Thu Mar 22 09:16:07 UTC 2012


commit 54719d27b43c689260ab4694a97f433558ce253c
Author: Translation commit bot <translation at torproject.org>
Date:   Thu Mar 22 09:16:05 2012 +0000

    Update translations for vidalia
---
 ar/vidalia_ar.po       |  109 +++++++++++++++++++++++++++++++-----------------
 bg/vidalia_bg.po       |  109 +++++++++++++++++++++++++++++++-----------------
 ca/vidalia_ca.po       |  107 ++++++++++++++++++++++++++++++-----------------
 ca_ES/vidalia_ca_ES.po |   99 ++++++++++++++++++++++++++++---------------
 cs/vidalia_cs.po       |  109 +++++++++++++++++++++++++++++++-----------------
 cy/vidalia_cy.po       |   99 ++++++++++++++++++++++++++++---------------
 da/vidalia_da.po       |  109 +++++++++++++++++++++++++++++++-----------------
 de/vidalia_de.po       |  109 +++++++++++++++++++++++++++++++-----------------
 el/vidalia_el.po       |  109 +++++++++++++++++++++++++++++++-----------------
 eo/vidalia_eo.po       |  103 +++++++++++++++++++++++++++++----------------
 es/vidalia_es.po       |  109 +++++++++++++++++++++++++++++++-----------------
 eu/vidalia_eu.po       |  109 +++++++++++++++++++++++++++++++-----------------
 fa/vidalia_fa.po       |  109 +++++++++++++++++++++++++++++++-----------------
 fi/vidalia_fi.po       |  107 ++++++++++++++++++++++++++++++-----------------
 fr/vidalia_fr.po       |  109 +++++++++++++++++++++++++++++++-----------------
 gu/vidalia_gu.po       |   99 ++++++++++++++++++++++++++++---------------
 he/vidalia_he.po       |  107 ++++++++++++++++++++++++++++++-----------------
 hi/vidalia_hi.po       |   99 ++++++++++++++++++++++++++++---------------
 hr_HR/vidalia_hr_HR.po |  109 +++++++++++++++++++++++++++++++-----------------
 hu/vidalia_hu.po       |  109 +++++++++++++++++++++++++++++++-----------------
 ia/vidalia_ia.po       |   99 ++++++++++++++++++++++++++++---------------
 id/vidalia_id.po       |  107 ++++++++++++++++++++++++++++++-----------------
 is/vidalia_is.po       |   99 ++++++++++++++++++++++++++++---------------
 it/vidalia_it.po       |  109 +++++++++++++++++++++++++++++++-----------------
 ja/vidalia_ja.po       |   99 ++++++++++++++++++++++++++++---------------
 ko/vidalia_ko.po       |  109 +++++++++++++++++++++++++++++++-----------------
 ko_KR/vidalia_ko_KR.po |  103 +++++++++++++++++++++++++++++----------------
 my/vidalia_my.po       |   99 ++++++++++++++++++++++++++++---------------
 nb/vidalia_nb.po       |  107 ++++++++++++++++++++++++++++++-----------------
 nl/vidalia_nl.po       |  109 +++++++++++++++++++++++++++++++-----------------
 pl/vidalia_pl.po       |  107 ++++++++++++++++++++++++++++++-----------------
 pt/vidalia_pt.po       |  109 +++++++++++++++++++++++++++++++-----------------
 pt_BR/vidalia_pt_BR.po |  109 +++++++++++++++++++++++++++++++-----------------
 ro/vidalia_ro.po       |  107 ++++++++++++++++++++++++++++++-----------------
 ru/vidalia_ru.po       |  109 +++++++++++++++++++++++++++++++-----------------
 sk/vidalia_sk.po       |  109 +++++++++++++++++++++++++++++++-----------------
 sq/vidalia_sq.po       |   99 ++++++++++++++++++++++++++++---------------
 sr/vidalia_sr.po       |  107 ++++++++++++++++++++++++++++++-----------------
 sv/vidalia_sv.po       |  107 ++++++++++++++++++++++++++++++-----------------
 templates/vidalia.pot  |  109 +++++++++++++++++++++++++++++++-----------------
 th/vidalia_th.po       |   99 ++++++++++++++++++++++++++++---------------
 tr/vidalia_tr.po       |  107 ++++++++++++++++++++++++++++++-----------------
 uk/vidalia_uk.po       |   99 ++++++++++++++++++++++++++++---------------
 vi/vidalia_vi.po       |   99 ++++++++++++++++++++++++++++---------------
 zh_CN/vidalia_zh_CN.po |  107 ++++++++++++++++++++++++++++++-----------------
 zh_TW/vidalia_zh_TW.po |   99 ++++++++++++++++++++++++++++---------------
 46 files changed, 3138 insertions(+), 1712 deletions(-)

diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po
index 4cba210..f114dd1 100644
--- a/ar/vidalia_ar.po
+++ b/ar/vidalia_ar.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Ahmad LuvSy <donotplay at hotmail.ca>, 2012.
 # IBRAHIM <mradonadiego at hotmail.fr>, 2011.
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Mohammed Al-Doub <voulnet at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -206,6 +206,13 @@ msgstr "جهز محطة التحكم آليًّا"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -231,6 +238,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "ڤيداليا لم يتمكن من تحميل ملف ترجمة اللغة المحدد."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "منذ:"
@@ -1756,10 +1780,6 @@ msgid "Connected to the Tor network!"
 msgstr "تم الاتصال بشبكة تور"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "لم بتم التعرف على حالة بدء التشغيل"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "متفرقات"
 
@@ -2071,6 +2091,24 @@ msgid ""
 msgstr "كل شيء يتم إرساله عن طريق هذا الاتصال تمكن مراقبته، الرجاء التحقق من إعدادات التطبيق واستخدام بروتوكولات مشفرة فقط، مثل SSL، إن كان هذا ممكناً"
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "يتم تشغيل torrc من %1 إلى %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(عميل تلنت على ما يبدو)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(عميل بريد إلكتروني على ما يبدو)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "يبدو أن أحد برامجك %1 يتصل بطريقة غير مشفرة ولا آمنة بالمحطة %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "فشل (%1)"
 
@@ -2081,8 +2119,19 @@ msgid ""
 msgstr "جار إيقاف تحويلتك.\nيرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "يتم تشغيل torrc من %1 إلى %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2098,20 +2147,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "وجد ڤيداليا أن برمجية تور توقفت عن العمل بشكل مفاجئ.\n\nيرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(عميل تلنت على ما يبدو)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(عميل بريد إلكتروني على ما يبدو)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "يبدو أن أحد برامجك %1 يتصل بطريقة غير مشفرة ولا آمنة بالمحطة %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "عُطل في ضبط المُرشِّح"
@@ -2524,14 +2559,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "جسر عاطل"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "معرف الجسر المحدد عاطل"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "نسخ (Ctrl+C)"
 
@@ -2664,13 +2691,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "قبول"
@@ -2848,10 +2875,6 @@ msgid "Run as a client only"
 msgstr "تشغيل كعميل فقط."
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "تمرير تدفقات شبكة تور"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "مدخل التحويلة:"
 
@@ -3096,6 +3119,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "انشر عنوان  الجسر الخاص بي تلقائيا"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "عكس (mirror) دليل التحويلات"
 
diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po
index ec0fd84..28d1b0a 100644
--- a/bg/vidalia_bg.po
+++ b/bg/vidalia_bg.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 #   <svilen79 at gmail.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: raymen <svilen79 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr "Автоматично настройване на Контролния
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Видалия не успя да зареди избраният езиков пакет."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "От:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Свързан с Тор мрежата!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Неразпознат начален статус"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "разнороден"
 
@@ -2065,6 +2085,24 @@ msgid ""
 msgstr "Каквото и да е изпратено по тази връзка може да бъде следено. Моля, провери настройките на програмата и ползвай ако е възможно само криптирани протоколи, като SSH."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Начално стартиране на torrc от %1 до %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(вероятно Телнет)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(вероятно Е-мейл потребител)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Едно от вашите приложения %1 изглежда извършва потенциално некриптирани и несигурни връзки с порт %2"
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "пропаднал (%1)"
 
@@ -2075,8 +2113,19 @@ msgid ""
 msgstr "Препредаването Ви се изключва.\nНатиснете 'Стоп' отново за да спрете препредаването сега."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Начално стартиране на torrc от %1 до %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2092,20 +2141,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Видалия засече, че Тор софтуеъра излезе неочаквано.\n\nМоля, проверете съобщенията с данните за скорошни предупредителни съобщения или съобщения за грешки."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероятно Телнет)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероятно Е-мейл потребител)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Едно от вашите приложения %1 изглежда извършва потенциално некриптирани и несигурни връзки с порт %2"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Грешка при прилагане на филтър"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Недействителен мост"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Определения мостов идентификатор е недействителен."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Копирай (Ctrl+C)"
 
@@ -2658,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "приеми"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Действай само като потребител"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Предавай трафик за Тор мрежата"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Порт за препращане"
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Автоматично разпределяне на моят мостов адрес"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Отражение на препращащата директория"
 
diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po
index 1c024ce..8d013ac 100755
--- a/ca/vidalia_ca.po
+++ b/ca/vidalia_ca.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Gerard Farràs Ballabriga <>, 2012.
 # Josep Sànchez <papapep at gmail.com>, 2012.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: Josep Sànchez <papapep at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ha estat incapaç de carregar el fitxer de llengua especificat."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Des de:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connectats a la xarxa Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estat d'arrencada desconegut"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "miscel·lània"
 
@@ -2065,6 +2085,24 @@ msgid ""
 msgstr "Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, reviseu la configuració de la vostra aplicació i utilitzeu només protocols xifrats, com SSL."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "fallit (%1)"
 
@@ -2075,7 +2113,18 @@ msgid ""
 msgstr "El vostre relé s'està tancant.\nFeu clic un altre cop a \"Atura\" per a aturar el relé."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2092,20 +2141,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia ha detectat que el programari Tor ha abortat inesperadament.\n\nSi us plau, reviseu el fitxer de registre per a avisos recents o missatges d'error."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Error establint filtre"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Pont invàlid"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identificador especificat de pont no és vàlid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copia (Ctrl+C)"
 
@@ -2658,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accepta"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribueix de manera automàtica l'adreça del meu pont"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/ca_ES/vidalia_ca_ES.po b/ca_ES/vidalia_ca_ES.po
index 790670b..59cc3dc 100644
--- a/ca_ES/vidalia_ca_ES.po
+++ b/ca_ES/vidalia_ca_ES.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Gerard Farràs Ballabriga <>, 2012.
 # Josep Sànchez <papapep at gmail.com>, 2012.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: Josep Sànchez <papapep at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia no ha pogut carregar la traducció de l'idioma que heu triat."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Des de:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2065,45 +2085,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2658,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/cs/vidalia_cs.po b/cs/vidalia_cs.po
index d1fe8fa..8328c25 100644
--- a/cs/vidalia_cs.po
+++ b/cs/vidalia_cs.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: smejicisebestie <smejicisebestie at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr "Nastavit ControlPort automaticky"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nebyl schopen načíst vybraný překlad."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Od:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Připojeno do sítě Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nerozpoznaný stav spuštění"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "různý"
 
@@ -2064,6 +2084,24 @@ msgid ""
 msgstr "Veškerá komunikace přes toto připojení může být monitorováno. Zkontrolujte nastavení aplikace a pokud možno používejte výhradně šifrovaný protokol jako je SSL"
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Konfigurace připojení v torrc pomocí BOOTP od %1 do %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(pravděpodobně Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(pravděpodobně emailový klient)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Zdá se že jedna z Vašich aplikací %1 komunikuje nešifrovaně a nebezpečně na portu %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Selhání (%1)"
 
@@ -2074,8 +2112,19 @@ msgid ""
 msgstr "Váš uzel se vypíná.\nKlikněte na 'Stop' znovu pro okamžité odpojení."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Konfigurace připojení v torrc pomocí BOOTP od %1 do %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2091,20 +2140,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia zaznamenala neočekávané ukončení Tor software.\n\nZkontrolujte poslední varovné a chybové zprávy v logu."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(pravděpodobně Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(pravděpodobně emailový klient)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Zdá se že jedna z Vašich aplikací %1 komunikuje nešifrovaně a nebezpečně na portu %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Chyba Nastaveni Filtru"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Neplatný most"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Uvedený identifikátor mostu je neplatný"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopírovat (Ctrl+C)"
 
@@ -2657,13 +2684,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "prijmout"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Pracovat pouze jako klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Prenos dat pro sit Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Uzel portu"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automatická distribuce adresy mého mostu"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Sdílet adresář uzlu"
 
diff --git a/cy/vidalia_cy.po b/cy/vidalia_cy.po
index 40f8267..34ef2a8 100644
--- a/cy/vidalia_cy.po
+++ b/cy/vidalia_cy.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # cymro <markives at hotmail.co.uk>, 2011.
 #   <demonuk9 at gmail.com>, 2012.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: PoopZemli <demonuk9 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ers:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2065,45 +2085,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2658,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/da/vidalia_da.po b/da/vidalia_da.po
index 97ad9a2..e661afb 100644
--- a/da/vidalia_da.po
+++ b/da/vidalia_da.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Aputsiaq Janussen <aputtu at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: OliverMller <theoliver at live.co.uk>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "Konfigurer KontrolPort Automatisk"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunne ikke hente det valgte sprog"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Siden:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Forbundet til Tor netværket!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ukendt startop status"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diverse"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Alt som sendes over denne forbindelse vil kunne overvåges. Tjek venligst din applikations konfiguration og brug kun krypterede protokoller, såsom SSL, om muligt."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootsstrapper torrc fra %1 til %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(måske Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(måske en email klient)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "En af dine applikationer %1 synes at være ved at lave en potentielt ukrypteret og usikre forbindelse til port %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "mislykkedes (%1)"
 
@@ -2076,8 +2114,19 @@ msgid ""
 msgstr "Deres relæ er ved at lukke. \nKlik på 'Stop' igen for at stoppe din relæ nu."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootsstrapper torrc fra %1 til %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia registrerede at Tor-softwaren uventet blev afsluttet.\n\nTjek venligst beskedloggen for seneste advarsler eller fejlbeskeder."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(måske Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(måske en email klient)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "En af dine applikationer %1 synes at være ved at lave en potentielt ukrypteret og usikre forbindelse til port %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Fejl ved Indstilling af Filter"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ugyldig Bro"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den angivne bro identifikator er ikke gyldigt."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopier (Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "godkend"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Kør kun som en klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relæ trafik til Tor netværket"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Relæ Port:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuer automatisk min bro-adresse"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spejl relækataloget"
 
diff --git a/de/vidalia_de.po b/de/vidalia_de.po
index 09fcd4d..fda5b25 100644
--- a/de/vidalia_de.po
+++ b/de/vidalia_de.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # bastik <bastik.tor at googlemail.com>, 2011.
 # cosimacosa <leccefv at libero.it>, 2011.
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-01 18:56+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: K0L0M4N <koloman375 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -203,6 +203,13 @@ msgstr "Konfiguriere den Kontroll-Port automatisch."
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -228,6 +235,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia konnte die gewählte Sprache nicht laden."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Seit:"
@@ -1753,10 +1777,6 @@ msgid "Connected to the Tor network!"
 msgstr "Verbindung zum Tor-Netzwerk hergestellt!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nicht erkannter Startzustand"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "Verschiedenes"
 
@@ -2068,6 +2088,24 @@ msgid ""
 msgstr "Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie wenn möglich nur verschlüsselte Protokolle wie SSL. "
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc von %1 zu %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(vermutlich Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(vermutlich ein Email Client)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "fehlgeschlagen (%1)"
 
@@ -2078,8 +2116,19 @@ msgid ""
 msgstr "Ihr Relais wird beendet.\nKlicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc von %1 zu %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2095,20 +2144,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia entdeckte dass Tor unerwartet beendet wurde.\n\nBitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(vermutlich Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(vermutlich ein Email Client)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Fehler beim Setzen des Filters"
@@ -2521,14 +2556,6 @@ msgid "Ctrl+F"
 msgstr "Strg+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ungültige Brücke"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Die angegebene Brücke ist nicht gültig."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopieren (Strg+C)"
 
@@ -2661,13 +2688,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "annehmen"
@@ -2845,10 +2872,6 @@ msgid "Run as a client only"
 msgstr "Benutze Tor nur als Client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Verkehr für das Tor-Netzwerk weiterleiten"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Verteiler-Port:"
 
@@ -3093,6 +3116,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Meine Bridge-Adresse automatisch verteilen"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spiegele das Relay Verzeichnis"
 
diff --git a/el/vidalia_el.po b/el/vidalia_el.po
index f0e2d1b..43123fe 100755
--- a/el/vidalia_el.po
+++ b/el/vidalia_el.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <fragos.george at hotmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: anvo <fragos.george at hotmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "Αυτόματη ρύθμιση του ControlPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Αδυναμία φόρτωσης επιλεγμένου αρχείου μετάφρασης."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Από:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Συνδέθηκε στο δίκτυο Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Άγνωστη κατάσταση εκκίνησης"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "διάφορα"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "Ο,τιδήποτε σταλεί μέσω αυτής της σύνδεσης μπορεί να ανασχεθεί. Ελέγξτε τις ρυθμίσεις της εφαρμογής σας και χρησιμοποιή(σ)τε μόνον κρυπτογραφημένα πρωτόκολα, όπως SSL, αν είναι εφικτό."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Ρύθμιση του torrc για εκκίνηση από %1 σε %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(πιθανόν Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(πιθανόν κάποιο πρόγραμμα ηλεκτρονικής αλληλογραφίας)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Κάποια από τις εφαρμογές σας %1 φαίνεται ότι πραγματοποιεί πιθανόν μη κρυπτογραφημένες και ανασφαλείς συνδέσεις στην θήρα %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "απέτυχε (%1)"
 
@@ -2077,8 +2115,19 @@ msgid ""
 msgstr "Ο αναμεταδότης σας πρόκειται να κλείσει.\nΠατήστε 'Stop' ξανά για να διακόψετε τον αναμεταδότη σας τώρα."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ρύθμιση του torrc για εκκίνηση από %1 σε %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Το Vidalia διαπίστωσε ότι το Tor τερμάτισε αναπάντεχα.\nΕλέγξτε τα μηνύματα καταγραφής για πρόσφατες προειδοποιήσεις και μηνύματα σφάλματος."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(πιθανόν Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(πιθανόν κάποιο πρόγραμμα ηλεκτρονικής αλληλογραφίας)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Κάποια από τις εφαρμογές σας %1 φαίνεται ότι πραγματοποιεί πιθανόν μη κρυπτογραφημένες και ανασφαλείς συνδέσεις στην θήρα %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Φίλτρο Ρύθμισης Λαθών"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Μη έγκυρη γέφυρα"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Ο καθορισμένος αριθμός αναγνώρισης της γέφυρας δεν είναι έγκυρος"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Αντιγραφή (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "αποδοχή"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Εκτέλεση μόνο σαν πελάτης"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Αναμετάδωσε κίνηση για το δίκτυο του Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Θύρα σταθμού:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Αυτόματη διανομή της διεύθυνσης του αναμεταδότη μου"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Αντικατοπτρίστε τον Κατάλογο Αναμεταδόσεων"
 
diff --git a/eo/vidalia_eo.po b/eo/vidalia_eo.po
index 8db53e5..14be4a8 100644
--- a/eo/vidalia_eo.po
+++ b/eo/vidalia_eo.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # identity <eeemsi at googlemail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: identity <eeemsi at googlemail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ne povis ŝarĝi la elektitan lingvotradukon."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ekde:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Konektita al Tor-reto"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nerekonita startstato"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diversaĵoj"
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fiaskis (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fiaskis (%1)"
+
+msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/es/vidalia_es.po b/es/vidalia_es.po
index 3da53b6..64b61f7 100644
--- a/es/vidalia_es.po
+++ b/es/vidalia_es.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Daniel Franganillo <dfranganillo at gmail.com>, 2011.
 #   <lenazun at gmail.com>, 2011.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: lenazun <lenazun at gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "Configurar ControlPort automáticamente"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Desde:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "¡Conectado a la red Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicio desconocido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "Miscelánea"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "Cualquier cosa enviada a través de esta conexión puede ser monitoreada. Por favor cheque la configuración de su aplicación e utilize protocolos encriptados, como SSL, si es posible"
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Desencadenando torrc de %1 a %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probablemente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probablemente un cliente de correo electrónico)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Una de sus aplicaciones %1 parece estar estableciendo una conexión potencialmente no cifrada e insegura al puerto %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "falló (%1)"
 
@@ -2077,8 +2115,19 @@ msgid ""
 msgstr "Su repetidor se está deteniendo.\nHaga clic de nuevo en “Detener” para detener ahora su repetidor."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Desencadenando torrc de %1 a %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablemente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probablemente un cliente de correo electrónico)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Una de sus aplicaciones %1 parece estar estableciendo una conexión potencialmente no cifrada e insegura al puerto %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Error configurando filtro"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Puente no válido"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "El identificador de puente especificado no es válido."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiar (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP/HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aceptar"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Ejecutar como sólo cliente"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Repetidor de tráfico para la red Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Puerto repetidor:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuir mi dirección de puente automaticamente"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Replicar el Directorio repetidor"
 
diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po
index 63ef4da..385c0fa 100755
--- a/eu/vidalia_eu.po
+++ b/eu/vidalia_eu.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Antxon Baldarra <baldarra at euskalerria.org>, 2012.
 #   <baldarra at euskalerria.org>, 2011, 2012.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-13 17:21+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: Antxon Baldarra <baldarra at euskalerria.org>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr "ControlPort automatikoki konfiguratu"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidaliak ezin izan du aukeratutako hizkuntza itzulpena kargatu."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Noiztik:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor sarera konektatuta!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Abio egoera ezezaguna"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "hainbat"
 
@@ -2065,6 +2085,24 @@ msgid ""
 msgstr "Konexio honen bitartez bidalitako edozer kontrola daiteke. Mesedez egiaztatu zure aplikazioaren konfigurazioa eta enkriptatutako protokoloak bakarrik erabili, SSL bezala, ahal izanez gero."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "%1 etik %2 ra torrc abio-uhaltzen"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(ziurrenik Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(ziurrenik email bezero bat)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "huts egin du (%1)"
 
@@ -2075,8 +2113,19 @@ msgid ""
 msgstr "Zure errelea itzaltzen ari da orain.\nSakatu 'Gelditu' berriz zure errelea orain gelditzeko."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1 etik %2 ra torrc abio-uhaltzen"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2092,20 +2141,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidaliak Tor softwarea ustekabean irten dela detektatu du.\n\nMesedez begiratu mezu erregistroan azkeneko ohar edo akats mezuak."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(ziurrenik Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(ziurrenik email bezero bat)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Huts Filtroa ezartzerakoan"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ktrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Baliogabeko Zubia"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Zehaztutako zubi identifikatzailea ez da baliogarria."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopiatu (Ktrl+C)"
 
@@ -2658,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "onartu"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Bezero bezala exekutatu"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Errele trafikoa Tor sarearentzat"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Errele Portua:"
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Nire zubi helbidea automatikoki banatu"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Errele Direktorioa ispilatu"
 
diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po
index 106a01d..f80d59c 100644
--- a/fa/vidalia_fa.po
+++ b/fa/vidalia_fa.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Ardeshir  <ardeshir at redteam.io>, 2011, 2012.
 #   <green.dove1388 at gmail.com>, 2011.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-21 03:34+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Ardeshir <ardeshir at redteam.io>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "ControlPort را بصورت خودکار پیکربندی کن"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "ویدالیا قادر به بارگذاری زبان انتخاب شده نبود"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "از زمان:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "وصل شده به شبکه تور"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "وضعیت آغاز نامشخص"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "گوناگون"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "هرآنچه بوسیله این ارتباط فرستاده شود می تواند مانیتور شود. لطفا بتنظیمات برنامه را بررسی کنید و تنها از پروتکل های رمزگذاری شده، از قبیل SSL، در صورت امکان استفاده کنید."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "راه اندازی torrc از %1 به %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(شاید تِل‌نت)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(شاید یک برنامه ایمیل)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "به نظر می‌رسد یکی از برنامه‌های شما %1 در حال برقراری ارتباطی رمزگذاری نشده و ناامن به پورت %2 است"
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "ناموفق(%1)"
 
@@ -2077,8 +2115,19 @@ msgid ""
 msgstr "باز ژخش شما متوقف شده است./n"
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "راه اندازی torrc از %1 به %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "ويداليا يك نسخه از تُر را شناسايي كرده است./n/nلطفا پيغامها را براي خاطاها بررسي كنيد."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(شاید تِل‌نت)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(شاید یک برنامه ایمیل)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "به نظر می‌رسد یکی از برنامه‌های شما %1 در حال برقراری ارتباطی رمزگذاری نشده و ناامن به پورت %2 است"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "خطا در تنظیم فیلتر"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "کنترل + F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "پل نامعتبر"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "شناسه پل مشخص شده معتبر نمیباشد."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "کپی کردن (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "قبول"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "اجراکردن تنها مانند یک کاربر"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "ترافیک بازپخش‌ شده برای شبکه‌ی تُر"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "درگاه بازپخش:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "بطور خودکار آدرس پل من را پخش کن"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "لينكهاي بازپخش فهرست"
 
diff --git a/fi/vidalia_fi.po b/fi/vidalia_fi.po
index 939adbd..84b2072 100644
--- a/fi/vidalia_fi.po
+++ b/fi/vidalia_fi.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <c168298 at rppkn.com>, 2012.
 #   <debris at riseup.net>, 2012.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-11 20:15+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: torre <c168298 at rppkn.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ei onnistunut lataamaan valittua kielikäännöstä."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Alkaen:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Yhdistetty Tor-verkkoon"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Tunnistamaton käynnistystila"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "sekalaiset"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "Kaikkea tämän yhteyden yli lähetettyä voidaan tarkkailla. Tarkista sovelluksesi asetukset ja käytä vain kryptattuja protokollia, kuten SSL:ää, jos mahdollista."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(todennäköisesti Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(todennäköisesti sähköpostiasiakasohjelma)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "epäonnistui (%1)"
 
@@ -2077,7 +2115,18 @@ msgid ""
 msgstr "Välitypalvelimesi on sulkeutumassa. \nNapsauta 'Pysäytä'-nappia uudelleen sulkeaksesi välityspalvelun heti. "
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia havaitsi että Tor ohjelma päättyi odottamatta.\n\nTarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(todennäköisesti Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(todennäköisesti sähköpostiasiakasohjelma)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Virhe Suodatuksen Asettamisessa"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Virheellinen silta"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Määritelty siltahenkilöllisyys on virheellinen."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopioi (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "salli"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Suorita vain asiakasohjelmana"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Välitä tietoa Tor-verkossa"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Reititinportti:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Jaa siltaosoitteeni automaattisesti"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Jaa reititin hakemisto"
 
diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po
index f86736f..e7d6839 100644
--- a/fr/vidalia_fr.po
+++ b/fr/vidalia_fr.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # mehditaileb <mehditaileb at liberte-info.net>, 2011.
 # Pierre Antoine <pierre.antoine at ieee.org>, 2011.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Pierre Antoine <pierre.antoine at ieee.org>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "Configurer le port de contrôle automatiquement"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia n'a pas pu charger la traduction sélectionnée."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Depuis :"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connecté au réseau Tor !"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Etat de lancement inconnu"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "divers"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Tout ce qui sera envoyé à travers cette connexion pourrait être surveillé. Merci de vérifier la configuration de votre application et d'utiliser seulement des protocoles cryptés, tél que SSL, si possible."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Exécution de torrc de %1 à %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probablement Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probably un client de messagerie)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Une de vos applications %1 semble réaliser une connexion non chiffrée au port %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "échec (%1)"
 
@@ -2076,8 +2114,19 @@ msgid ""
 msgstr "Votre relais s'arrête.\nCliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Exécution de torrc de %1 à %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia a détecté que Tor s'est arrêté brutalement.\n\nVeuillez contrôler dans l'historique les derniers messages d'erreur ou d'alerte."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablement Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probably un client de messagerie)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Une de vos applications %1 semble réaliser une connexion non chiffrée au port %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Erreur lors de l'application d'un filtre"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Passerelle invalide"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identifiant de passerelle spécifié est invalide."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copier (Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accepter"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Lancer uniquement comme client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relayer le trafic pour le réseau Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port relais :"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Attribuer automatiquemeny l'adresse de mon bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Héberger une copie du répertoire des relais"
 
diff --git a/gu/vidalia_gu.po b/gu/vidalia_gu.po
index b9ca36e..b48b31a 100755
--- a/gu/vidalia_gu.po
+++ b/gu/vidalia_gu.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/he/vidalia_he.po b/he/vidalia_he.po
index 5464ad6..d07dda7 100644
--- a/he/vidalia_he.po
+++ b/he/vidalia_he.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Amichay P. K. <am1chay.p.k at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: static172 <static.172 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "עשה קונפיגורצייה אוטומטית עבור \"שליטת 
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia לא היתה מסוגלת לטעון את קבצי התרגום המבוקשים."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "מאז:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "מחובר לרשת Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "מצב אתחול לא מזוהה"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "שונות"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "כל מה שנשלח דרך חיבור זה יכול להיות והיה מועקב. אנא בדוק את קונפיגורציית התוכניות שלך והשתמש בפרוטוקולים מוצפנים, כגון SSL, אם מתאפשר."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(יתכן (Telnet"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(כנראה לקוח אימייל)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "נכשל (%1)"
 
@@ -2077,7 +2115,18 @@ msgid ""
 msgstr "הממדר שלך מכובה כעת.\nלחץ \"עצור\" על מנת לעצור אותו מיידית."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia זיהה כי תוכנת Tor נעצרה באופן פתאומי.\n\nאנא בדוק את ארכיון ההודעות למידע נוסף."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(יתכן (Telnet"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(כנראה לקוח אימייל)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "שגיאה בעת קביעת סינון"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "גשר לא תקין"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "מזהה הגשר הנתון אינו תקין."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "העתק (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "קבל"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "הפעל כלקוח בלבד"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "העבר מידע עבור רשת Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "פורט מימסר:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "השתמש במראה עבור תיקיית הממסר"
 
diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po
index c87f9ac..7e5a5c5 100644
--- a/hi/vidalia_hi.po
+++ b/hi/vidalia_hi.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <mayurchanakya at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: mayurchanakya <mayurchanakya at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "विडालिया चुनि गयी भाषा के अनुवाद को लोड करने मे असमर्थ रहा ।"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "पश्चात"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2065,45 +2085,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2658,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/hr_HR/vidalia_hr_HR.po b/hr_HR/vidalia_hr_HR.po
index be77de9..5ed4bfb 100644
--- a/hr_HR/vidalia_hr_HR.po
+++ b/hr_HR/vidalia_hr_HR.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # Armando Vega <synaan at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: Armando Vega <synaan at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr "Automatski podesi KontrolniPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nije bila u mogućnosti učitati odabrani jezični prijevod."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Od:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Spojen na Tor mrežu!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Neraspoznati status pokretanja"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "razno"
 
@@ -2064,6 +2084,24 @@ msgid ""
 msgstr "Sve poslano preko ove veze može biti nadgledano. Molimo provjerite postavke svoje aplikacije i koristite samo šifrirane protokole, poput SSL-a, ukoliko je moguće."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc iz %1 u %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(vjerojatno Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(vjerojatno email klijent)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Jedna od vaših aplikacija %1 čini se pokušava napraviti potencijalno nešifriranu i nesigurnu vezu na port %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "neuspjelo (%1)"
 
@@ -2074,8 +2112,19 @@ msgid ""
 msgstr "Vaš relej je u procesu gašenja.\nKliknite 'Zaustavi' ponovno za trenutno zaustavljanje releja."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc iz %1 u %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2091,20 +2140,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia je detektirala da je Tor neočekivano izašao.\n\nMolimo provjerite dnevnik poruka za nedavna upozorenja i greške."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(vjerojatno Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(vjerojatno email klijent)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Jedna od vaših aplikacija %1 čini se pokušava napraviti potencijalno nešifriranu i nesigurnu vezu na port %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Filter Postavki Grešaka"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Neispravan Most"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Specificirani identifikator mosta nije ispravan."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopiraj (Ctrl+C)"
 
@@ -2657,13 +2684,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "prihvati"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Pokreni samo kao klijent"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relej prometa za Tor mrežu"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port Releja:"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automatski distribuiraj adresu mog mosta"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Zrcali Imenik Releja"
 
diff --git a/hu/vidalia_hu.po b/hu/vidalia_hu.po
index 0d9abf0..1ce144d 100644
--- a/hu/vidalia_hu.po
+++ b/hu/vidalia_hu.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 #   <viktor.varga at gmail.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr "Vezérlőport automatikus konfigurálása"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Nem sikerült a választott nyelvi fordítás betöltése."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ekkortól:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Kapcsolódva a Tor hálózathoz! "
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Felismerhetetlen indítási státusz"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "egyebek"
 
@@ -2065,6 +2085,24 @@ msgid ""
 msgstr "Bármi ami ezen a kapcsolaton keresztül megy ki nyomon követhető. Ellenőrizze az alkalmazás beállításait, és csak titkosított kapcsolatot használjon, például SSL-t ha lehetséges."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Rendszertőltő torrc a %1 -től %2 -ig"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(valószínűleg Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(valószínűleg egy email kliens)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Az alkalmazásai egyike %1 úgy tűnik, hogy egy pontenciálisan titkosítatlan és nem biztonságos kapcsolatot próbál létrehozni a a %2 porton keresztül."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "sikertelen (%1)"
 
@@ -2075,8 +2113,19 @@ msgid ""
 msgstr "Az Elosztó leáll.\nKattintson újra 'Stop'-ra az azonnali leállításhoz."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Rendszertőltő torrc a %1 -től %2 -ig"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2092,20 +2141,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "A Vidalia a Tor szoftver váratlan kilépését észlelte..\n\nKérjük tekintse meg a log üzeneteket az aktuális hibaüzenetekért."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(valószínűleg Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(valószínűleg egy email kliens)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Az alkalmazásai egyike %1 úgy tűnik, hogy egy pontenciálisan titkosítatlan és nem biztonságos kapcsolatot próbál létrehozni a a %2 porton keresztül."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Hiba a szűrő beállításakor"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Érvénytelen Hídkapcsolat"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A megadott Hídkapcsolat azonosító érvénytelen."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Másolás (Ctrl+C)"
 
@@ -2658,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "elfogad"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Csak kliens indítása"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "A Tor hálózat forgalmának közvetítése (Elosztás)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Közvetítő port:"
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "A Hídkapcsolati címem automatikus terjesztése"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Az Elosztó címtár tükrözése"
 
diff --git a/ia/vidalia_ia.po b/ia/vidalia_ia.po
index 01a2413..bad6ba2 100644
--- a/ia/vidalia_ia.po
+++ b/ia/vidalia_ia.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Emilio Sepúlveda <djfunkinmixer at gmail.com>, 2011.
 # Emilio Sepúlveda <emisepulvedam at gmail.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-18 00:00+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: Emilio Sepúlveda <emisepulvedam at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Depost:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2065,45 +2085,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2658,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/id/vidalia_id.po b/id/vidalia_id.po
index a02acd4..6ebf73d 100755
--- a/id/vidalia_id.po
+++ b/id/vidalia_id.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # daweng  <thedaweng at yahoo.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: daweng <thedaweng at yahoo.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia tidak bisa memuat bahasa yang dipilih."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Sejak:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Telah terhubung ke jaringan Tor"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Status startup tidak dikenal"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "aneka"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Segala yang dikirim melalui koneksi ini bisa dipantau. Mohon periksa konfigurasi aplikasi Anda dan hanya menggunakan protokol terenkripsi, seperti SSL, jika memungkinkan."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "gagal (%1)"
 
@@ -2076,7 +2114,18 @@ msgid ""
 msgstr "relay Anda munutup. Klik 'Stop' lagi untuk menghentikan relay Anda sekarang."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia mendeteksi bahwa perangkat lunak Tor keluar tak terduga. Silakan memeriksa log pesan untuk peringatan terbaru atau pesan kesalahan."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Kesalahan Setting Filter"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl + F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Kesalahan Penghubung"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Identifier Penghubung yang ditentukan tidak valid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Salin (Ctrl + C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "terima"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Jalankan hanya sebagai klien"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Lalu lintas relay untuk jaringan Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port Relay:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Secara otomatis mendistribusikan alamat penghubung saya"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Mirror Direktori Relay"
 
diff --git a/is/vidalia_is.po b/is/vidalia_is.po
index e7aef00..6e13a97 100755
--- a/is/vidalia_is.po
+++ b/is/vidalia_is.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia tókst ekki að hlaða inn valdri þýðingu."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Síðan:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/it/vidalia_it.po b/it/vidalia_it.po
index 0d7cb8f..b0ba038 100644
--- a/it/vidalia_it.po
+++ b/it/vidalia_it.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <a.n0on3 at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: n0on3 <a.n0on3 at gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "Configura la porta di controllo automaticamente"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia non è in grado di caricare la traduzione della lingua prescelta"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Dal:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connesso alla rete Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Stato di avvio non riconosciuto"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "varie"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "Ogni dato inviato attraverso questa connessione potrebbe essere monitorato. Si consiglia di controllare la configurazione della propria applicazione e se possibile di usare esclusivamente protocolli crittografici come SSL."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc da %1 a %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probabilmente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probabilmente un programma per le email)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Una delle applicazioni %1 sembra effettuare una connessione non criptata e non sicura verso la porta %2. "
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "fallito (%1)"
 
@@ -2077,8 +2115,19 @@ msgid ""
 msgstr "Il tuo relay si sta spegnendo.\nFai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc da %1 a %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n\nControlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probabilmente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probabilmente un programma per le email)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Una delle applicazioni %1 sembra effettuare una connessione non criptata e non sicura verso la porta %2. "
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Errore nell'impostazione del filtro"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge non valido"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identifier del bridge specificat non è valido."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copia (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accetta"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Usa solo come client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Fai da relay e scambia traffico per la rete Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta relay:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuisci automaticamente l'indirizzo del mio bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Offri un mirror della directory dei relay"
 
diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po
index a150e89..1785fa2 100644
--- a/ja/vidalia_ja.po
+++ b/ja/vidalia_ja.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # まつ  <>, 2012.
 # Chris Harris <praisebe4him at gmail.com>, 2012.
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-25 05:53+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: まつ <>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -203,6 +203,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -228,6 +235,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidaliaは選択された言語データをロードできませんでした。"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "起点:"
@@ -1753,10 +1777,6 @@ msgid "Connected to the Tor network!"
 msgstr "Torネットワークに接続しました!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2068,45 +2088,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2521,14 +2556,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "不正なブリッジ"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "指定されたブリッジ識別子は有効ではありません。"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "コピー (Ctrl+C)"
 
@@ -2661,11 +2688,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2845,10 +2872,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor ネットワークのトラフィックをリレーする"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "リレーのポート:"
 
@@ -3093,6 +3116,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po
index 5584132..386085d 100755
--- a/ko/vidalia_ko.po
+++ b/ko/vidalia_ko.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <contact at imfast.kr>, 2011.
 #   <cwt967 at naver.com>, 2011, 2012.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: cwt96 <cwt967 at naver.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "제어 포트를 자동적으로 설정"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia는 선택된 언어 번역을 읽지 못했습니다."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "since:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor 네트워크에 연결 성공!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "알 수없는 시작 상태"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "잡동사니"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "이 연결을 통해 보낸 아무것이나 모니터링 할 수 있습니다. 가능하면 응용 프로그램의 설정을 확인 SSL (Secure Socket Layer)같은 암호화된 프로토콜 만을 사용하시기 바랍니다."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "%1에서 %2로 부팅 "
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probably Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(아마 이메일 클라이언트)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "응용 프로그램 %1 중 하나는 포트 %2에 잠재적으로 암호화되지 않고 안전하지 않은 연결을 만드는 것 같습니다."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "실패 (%1)"
 
@@ -2076,8 +2114,19 @@ msgid ""
 msgstr "현재 중계가 종료중입니다. 중계를 지금 종료하려면 멈춤 버튼을 다시 눌러주십시오."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1에서 %2로 부팅 "
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia는 Tor가 예기치 못하게 종료된 것을 감지했습니다.\n\n최근의 경고나 오류 메시지를 확인하여 주십시오."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probably Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(아마 이메일 클라이언트)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "응용 프로그램 %1 중 하나는 포트 %2에 잠재적으로 암호화되지 않고 안전하지 않은 연결을 만드는 것 같습니다."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "필터 설정 오류"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "잘못된 브릿지"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "주어진 Bridge 식별자는 불량입니다."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "복사 (Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "동의"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "클라이언트만 작동"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr " Tor 네트워크를 위하여 트래픽을 중계합니다.(추천)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "중계 포트"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "자동적으로 나의 브릿지 주소 배포"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "중계소 목록를 미러"
 
diff --git a/ko_KR/vidalia_ko_KR.po b/ko_KR/vidalia_ko_KR.po
index a86d541..0680841 100644
--- a/ko_KR/vidalia_ko_KR.po
+++ b/ko_KR/vidalia_ko_KR.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <contact at imfast.kr>, 2011.
 #   <cwt967 at naver.com>, 2011.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: SpicaRS <SpicaRS at live.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "고르신 언어 번역을 Vidalia에서 불러올 수 없었어요."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "시작 시간:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor 네트워크에 연결되었어요!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "알려지지 않은 시작 상태"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "기타 요인"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "실패 (%1)"
 
@@ -2076,7 +2114,18 @@ msgid ""
 msgstr "사용자님의 릴레이를 끄고 있어요.\n릴레이를 지금 바로 끄려면 '멈춤'을 다시 눌러 주세요."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Tor 소프트웨어가 예상치 못하게 꺼진 것을 Vidalia에서 감지했어요.\n\n최근 나온 경고나 오류 메시지를 보시려면 메시지 기록을 확인해 주세요."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "필터를 설정하다 오류가 났어요"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "컨트롤+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "잘못된 다리"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "적어주신 다리 식별자는 제대로 된 것이 아니에요."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "복사 (컨트롤+C)"
 
@@ -2659,11 +2686,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "클라이언트로만 돌아가기"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor 네트워크를 위해 트래픽 중계하기"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "중계 포트:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/my/vidalia_my.po b/my/vidalia_my.po
index 2cec212..dfa4dd7 100644
--- a/my/vidalia_my.po
+++ b/my/vidalia_my.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia အေနျဖင့္ေရြးခ်ယ္ထားေသာ ဘာသာစကားအားေဖာ္ျပ၍မရပါ။"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "ကတည္းက:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor Network သို႕ ခ်ိတ္ဆက္မႈရပါသည္ !"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "အသိအမွတ္မျပဳႏုိင္ေသာ စတင္မႈ အေျခအေန"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "အေထြေထြ"
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "မဆီေလ်ာ္ေသာ Bridge"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "ေဖာ္ျပထားေသာ bridge ေဖာ္ျပခ်က္သည္ မဆီေလ်ာ္ပါ"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "ကူးယူရန္  (Ctrl+C)"
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Client ကဲ့သုိ႕သာ အလုပ္လုပ္ေဆာင္ပါ"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor Network အတြက္ Relay traffic"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Relay Port:"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po
index 8ce75d7..8f3b20d 100644
--- a/nb/vidalia_nb.po
+++ b/nb/vidalia_nb.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <kmdl at hotmail.no>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: FreedomIsGreat <kmdl at hotmail.no>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunne ikke laste inn den valgte språkoversettelsen"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Siden:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Koblet til Tor-nettverket!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ukjent oppstartstatus."
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diverse"
 
@@ -2065,6 +2085,24 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "feilet (%1)"
 
@@ -2075,7 +2113,18 @@ msgid ""
 msgstr "Din relé stenges ned.\nTrykk på \"Stopp\" igjen for å stenge din relé nå."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2092,20 +2141,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n\nVennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Feilet ved innstilling av Filter"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ugyldig Bro"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den oppgitte broidentifikatoren er ikke gyldig"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopier (Ctrl+C)"
 
@@ -2658,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aksepter"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Kjør kun som klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Videresend trafikk for Tor-nettverket (Relé)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Reléport:"
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Speil relékatalogen"
 
diff --git a/nl/vidalia_nl.po b/nl/vidalia_nl.po
index 6abc476..24a65b6 100644
--- a/nl/vidalia_nl.po
+++ b/nl/vidalia_nl.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <Erik_Bos at usa.net>, 2011.
 #   <flabber at online.be>, 2011.
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 20:51+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Shondoit Walker <shondoit+transifex at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -204,6 +204,13 @@ msgstr "Configureer ControlPort automatisch"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -229,6 +236,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kon de gekozen taal niet laden."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Sinds:"
@@ -1754,10 +1778,6 @@ msgid "Connected to the Tor network!"
 msgstr "Verbonden met het Tor-netwerk!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Onbekende opstartstatus"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "willekeurig"
 
@@ -2069,6 +2089,24 @@ msgid ""
 msgstr "Alles wat worden verzonden via deze verbinding zou kunnen worden afgeluisterd. Controleer uw applicatie configuratie en gebruik, indien mogelijk, alleen gecodeerde protocollen zoals SSL."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Opstarten van torrc van %1 tot %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(waarschijnlijk Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(waarschijnlijk een e-mail client)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Een van uw applicaties %1 lijkt een potentieel onveilige en niet-versleutelde verbinding met poort %2 te maken."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "mislukt (%1)"
 
@@ -2079,8 +2117,19 @@ msgid ""
 msgstr "Uw relay is aan het afsluiten.\nKlik opnieuw op 'Stop' om uw relay nu te stoppen."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Opstarten van torrc van %1 tot %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2096,20 +2145,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia heeft vastgesteld dat de Tor software onverwacht is afgesloten.\n\nControleert u alstublieft het berichtenlog voor recente waarschuwingen of foutmeldingen."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(waarschijnlijk Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(waarschijnlijk een e-mail client)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Een van uw applicaties %1 lijkt een potentieel onveilige en niet-versleutelde verbinding met poort %2 te maken."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Fout bij Filter Instellen"
@@ -2522,14 +2557,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ongeldige Bridge"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "De opgegeven bridge identificatie is niet geldig."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopieër (Ctrl+C)"
 
@@ -2662,13 +2689,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "toestaan"
@@ -2846,10 +2873,6 @@ msgid "Run as a client only"
 msgstr "Gebruik alleen als client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Herleid verkeer van het Tor-netwerk"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Relay poort:"
 
@@ -3094,6 +3117,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Verdeel automatisch mijn bridge adres"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spiegel van de relay directory"
 
diff --git a/pl/vidalia_pl.po b/pl/vidalia_pl.po
index ec08acd..f1a1565 100644
--- a/pl/vidalia_pl.po
+++ b/pl/vidalia_pl.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <ipjsdfpojsdf at mailinator.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-12 20:39+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: sebthestampede <sebthestampede at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr "Konfiguruj Port Kontrolny automatycznie"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nie mogła wczytać wybranego języka."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Wykres od:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Połączony z siecią Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nierozpoznany stan poczÄ…tkowy"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "różne"
 
@@ -2065,6 +2085,24 @@ msgid ""
 msgstr "Każda informacja przesłana przy użyciu tego połączenia może być monitorowana. Sprawdź ustawienia aplikacji i używaj tylko protokołów szyfrowanych, jak np. SSL, jeśli to możliwe."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(prawdopodobnie Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(pradwopodobnie klient email)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Jedna z uruchomionych aplikacji %1 próbuje nawiązać potencjalnie nieszyfrowane i niebezpieczne połączenie z portem %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "nie powiodło się (%1)"
 
@@ -2075,7 +2113,18 @@ msgid ""
 msgstr "Twój węzeł zostanie wyłączony.\n\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2092,20 +2141,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia wykryła, że Tor nieoczekiwanie zakończył działanie.\n\nProszę sprawdzić logi w celu poznania przyczyny."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(prawdopodobnie Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(pradwopodobnie klient email)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Jedna z uruchomionych aplikacji %1 próbuje nawiązać potencjalnie nieszyfrowane i niebezpieczne połączenie z portem %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "BÅ‚Ä…d ustawiania filtru"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Niepoprawny Węzeł-Most"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Określony identyfikator Węzła-Mostu nie jest poprawny."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopiuj (Ctrl+C)"
 
@@ -2658,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "akceptuj"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Działaj tylko jako klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Udostępnij moje łącze dla sieci Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port węzła:"
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automatycznie udostępniaj mój adres Mostu"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Przechowuj kopię Katalogu Węzłów"
 
diff --git a/pt/vidalia_pt.po b/pt/vidalia_pt.po
index c38f863..2eca31d 100644
--- a/pt/vidalia_pt.po
+++ b/pt/vidalia_pt.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <miguelmacedo at netcabo.pt>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-16 14:22+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Zeca Gatilho <paulo.mosh at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "Configurar automaticamente o ControlPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "O Vidalia não pôde carregar a tradução no idioma seleccionado."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Desde:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectado à rede Tor"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicialização não reconhecido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diversos"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Qualquer coisa enviada por esta ligação pode estar a ser monitorizada. Por favor verifique a configuração da sua aplicação e use apenas protocolos encriptados como o SSL, se possível."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Iniciando torrc de %1 para %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(provavelmente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(provavelmente um cliente de email)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Uma das suas aplicações %1 parece estar a fazer uma potencial conexão desincriptada e insegura ao porto %2"
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Falhou (%1)"
 
@@ -2076,8 +2114,19 @@ msgid ""
 msgstr "O seu retransmissor está a encerrar.\nClique 'Stop' novamente para parar o seu retransmissor agora."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Iniciando torrc de %1 para %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia detectou que o software Tor encerrou inesperadamente.\n\nPor favor, verifique no seu registo de mensagens se há mensagens de aviso ou de erro."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de email)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Uma das suas aplicações %1 parece estar a fazer uma potencial conexão desincriptada e insegura ao porto %2"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Erro na Definição do Filtro"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ponte inválida"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A ponte especificada não é válida."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiar (Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Aceitar"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Executar apenas como cliente"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Retransmitir o tráfego para a rede Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta da Retransmissão:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuir automaticamente o endereço da minha ponte"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Espelhar a Pasta de Retransmissão"
 
diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po
index 0674911..735a970 100644
--- a/pt_BR/vidalia_pt_BR.po
+++ b/pt_BR/vidalia_pt_BR.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <amimyself at live.co.uk>, 2011.
 # daniel  <>, 2012.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-16 14:23+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: yermandu daniel <yermandu at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "Configurar ControlPort automaticamente"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "O Vidalia foi incapaz de carregar a tradução selecionada"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Desde:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectado à rede Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicio não reconhecido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "variados"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "Tudo o que for enviado por esta conexão pode estar sendo monitorado. Por favor, verifique a configuração do seu programa e use somente protocolos encriptados, tais como SSL, se possível.  "
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Inicialização do torrc %1 de %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(provavelmente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(provavelmente um cliente de e-mail)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Um dos seus programas %1 parece estar fazendo uma conexão potencialmente desencriptada e insegura pela porta %2"
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "falha (%1)"
 
@@ -2077,8 +2115,19 @@ msgid ""
 msgstr "Seu condutor está sendo fechado.\nClique em 'Parar' denovo para parar o seu condutor agora."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Inicialização do torrc %1 de %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "O Vidalia detectou que o programa Tor fechou inesperadamente.\n\nPor favor confira o registro de mensagens para avisos ou mensagens de erro recentes."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de e-mail)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Um dos seus programas %1 parece estar fazendo uma conexão potencialmente desencriptada e insegura pela porta %2"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Erro ao configurar filtro"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ponte inválida"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A ponte especificada é invalida."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiar (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aceitar"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Executar somente como cliente"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Encaminhar tráfego para rede Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta do servidor:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuir automaticamente meu endereço de bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Fazer mirror do Diretório de Condutor"
 
diff --git a/ro/vidalia_ro.po b/ro/vidalia_ro.po
index 2b13146..f7ba506 100644
--- a/ro/vidalia_ro.po
+++ b/ro/vidalia_ro.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Cristian Măgherușan-Stanciu <cristi.magherusan at gmail.com>, 2011.
 # Florin Putura <puturaflorin at yahoo.com>, 2011.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Florin Putura <puturaflorin at yahoo.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr "Configurare automată a ControlPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nu a putut încărca traducerea în limba selectată."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Se contorizează din:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectare efectuată cu succes!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Stare necunoscută la pornire"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diverse"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Nu a reuÅŸit (%1)"
 
@@ -2077,7 +2115,18 @@ msgid ""
 msgstr "Releu dvs. se închide \\ n.Faceţi clic pe \"Stop\" din nou pentru a opri releu acum."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia a detecetat că programul Tor s-a oprit neasteptat.\n\nTe rog verifică mesajele pentru o avertizare sau o eroare."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Eroare la setarea filtrului"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge invalid"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Identificatorul specificat al bridge-ului nu este valid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiază (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "acceptă"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Rulează doar ca şi client."
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Contribuie la reţeaua Tor acţionând ca un relay pentru trafic"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Portul relay-ului:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuie automat adresa mea de bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Reflecta Directorul cu Relay-ul"
 
diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po
index fb21982..0d47193 100644
--- a/ru/vidalia_ru.po
+++ b/ru/vidalia_ru.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # axe <axe.rode at ymail.com>, 2011.
 #   <liquixis at gmail.com>, 2012.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: liquixis <liquixis at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "Настроить ControlPort автоматически"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Hе удалось загрузить выбранный язык перевода."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Со времени:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Подключен к сети Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Нераспознанный статус запуска"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "pазное"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Любая информация отправленная через это это соединение может быть просмотрена. Пожалуйста, проверьте настройки вашей программы и используйте только шифрующие протоколы, типа SSL, если это возможно."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Начальная загрузка Tor от %1 до %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(вероятно Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(вероятно email клиент)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Похоже, что одно из ваших приложений %1 создает потенциально не зашифрованное и небезопасное соединение на порт %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "не удалось (%1)"
 
@@ -2076,8 +2114,19 @@ msgid ""
 msgstr "Ваш ретранслятор выключается.\nНажмите \"Стоп\" для немедленной остановки вашего ретранслятора."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Начальная загрузка Tor от %1 до %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia обнаружила, что программное обеспечение Tor неожиданно завершило работу. Пожалуйста, проверьте журнал сообщений на последние предупреждения или сообщения об ошибках."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероятно Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероятно email клиент)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Похоже, что одно из ваших приложений %1 создает потенциально не зашифрованное и небезопасное соединение на порт %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Ошибка при установке фильтра"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Неверный мост"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Указанный идентификатор моста не действителен."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Копировать (Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "принять"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Работать только как клиент"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Трафик ретранслятора сети Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Порт ретранслятора:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Автоматически распространять адрес моего моста"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Зеркалировать каталог ретрансляторов"
 
diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po
index 128383a..2ed60d0 100644
--- a/sk/vidalia_sk.po
+++ b/sk/vidalia_sk.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <koloman375 at gmail.com>, 2012.
 #   <martin.strucel at gmail.com>, 2012.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-03 13:07+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: K0L0M4N <koloman375 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "Nastaviť ControlPort automaticky"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nenačítala zvolený jazyk."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Od:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Ste pripojený do siete Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nerozpoznaný stav štartovania"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "rôzne"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Všetko čo pošlete týmto pripojením môže byť monitorované. Skontrolujte nastavenie aplikácie, a ak sa dá, používajte šifrované protokoly, ako je napr. SSL."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc od %1 do %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(pravdepodobne Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(pravdepodobne emailový klient)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Zdá sa, že jedna z Vašich aplikácií %1 komunikuje nešifrovane a nebezpečne na porte %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "zlyhalo (%1)"
 
@@ -2076,8 +2114,19 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc od %1 do %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(pravdepodobne Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(pravdepodobne emailový klient)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Zdá sa, že jedna z Vašich aplikácií %1 komunikuje nešifrovane a nebezpečne na porte %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Nesprávny most"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Zadaný identifikátor mosta nie je platný."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopírovať (Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "akceptovať"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Pracovať iba ako klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port relé:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automaticky rozoslať adresu môjho mostu"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/sq/vidalia_sq.po b/sq/vidalia_sq.po
index 457e711..f23f9a6 100644
--- a/sq/vidalia_sq.po
+++ b/sq/vidalia_sq.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Që Nga:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Urë e gabuar"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Emri i urës që u dha nuk është i vlefshëm."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopjo (Ctrl+C)"
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Kanalizo flukset për rrjetin Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta për Relay:"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po
index d01cdd1..189b983 100644
--- a/sr/vidalia_sr.po
+++ b/sr/vidalia_sr.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <branislavhorvat at gmail.com>, 2012.
 #   <mahavidyas at gmail.com>, 2012.
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-11 20:27+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: portalscg <portalscg at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -204,6 +204,13 @@ msgstr "Подеси аутоматски контролни порт"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -229,6 +236,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia није могао да учита превод на изабрани језик."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Од:"
@@ -1754,10 +1778,6 @@ msgid "Connected to the Tor network!"
 msgstr "Повезан са Тор мрежом!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Непризнат статус покретања"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "разно"
 
@@ -2069,6 +2089,24 @@ msgid ""
 msgstr "Sve što je poslato kroz ovu veyu nemože biti nadgledano, Molimo proverite konfiguraciju aplikacije i koristite jedino enkriptovani protokol, kako shto je SSL ako je to moguće."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(вероватно Телнет)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(вероватно емаил клијент)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Изгледа да једна од ваших апликација %1 прави потенцијално несигурну везу са портом %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "неуспело (%1)"
 
@@ -2079,7 +2117,18 @@ msgid ""
 msgstr "Ваш релеј се искључује.\nКликните 'Stop' поново да бисте одмах искључили релеј."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2096,20 +2145,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia је открила да је Tor био неочеиквано искључен.\n\nМолимо да проверите скорашња упозорења и поруке о грешкама у записнику."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероватно Телнет)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероватно емаил клијент)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Изгледа да једна од ваших апликација %1 прави потенцијално несигурну везу са портом %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Грешка у подешавању филтра"
@@ -2522,14 +2557,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F "
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Неважећи мост"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Наведени мост идентификатор није важећи."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Копирај (Цтрл + Ц)"
 
@@ -2662,13 +2689,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "прихватити"
@@ -2846,10 +2873,6 @@ msgid "Run as a client only"
 msgstr "Покрени само као клијент"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Прослеђуј саобраћај за Tor мрежу"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Портови за прослеђивање:"
 
@@ -3094,6 +3117,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automatski distribuiraj adresu mog bridža"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Linkuj relejni direktorijum"
 
diff --git a/sv/vidalia_sv.po b/sv/vidalia_sv.po
index 55b9b8d..109e635 100644
--- a/sv/vidalia_sv.po
+++ b/sv/vidalia_sv.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <bik1230 at gmail.com>, 2012.
 #   <lars.edman at bredband.net>, 2012.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-18 10:53+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Larse <lars.edman at bredband.net>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -227,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunde ej ladda den valda språköversättningen"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Sedan:"
@@ -1752,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Ansluten till Tor-nätverket!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Okänt starttillstånd"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "blandat"
 
@@ -2067,6 +2087,24 @@ msgid ""
 msgstr "Allt som skickas över denna anslutning kan övervakas. Vänligen kontrollera din programkonfiguration och använd endast krypterade protokoll, t.ex. SSL, om möjligt."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "misslyckade (%1)"
 
@@ -2077,7 +2115,18 @@ msgid ""
 msgstr "Ditt Tor-relä stänger nu ner.⏎\nTryck 'Stopp' igen för att stänga det omgående."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2094,20 +2143,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia upptäckte att Tor programvaran avslutades oväntat.\n\nKontrollera meddelandeloggen för nya varnings- eller felmeddelanden."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Det gick ej att tillämpa filterinställningar"
@@ -2520,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ogiltig brygga"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den angivna bryggidentiteten är ogiltig."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopiera (Ctrl+C)"
 
@@ -2660,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "acceptera"
@@ -2844,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Kör endast som klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Vidarebefordra trafik för Tor-nätverket (kör som Tor-router)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Routerport:"
 
@@ -3092,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuera min bryggadress automatiskt"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spegla routerkatalogen"
 
diff --git a/templates/vidalia.pot b/templates/vidalia.pot
index 083f9be..78ad9d7 100644
--- a/templates/vidalia.pot
+++ b/templates/vidalia.pot
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr "Configure ControlPort automatically"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "You've checked the autoconfiguration option for the ControlPort, but provided no Data Directory. Please add one, or uncheck the \"Configure ControlPort automatically\" option."
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia was unable to load the selected language translation."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "System Icon Preferences (changes will take effect when you restart Vidalia)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Show the Tray Icon and Dock Icon (default)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Hide the Tray Icon"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Hide the Dock Icon"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Since:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connected to the Tor network!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Unrecognized startup status"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "miscellaneous"
 
@@ -2064,6 +2084,24 @@ msgid ""
 msgstr "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc from %1 to %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probably Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probably an email client)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "One of your applications %1 appears to be making a potentially unencrypted and unsafe connection to port %2."
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "failed (%1)"
 
@@ -2074,8 +2112,19 @@ msgid ""
 msgstr "Your relay is shutting down.\nClick 'Stop' again to stop your relay now."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n%2"
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
+msgstr "It seems Tor has stopped running since Vidalia started it.\n\nSee the Advanced Message Log for more information."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2091,20 +2140,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia detected that the Tor software exited unexpectedly.\n\nPlease check the message log for recent warning or error messages."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probably Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probably an email client)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "One of your applications %1 appears to be making a potentially unencrypted and unsafe connection to port %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Error Setting Filter"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Invalid Bridge"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "The specified bridge identifier is not valid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copy (Ctrl+C)"
 
@@ -2657,13 +2684,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "You must specify one or more bridges."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accept"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Run as a client only"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relay traffic for the Tor network"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Relay Port:"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automatically distribute my bridge address"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Relay traffic for the Tor network (exit relay)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Relay traffic inside the Tor network (non-exit relay)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Mirror the Relay Directory"
 
diff --git a/th/vidalia_th.po b/th/vidalia_th.po
index 73c001a..921466a 100644
--- a/th/vidalia_th.po
+++ b/th/vidalia_th.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ไม่สามารถดึงภาษาที่เลือกขึ้นมาใช้ได้"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "ตั้งแต่:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "สถานะเริ่มต้นที่ไม่รู้จัก"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "เบ็ดเตล็ด"
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge ไม่ถูกต้อง "
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "ค่า Bridge ที่ระบุ ไม่ถูกต้อง"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "คัดลอก (Ctrl+C)"
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "เป็นตัวลูก (ใช้งานอย่างเดียว)"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "เป็น Tor Relay (ช่วยส่งผ่านข้อมูลต่างๆให้เครือข่าย Tor ด้วย)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "เลข Port Relay:"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po
index c1ea52c..775ef33 100644
--- a/tr/vidalia_tr.po
+++ b/tr/vidalia_tr.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Caglar Ulkuderner <caglar at ulkuderner.net>, 2012.
 # Deniz  <>, 2012.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-03-08 08:49+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Caglar Ulkuderner <caglar at ulkuderner.net>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia seçmiş olduğunuz dili yükleyemiyor."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Başlangıç:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor ağına bağlandı!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Tanımlanamayan başlangıç."
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "DiÄŸer"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr "Bu bağlantı üzerinden gönderilen herhangi birşey izlenebilir. Lütfen uygulamanızın ayarlarını kontrol edin ve eğer mümkünse, sadece SSL gibi şifreli protokolleri kullanın."
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(muhtemelen Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(muhtemelen eposta istemcisi)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Hata(%1)"
 
@@ -2076,7 +2114,18 @@ msgid ""
 msgstr "Bağlantınız sonlandırılıyor."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Tor beklenmedik şekilde sonlandırıldı.\n\nGünlük kayıtlarından hata sebebini kontrol edebilirsiniz."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(muhtemelen Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(muhtemelen eposta istemcisi)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Filtreler ayarlanırken hata oluştu"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Hatalı köprü"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Belirlediğiniz köprü tanımı geçerli değil."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopyala(Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Kabul et"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Sadece kullanıcı olarak çalıştır"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor ağının bir parçası olmak istiyorum"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Aktarım portu:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Köprü adresimi otomatik olarak dağıt"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Geçit dizinini yansıla"
 
diff --git a/uk/vidalia_uk.po b/uk/vidalia_uk.po
index b678b27..13f946c 100644
--- a/uk/vidalia_uk.po
+++ b/uk/vidalia_uk.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 #   <crazysas at gmail.com>, 2012.
 #   <demonuk9 at gmail.com>, 2011, 2012.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: crazysas26810fe5f9b14183 <crazysas at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Не вдалося завантажити обрану мову перекладу."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "З:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2066,45 +2086,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2659,11 +2686,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/vi/vidalia_vi.po b/vi/vidalia_vi.po
index ab62a3e..76a7276 100755
--- a/vi/vidalia_vi.po
+++ b/vi/vidalia_vi.po
@@ -1,12 +1,12 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -199,6 +199,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -224,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia không thể nạp phiên dịch ngôn ngữ đã được chọn."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Kể từ:"
@@ -1749,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Kết nối với mạng Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Tình trạng khởi động không được công nhận"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "hỗn hợp"
 
@@ -2064,45 +2084,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2517,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Cầu không hợp lệ"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Su*. định danh cây cầu được chỉ định là không hợp lệ."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Sao chép (Ctrl+C)"
 
@@ -2657,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2841,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Chạy chi? như một khách hàng"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tiếp sức giao thông cho mạng Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Cổng tiếp sức:"
 
@@ -3089,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po
index cbf7209..4eebe23 100644
--- a/zh_CN/vidalia_zh_CN.po
+++ b/zh_CN/vidalia_zh_CN.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # Kevin Chen <szescxz at 126.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Kevin Chen <szescxz at 126.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -201,6 +201,13 @@ msgstr "自动配置控制端口"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -226,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia 无法载入选中的语言。"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "起始时间:"
@@ -1751,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor 网络已经连接!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "未知的启动状态"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "杂项"
 
@@ -2066,6 +2086,24 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "失败(%1)"
 
@@ -2076,7 +2114,18 @@ msgid ""
 msgstr "正在关闭您的中继服务。\n再次单击'停止'立刻关闭中继。"
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2093,20 +2142,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia检测到Tor软件意外退出。\n\n请检查消息日志获取最近的警告及错误信息。"
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "设定过滤条件时发生错误"
@@ -2519,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "无效网桥"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "指定网桥识别无效"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "复制(Ctrl+C)"
 
@@ -2659,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "接受"
@@ -2843,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "仅运行客户端功能"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor 网络中继"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "中继端口:"
 
@@ -3091,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "自动发布我的网桥地址"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "镜像中继目录"
 
diff --git a/zh_TW/vidalia_zh_TW.po b/zh_TW/vidalia_zh_TW.po
index b4a682f..f2632c7 100644
--- a/zh_TW/vidalia_zh_TW.po
+++ b/zh_TW/vidalia_zh_TW.po
@@ -1,4 +1,4 @@
-# Translators:
+# 
 # Translators:
 # runasand <runa.sandvik at gmail.com>, 2011.
 # tylerlin <msn at tylerlin.com>, 2011.
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: tylerlin <msn at tylerlin.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,13 @@ msgstr ""
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
@@ -225,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia 無法載入指定的語言。"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "起始時間:"
@@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "已連線到 Tor 網路!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "雜項"
 
@@ -2065,45 +2085,60 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2518,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "無效網橋"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "指定網橋識別無效"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "複製(Ctrl+C)"
 
@@ -2658,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2842,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "我只想當用戶端"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor 網絡中繼"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "中繼連接埠:"
 
@@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 



More information about the tor-commits mailing list