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

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



commit 54719d27b43c689260ab4694a97f433558ce253c
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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@xxxxxxxxxx>, 2012.
 # IBRAHIM <mradonadiego@xxxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 #   <svilen79@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxxxx>, 2011.
 #   <demonuk9@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx>, 2011.
 # cosimacosa <leccefv@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 #   <lenazun@xxxxxxxxx>, 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@xxxxxxxxx>\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@xxxxxxxxxxxxxxx>, 2012.
 #   <baldarra@xxxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxx>, 2011, 2012.
 #   <green.dove1388@xxxxxxxxx>, 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@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2012.
 #   <debris@xxxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxxxxxxx>, 2011.
 # Pierre Antoine <pierre.antoine@xxxxxxxx>, 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@xxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 #   <viktor.varga@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # Emilio Sepúlveda <emisepulvedam@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxx>\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@xxxxxxxxx>, 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@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 #   <cwt967@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 #   <cwt967@xxxxxxxxx>, 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@xxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxx>, 2011.
 #   <flabber@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # Florin Putura <puturaflorin@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 #   <liquixis@xxxxxxxxx>, 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@xxxxxxxxx>\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@xxxxxxxxx>, 2012.
 #   <martin.strucel@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2012.
 #   <mahavidyas@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2012.
 #   <lars.edman@xxxxxxxxxxxx>, 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@xxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2012.
 #   <demonuk9@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 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@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 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@xxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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@xxxxxxxxx>, 2011.
 # tylerlin <msn@xxxxxxxxxxxx>, 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@xxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 ""
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits