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

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



commit 0435fe4aaeacf00db3576b314d09d8bdf7bfb1ac
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Thu Mar 22 09:16:40 2012 +0000

    Update translations for vidalia_alpha
---
 ar/vidalia_ar.po       |  595 +++++++++++++++++++++++++++++-------------------
 bg/vidalia_bg.po       |  529 +++++++++++++++++++++++++++----------------
 cs/vidalia_cs.po       |  547 +++++++++++++++++++++++++++-----------------
 da/vidalia_da.po       |  529 +++++++++++++++++++++++++++----------------
 de/vidalia_de.po       |  595 +++++++++++++++++++++++++++++-------------------
 el/vidalia_el.po       |  565 ++++++++++++++++++++++++++++-----------------
 eo/vidalia_eo.po       |  535 +++++++++++++++++++++++++++----------------
 es/vidalia_es.po       |  595 +++++++++++++++++++++++++++++-------------------
 eu/vidalia_eu.po       |  595 +++++++++++++++++++++++++++++-------------------
 fa/vidalia_fa.po       |  529 +++++++++++++++++++++++++++----------------
 fr/vidalia_fr.po       |  595 +++++++++++++++++++++++++++++-------------------
 gu/vidalia_gu.po       |  529 +++++++++++++++++++++++++++----------------
 he/vidalia_he.po       |  537 +++++++++++++++++++++++++++----------------
 hi/vidalia_hi.po       |  529 +++++++++++++++++++++++++++----------------
 hu/vidalia_hu.po       |  595 +++++++++++++++++++++++++++++-------------------
 id/vidalia_id.po       |  529 +++++++++++++++++++++++++++----------------
 is/vidalia_is.po       |  529 +++++++++++++++++++++++++++----------------
 it/vidalia_it.po       |  595 +++++++++++++++++++++++++++++-------------------
 my/vidalia_my.po       |  565 ++++++++++++++++++++++++++++-----------------
 nb/vidalia_nb.po       |  573 ++++++++++++++++++++++++++++------------------
 nl/vidalia_nl.po       |  595 +++++++++++++++++++++++++++++-------------------
 pl/vidalia_pl.po       |  595 +++++++++++++++++++++++++++++-------------------
 pt/vidalia_pt.po       |  587 +++++++++++++++++++++++++++++------------------
 pt_BR/vidalia_pt_BR.po |  597 +++++++++++++++++++++++++++++-------------------
 ru/vidalia_ru.po       |  595 +++++++++++++++++++++++++++++-------------------
 templates/vidalia.pot  |  595 +++++++++++++++++++++++++++++-------------------
 th/vidalia_th.po       |  565 ++++++++++++++++++++++++++++-----------------
 tr/vidalia_tr.po       |  573 ++++++++++++++++++++++++++++------------------
 vi/vidalia_vi.po       |  565 ++++++++++++++++++++++++++++-----------------
 zh_CN/vidalia_zh_CN.po |  573 ++++++++++++++++++++++++++++------------------
 30 files changed, 10510 insertions(+), 6520 deletions(-)

diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po
index acad6c9..664f84c 100644
--- a/ar/vidalia_ar.po
+++ b/ar/vidalia_ar.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Mohammed Al-Doub <voulnet@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -198,12 +198,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "حدد Ù?Ù?Ù? Ù?استخداÙ?Ù? Ù?Ù? Ù?سار Ù?Ù?بس تÙ?ر"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? إزاÙ?Ø© خدÙ?Ø© تÙ?ر.\n\nÙ?د تضطر Ù?إزاÙ?تÙ?ا Ù?دÙ?Ù?اÙ?."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "اÙ?Ù?غة"
@@ -224,6 +262,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 "Ù?Ù?Ø°:"
@@ -389,10 +444,6 @@ msgid "Sharing"
 msgstr "اÙ?Ù?شارÙ?Ø©"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "اÙ?خدÙ?ات"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "اÙ?Ù?ظÙ?ر"
 
@@ -438,6 +489,12 @@ msgstr "Ù?Ø´Ù?Ù?Ø© Ù?Ù? اÙ?اتصاÙ? بتÙ?ر."
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Ù?Ù?Ù?Ù? اÙ? Ù?حاÙ?Ù? Ù?Ù?داÙ?Ù?ا بأÙ? Ù?غÙ?Ù? تÙ?ر Ù?Ù? أجÙ?Ù?. Ø¥Ù? عÙ?Ù? Ø°Ù?Ù? سÙ?ؤدÙ? Ø¥Ù?Ù? إغÙ?اÙ? Ù?Ù? اÙ?اتصاÙ?ات اÙ?Ù?عاÙ?Ø© حاÙ?Ù?اÙ? Ø®Ù?اÙ? عÙ?Ù?Ù?Ø© تÙ?ر اÙ?حاÙ?Ù?Ø©."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -449,12 +506,6 @@ msgid ""
 "one."
 msgstr "عÙ?Ù?Ù? Ø£Ù? تغÙ?Ù? عÙ?Ù?Ù?Ø© تÙ?ر Ù?بÙ? Ø£Ù? Ù?ستطÙ?ع Ù?Ù?داÙ?Ù?ا Ù?تح Ù?احدة أخرÙ?."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Ù?Ù?Ù?Ù? اÙ? Ù?حاÙ?Ù? Ù?Ù?داÙ?Ù?ا بأÙ? Ù?غÙ?Ù? تÙ?ر Ù?Ù? أجÙ?Ù?. Ø¥Ù? عÙ?Ù? Ø°Ù?Ù? سÙ?ؤدÙ? Ø¥Ù?Ù? إغÙ?اÙ? Ù?Ù? اÙ?اتصاÙ?ات اÙ?Ù?عاÙ?Ø© حاÙ?Ù?اÙ? Ø®Ù?اÙ? عÙ?Ù?Ù?Ø© تÙ?ر اÙ?حاÙ?Ù?Ø©."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Ù?Ù?بس اÙ?تحÙ?Ù? غÙ?ر Ù?تصÙ?."
@@ -1276,24 +1327,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Ù?اجÙ? Ù?Ù?داÙ?Ù?ا خطأ Ù?Ù?حتاج Ø¥Ù?Ù? اÙ?إغÙ?اÙ?"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "تÙ? إعداد تÙ?رÙ?ر باÙ?عطÙ?Ø? Ù?Ù?Ù?Ù?Ù? إرساÙ?Ù? بشÙ?Ù? Ø¢Ù?Ù? Ù?Ù?Ø·Ù?رÙ? Ù?Ù?داÙ?Ù?ا Ù?Ù?Ù?ساعدة Ù?Ù? تحدÙ?د اÙ?خطأ Ù?إصÙ?احÙ?. اÙ?تÙ?رÙ?ر اÙ?Ù?Ù?رسÙ? Ù?ا Ù?Ø­Ù?Ù? Ø£Ù? Ù?عÙ?Ù?Ù?ات تÙ?Ø´Ù? اÙ?Ù?Ù?Ù?Ø©Ø? Ù?Ù?Ù?Ù? اتصاÙ?Ù? بÙ?خدÙ? تÙ?ارÙ?ر اÙ?أعطاÙ? Ù?Ù? Ù?Ù?Ù?Ù? Ù?جÙ?Ù?Ù? اÙ?Ù?صدر"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Ù?Ù?رجÙ? Ø£Ù?ضا Ù?صÙ? Ù?ا Ù?Ù?ت تÙ?عÙ? Ù?بÙ? Ø¥Ù?Ù?Ù?ار اÙ?تطبÙ?Ù? (إجتÙ?ارÙ?):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "إرساÙ? تÙ?رÙ?رÙ? Ø¥Ù?Ù?Ù?ار Ø¥Ù?Ù? اÙ?Ù?Ø·Ù?رÙ?Ù? Ù?Ù?داÙ?Ù?ا"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "إعادة تشغÙ?Ù? Ù?Ù?داÙ?Ù?ا"
 
@@ -1311,17 +1344,44 @@ msgid ""
 "manually."
 msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ù?Ù? إعادة تشغÙ?Ù? Ù?Ù?داÙ?Ù?ا تÙ?Ù?ائÙ?ا. اÙ?رجاء إعادة تشغÙ?Ù?Ù? Ù?دÙ?Ù?ا."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Ù?تصÙ?..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Ù?رسÙ? تÙ?رÙ?ر اÙ?اÙ?Ù?Ù?ار..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Ù?تÙ?Ù?Ù? اÙ?جÙ?اب..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1332,10 +1392,6 @@ msgid "Select Path to Tor"
 msgstr "اختÙ?ار Ù?سار تÙ?ر"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "اختÙ?ار اÙ?Ù?Ù?Ù? اÙ?تÙ?Ù?Ù?Ø°Ù? Ù?Ù?Ù?سÙ?Ø· (برÙ?Ù?سÙ?)"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Ù?جب تحدÙ?د اسÙ? Ù?Ù?Ù? تÙ?ر اÙ?تÙ?Ù?Ù?Ø°Ù?."
 
@@ -1352,18 +1408,6 @@ msgid "Tor"
 msgstr "تÙ?ر"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "تطبÙ?Ù? اÙ?Ù?سÙ?Ø· (اختÙ?ارÙ?)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "ابدأ تطبÙ?Ù? اÙ?Ù?سÙ?Ø· Ù?ع بدء تشغÙ?Ù? تÙ?ر"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Ù?عطÙ?ات تطبÙ?Ù? اÙ?Ù?سÙ?Ø·:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "تحدÙ?Ø« اÙ?برÙ?اÙ?ج"
 
@@ -1657,10 +1701,6 @@ msgid "Help"
 msgstr "Ù?ساعدة"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Ù?Ù?Ù?Ø© جدÙ?دة"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "تÙ?ر"
 
@@ -1669,30 +1709,6 @@ msgid "View"
 msgstr "اعرض"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "خطأ Ù?Ù? إطÙ?اÙ? Ù?تصÙ?Ø­ اÙ?Ø¥Ù?ترÙ?ت"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? بدء اÙ?Ù?تصÙ?Ø­ اÙ?Ù?ضبÙ?طة إعداداتÙ?"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "خطأ Ù?Ù? بدء عÙ?Ù?Ù? اÙ?Ù?راسÙ?Ø© اÙ?Ù?Ù?رÙ?Ø©"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? بدء عÙ?Ù?Ù? اÙ?Ù?راسÙ?Ø© اÙ?Ù?Ù?رÙ?Ø© اÙ?Ù?ضبÙ?طة إعداداتÙ?"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "خطأ Ù?Ù? بدء خادÙ?Ù? اÙ?Ù?سÙ?Ø·"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? بدء خادÙ?Ù? اÙ?Ù?سÙ?Ø· اÙ?Ù?ضبÙ?طة إعداداتÙ?"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "جارÙ? اÙ?اتصاÙ? بدÙ?Ù?Ù? اÙ?تحÙ?Ù?Ù?ات"
 
@@ -1733,10 +1749,6 @@ msgid "Connected to the Tor network!"
 msgstr "تÙ? اÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ù?Ù? بتÙ? اÙ?تعرÙ? عÙ?Ù? حاÙ?Ø© بدء اÙ?تشغÙ?Ù?"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "Ù?تÙ?رÙ?ات"
 
@@ -1955,12 +1967,6 @@ msgstr "حصÙ? اÙ?خطأ اÙ?تاÙ?Ù?:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Ù?بدÙ? Ø£Ù? أحد تطبÙ?Ù?اتÙ?%1a  Ù?Ù?Ù?Ù? باتصاÙ? Ù?د Ù?Ù?Ù?Ù? غÙ?ر Ù?عÙ?Ù? Ù?غÙ?ر Ø£Ù?Ù?Ù? Ù?Ù?بÙ?ابة %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1971,14 +1977,6 @@ msgid "toolBar"
 msgstr "شرÙ?Ø· اÙ?أدÙ?ات"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "ابدأ"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "تÙ?Ù?Ù?"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "إعادة تشغÙ?Ù?"
 
@@ -1996,6 +1994,79 @@ msgstr "Ø¥Ù?شاء torrc Ù?Ù? %1 Ø¥Ù?Ù? %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "حاÙ?Ù?ت Ù?Ù?داÙ?Ù?ا Ø£Ù? تعÙ?د تشغÙ?Ù? تÙ?رØ? Ù?Ù?Ù?Ù?Ù?ا Ù?Ù? تÙ?جح. اÙ?رجاء Ù?راجعة Ù?دÙ?ر اÙ?Ù?Ù?اÙ? Ù?Ù?تأÙ?د Ø£Ù?Ù? Ù?ا Ù?Ù?جد Ù?Ù?اÙ? إجرائÙ?ات تÙ?ر أخرÙ?"
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "إعادة تÙ?Ù?Ù?Ù? اÙ?خطأ"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادرة عÙ?Ù? تحدÙ?Ø« اعدادات تÙ?ر"
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2009,22 +2080,22 @@ msgid ""
 msgstr "Ù?جد Ú¤Ù?داÙ?Ù?ا Ø£Ù? برÙ?جÙ?Ø© تÙ?ر تÙ?Ù?Ù?ت عÙ? اÙ?عÙ?Ù? بشÙ?Ù? Ù?Ù?اجئ.\n\nÙ?رجÙ? اÙ?تحÙ?Ù? Ù?Ù? سجÙ? اÙ?رسائÙ? Ù?تحذÙ?رات Ø£Ù? رسائÙ? خطأ حدÙ?ثة."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "حاÙ?Ù?ت Ù?Ù?داÙ?Ù?ا Ø£Ù? تعÙ?د تشغÙ?Ù? تÙ?رØ? Ù?Ù?Ù?Ù?Ù?ا Ù?Ù? تÙ?جح. اÙ?رجاء Ù?راجعة Ù?دÙ?ر اÙ?Ù?Ù?اÙ? Ù?Ù?تأÙ?د Ø£Ù?Ù? Ù?ا Ù?Ù?جد Ù?Ù?اÙ? إجرائÙ?ات تÙ?ر أخرÙ?"
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Ù?Ø´Ù? (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr "Ø? غاÙ?باÙ? TelnetØ? "
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr "Ø? غاÙ?باÙ? عÙ?Ù?Ù? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù?Ø? "
+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 ""
@@ -2032,14 +2103,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "جار Ø¥Ù?Ù?اÙ? تحÙ?Ù?Ù?تÙ?.\nÙ?رجÙ? اÙ?Ù?Ù?ر عÙ?Ù? \"Ø¥Ù?Ù?اÙ?\" Ù?رة أخرÙ? Ù?تÙ?Ù?Ù? تحÙ?Ù?Ù?تÙ? اÙ?Ø¢Ù?."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "إعادة تÙ?Ù?Ù?Ù? اÙ?خطأ"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادرة عÙ?Ù? تحدÙ?Ø« اعدادات تÙ?ر"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "عÙ?Ø·Ù? Ù?Ù? ضبط اÙ?Ù?Ù?رشÙ?Ù?Ø­"
@@ -2293,14 +2356,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "احÙ?ظ رسائÙ? اÙ?سجÙ?Ù?Ù? اÙ?جدÙ?دة Ù?Ù? Ù?Ù?Ù? تÙ?Ù?ائÙ?Ù?ا"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "احÙ?ظ رسائÙ? اÙ?سÙ?Ù?جÙ? اÙ?جدÙ?دة دائÙ?ا"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "شرÙ?Ø· اÙ?أدÙ?ات"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "احÙ?ظ رسائÙ? اÙ?سÙ?Ù?جÙ? اÙ?جدÙ?دة دائÙ?ا"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2455,13 +2518,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "حاÙ?Ø©"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "جسر عاطÙ?"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Ù?عرÙ? اÙ?جسر اÙ?Ù?حدد عاطÙ?"
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2596,13 +2673,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Ù?بÙ?Ù?"
@@ -2611,6 +2750,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "رÙ?ض"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Ù?تصÙ?"
@@ -3041,83 +3210,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "عÙ?Ù?اÙ? اÙ?برÙ?د اÙ?Ø°Ù? Ù?Ù?Ù?Ù? اÙ?اتصاÙ? بÙ? عبرÙ? Ù?Ù? حاÙ? Ù?جدت\nÙ?Ø´Ù?Ù?Ø© Ù?Ù? تحÙ?Ù?Ù?تÙ?. Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضاÙ? تضÙ?Ù?Ù? بصÙ?Ø© PGP Ø£Ù? GPG اÙ?خاصة بÙ?."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "خطأ أثÙ?اء Ù?حاÙ?Ù?Ø© Ø¥Ù?غاء Ù?شر جÙ?Ù?ع اÙ?خدÙ?ات"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Ù?رجÙ? ضبط خدÙ?Ø© اÙ?دÙ?Ù?Ù? Ù?Ù?دخÙ? اÙ?تراضÙ? عÙ?Ù? اÙ?Ø£Ù?Ù? Ù?Ù?Ù? خدÙ?Ø© ترÙ?د Ø­Ù?ظÙ?ا. احذÙ? اÙ?آخرÙ?Ù?."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "خطأ"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Ù?رجÙ? اختÙ?ار خدÙ?Ø©."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "اختر دÙ?Ù?Ù? خدÙ?Ø©"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Ù?Ù?Ù?Ù? Ù?Ù?Ù?دخÙ? اÙ?اÙ?تراضÙ? Ø£Ù? Ù?حتÙ?Ù? عÙ?Ù? أرÙ?اÙ? Ù?دخÙ? صاÙ?حة Ù?Ù?Ø· [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "اÙ?Ù?دÙ? Ù?Ù?Ù?Ù? Ù?Ù?Ø· Ø£Ù? Ù?حتÙ?Ù? عÙ?Ù?اÙ?:Ù?دخÙ?Ø? عÙ?Ù?اÙ?Ø? Ø£Ù? Ù?دخÙ?ز"
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "اÙ?دÙ?Ù?Ù? Ù?ستعÙ?Ù? بشÙ?Ù? Ù?سبÙ? Ù?Ù? خدÙ?Ø© أخرÙ?"
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "اÙ?خدÙ?ات اÙ?Ù?Ù?Ù?رة اÙ?Ù?Ø®Ù?Ù?Ø©"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "عÙ?Ù?اÙ? اÙ?بصÙ?Ø©"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "اÙ?Ù?دخÙ? اÙ?اÙ?تراضÙ?"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "اÙ?Ù?دÙ?"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Ù?سار اÙ?دÙ?Ù?Ù?"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Ù?Ù?عÙ?"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "أضÙ? خدÙ?Ø© جدÙ?دة Ø¥Ù?Ù? اÙ?Ù?ائÙ?Ø©"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "احذÙ? اÙ?خدÙ?ات اÙ?Ù?ختارة Ù?Ù? اÙ?Ù?ائÙ?Ø©"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "اÙ?سخ عÙ?Ù?اÙ? اÙ?بصÙ?Ø© Ù?اÙ?خدÙ?ات اÙ?Ù?ختارة Ø¥Ù?Ù? Ù?Ù?Ø­ اÙ?Ù?صاصات"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "تصÙ?Ù?Ø­ Ù?Ù? Ù?ظاÙ? اÙ?Ù?Ù?Ù?ات اÙ?Ù?Ø­Ù?Ù? Ù?اختÙ?ار دÙ?Ù?Ù? Ù?Ù?خدÙ?ات اÙ?Ù?ختارة"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Ø£Ù?شأÙ? تÙ?ر"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3422,6 +3569,22 @@ msgid ""
 "started it."
 msgstr "Ù?Ù?داÙ?Ù?ا Ù?Ù? تبدأ تÙ?ر. تحتاج Ø¥Ù?Ù? Ø¥Ù?Ù?اÙ? تÙ?ر Ù?Ù? Ø®Ù?اÙ? اÙ?Ù?اجÙ?Ø© اÙ?تÙ? Ù?تحتÙ? بÙ?ا "
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "تعذÙ?Ù?ر Ø¥Ù?Ù?اÙ? اÙ?عÙ?Ù?Ù?Ø© %1. [%2]"
@@ -3443,12 +3606,6 @@ msgid "Editing torrc"
 msgstr "تحرÙ?ر torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Ø­Ù?ظ اÙ?إعدادات. إذا Ù?Ù? تÙ?عÙ? سÙ?Ù? تÙ?طبÙ? Ù?Ù?Ø· Ù?سخة تÙ?ر اÙ?حاÙ?Ù?Ø© "
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Ù?Ù?ص"
 
@@ -3473,26 +3630,6 @@ msgid "Select All"
 msgstr "اختر اÙ?Ù?Ù?"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "طبÙ?Ù? اÙ?Ù?Ù?"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "طبÙ?Ù? اÙ?Ù?حدد Ù?Ù?Ø·"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "خطأ Ù?Ù? اÙ?اتصاÙ? بتÙ?ر"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "اÙ?اختÙ?ار Ù?ارغ. اختر جزء Ù?Ù? اÙ?Ù?ص Ø£Ù? اضغط عÙ?Ù? اختÙ?ار اÙ?Ù?Ù?."
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "خطأ باÙ?سطر %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "خطأ"
 
@@ -3652,14 +3789,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "إصدار"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "إرساÙ? تÙ?رÙ?ر Ø¥Ù?Ù?Ù?ار"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Ù?ا Ù?Ù?Ù?Ù? ارساÙ? تÙ?رÙ?ر Ø¥Ù?Ù?Ù?ار: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Ù?Ù?اÙ?Ù?"
@@ -3753,6 +3882,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "تعذÙ?Ù?ر Ù?تح Ù?Ù?Ù? اÙ?سÙ?Ù?جÙ? '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Ù?Ù?د اÙ?Ù?غة اÙ?Ù?حدد غÙ?ر صحÙ?Ø­:"
 
diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po
index 11ce05a..a3365b2 100644
--- a/bg/vidalia_bg.po
+++ b/bg/vidalia_bg.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Ð?зик"
@@ -220,6 +258,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 "Ð?Ñ?:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr ""
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr ""
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Ð?зглед"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Ð?збеÑ?и пÑ?Ñ? до ТоÑ?"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr ""
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "ТоÑ?"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Ð?омоÑ?"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Ð?ова Ñ?амолиÑ?ноÑ?Ñ?"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "ТоÑ?"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Ð?зглед"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "оÑ?кажи"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Ð?нлайн"
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Ð?Ñ?еÑ?ка"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Ð?Ñ?оÑ?еÑ? %1 не Ñ?Ñ?пÑ? да Ñ?пÑ?е. [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Ð?Ð?"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/cs/vidalia_cs.po b/cs/vidalia_cs.po
index 8ee6ff2..9f1c907 100644
--- a/cs/vidalia_cs.po
+++ b/cs/vidalia_cs.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Johnathan.Smith <johnathan.smith1968@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Jazyk"
@@ -221,6 +259,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:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "Sdílení"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Služby"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Podoba"
 
@@ -435,6 +486,12 @@ msgstr "Problém s pÅ?ipojením k Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia může zkusit restartovat Tor .  BÄ?hem tohoto procesu bude vÅ¡echno aktivní pÅ?ipojení pÅ?es Tor ukonÄ?eno."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr "Musíte nejprve ukonÄ?it proces Tor aby mohla Vidalia zapnout nový."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia může zkusit restartovat Tor .  BÄ?hem tohoto procesu bude vÅ¡echno aktivní pÅ?ipojení pÅ?es Tor ukonÄ?eno."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Kontrolní socket není pÅ?ipojen."
@@ -1273,24 +1324,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia narazila na problém a je potÅ?eba ji ukonÄ?it"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Crash report o pádu programu byl můžete automaticky poslat vývojáÅ?ům z Vidalia, toto slouží k nalezení pÅ?íÄ?iny a Å?eÅ¡ení problému. Poslaný crash report neobsahuje žádné osobní údaje, ale vaÅ¡e pÅ?ipojení k serveru pÅ?i odesílání nemusí  být anonymní."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "PopiÅ¡te prosím co vÅ¡e jste dÄ?lali pÅ?ed pádem aplikace (volitelné):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Poslat můj crash report vývojáÅ?ům z Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Restartovat Vidalia"
 
@@ -1308,17 +1341,44 @@ msgid ""
 "manually."
 msgstr "Nemůžeme automaticky restartovat Vidalia. Restartujte ji prosím manuálnÄ?."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "PÅ?ipojuji se..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Posílám crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "PÅ?ijímám odpovÄ?Ä?...."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "Oznac cestu k Tor."
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr ""
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Aktualizace softwaru"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "Napoveda"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nova identita"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "Nahled"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Chyba pÅ?i spouÅ¡tÄ?ní webového prohlížeÄ?e"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia nebyla schopná zapnout vámi nastavený webový prohlížeÄ?"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Chyba pÅ?i startu IM klienta"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia nebyla schopná zapnout vámi nastavený IM klient"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Chyba pÅ?i zapínání proxy serveru"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia nebyla schopná zapnout vámi nastavený proxy server"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1730,10 +1746,6 @@ msgid "Connected to the Tor network!"
 msgstr "PÅ?ipojen k síti Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1952,12 +1964,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,73 +1974,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Automaticky uloz nove oznameni do souboru"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Vzdy Ukladat Nove Oznameni"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Vzdy Ukladat Nove Oznameni"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,12 +2515,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2593,11 +2670,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "odmítnout"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3038,82 +3207,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Chyba"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Zastaveni procesu %1 selhalo. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Nemohu otevrit soubor zaznamu '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/da/vidalia_da.po b/da/vidalia_da.po
index 5f9aa10..73b87ae 100644
--- a/da/vidalia_da.po
+++ b/da/vidalia_da.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: OliverMller <theoliver@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Vælg en fil, der skal bruges til Tor socket vej"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia var ikke i stand til at fjerne Tor service.\n\nDet kan være nødvendigt at fjerne det manuelt."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Sprog"
@@ -220,6 +258,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunne ikke indlæse det valgte sprog oversættelse."
 
+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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr ""
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr ""
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
@@ -1272,63 +1323,68 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgid "Executables (*.exe)"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgid "Select Path to Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/de/vidalia_de.po b/de/vidalia_de.po
index 10d5c10..0ccf058 100644
--- a/de/vidalia_de.po
+++ b/de/vidalia_de.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Sacro <Scion@xxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Wählen Sie eine Datei für die Verwendung von Tor Socket Pfad"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia konnte den Tor-Dienst nicht entfernen\n\nSie müssen diesen manuell entfernen."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Sprache"
@@ -221,6 +259,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:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "Beteiligung"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Dienste"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Aussehen"
 
@@ -435,6 +486,12 @@ msgstr "Probleme sich mit Tor zu Verbinden"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia kann versuchen, Tor für dich neu zu Starten.  Dieses würde alle, im Momment aktiven, Verbindungen deines Tor-Prozesses schlie�en."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr "Du musst den Tor-Prozess beenden, bevor Vidalia einen neuen starten kann."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia kann versuchen, Tor für dich neu zu Starten.  Dieses würde alle, im Momment aktiven, Verbindungen deines Tor-Prozesses schlie�en."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Kontrollsocket ist nicht verbunden."
@@ -1273,24 +1324,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia hat einen Fehler entdeckt und muss geschlossen werden."
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Ein Fehlerbericht wurde erstellt. Sie können diesen automatisch an die Vidalia-Entwickler senden und damit zur Identifizierung und zur Lösung des Problems beitragen. Der Bericht enthält keine persönlichen Identifizierungsinformationen, nur die Verbindung zum Fehlerreport-Server könnte nicht anonym sein."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Bitte beschreiben Sie auch was passiert ist, bevor das Programm abgestürzt ist (optional):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Sende meinen Fehlerbericht an die Vidalia-Entwickler"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Vidalia neu starten"
 
@@ -1308,17 +1341,44 @@ msgid ""
 "manually."
 msgstr "Leider konnte Vidalia nicht automatisch neu gestartet werden. Bitte starten Sie Vidalia händisch neu."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Verbinde..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Sende Fehlerbericht..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Empfange Antwort..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "Wählen Sie den Pfad zum Tor-Verzeichnis aus"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Proxy-Anwendungsdatei auswählen"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Sie müssen den Namen von Tors ausführbarer Datei angeben."
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy (optional)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Proxy starten, wenn Tor startet"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Argumente für die Proxy-Anwendung"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Aktualisierungen der Software"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "Hilfe"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Neue Identität"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "Ansicht"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Fehler beim Starten des Webbrowsers"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia konnte den angegebenen Webbrowser nicht starten"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Fehler beim Starten des IM-Clients"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia konnte den konfigurierten IM-Client nicht starten"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Fehler beim Start des Proxyservers"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia konnte den angegebenen Proxyserver nicht starten"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Verbinde zu einem Verzeichnis"
 
@@ -1730,10 +1746,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"
 
@@ -1952,12 +1964,6 @@ msgstr "Der folgende Fehler ist aufgetreten:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Eines Ihrer Programme%1a scheint eine potenziell unverschlüsselte und unsichere Verbindung zu Port %2 herzustellen."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,14 +1974,6 @@ msgid "toolBar"
 msgstr "toolBar"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Start"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Stop"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Neustart"
 
@@ -1993,6 +1991,79 @@ msgstr "Bootstrapping torrc von %1 auf %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia hatt versucht, Tor neu zu starten, war aber nicht in der Lage dazu. Bitte überprüf deinen Task-Manager, um sicher zu gehen, dass keine anderen Tor-Prozesse laufen."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Fehler beim neuladen der Konfiguration"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia war nicht in der Lage Tor's Konfiguration neu zu laden"
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2006,22 +2077,22 @@ msgid ""
 msgstr "Vidalia entdeckte dass Tor unerwartet beendet wurde.\n\nBitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia hatt versucht, Tor neu zu starten, war aber nicht in der Lage dazu. Bitte überprüf deinen Task-Manager, um sicher zu gehen, dass keine anderen Tor-Prozesse laufen."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "fehlgeschlagen (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", wahrscheinlich Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", wahrscheinlich ein E-Mail-Programm,"
+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 ""
@@ -2029,14 +2100,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Ihr Relais wird beendet.\nKlicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Fehler beim neuladen der Konfiguration"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia war nicht in der Lage Tor's Konfiguration neu zu laden"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Fehler beim Setzen des Filters"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Alle neuen Nachrichten automatisch in einer Datei speichern"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Nachrichten immer speichern"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "toolbar"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Nachrichten immer speichern"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,13 +2515,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Status"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ungültige Brücke"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Die angegebene Brücke ist nicht gültig."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2593,13 +2670,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "annehmen"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "ablehnen"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3038,83 +3207,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Kontakt E-Mail-Adresse, über welche du im Falle eines Problemes informiert werden kannst. Du kannst auch deinen PGP oder GPG Fingerabdruck mit angeben."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Fehler beim Versuch alle Dienste zu stoppen"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Bitte konfiguriere wenigstens ein Verzeichnis und einen virtuellen Port für jeden Dienst, den du speichern möchtest. Entferne die übrigen."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Fehler"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Bitte wähle einen Dienst aus."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Verzeichnis auswählen"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Der virtuelle Port darf nur gültige Port-Nummern enthalten [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Das Ziel darf nur Einträge der Form Adresse:Port, Adresse oder Port enthalten."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Das Verzeichnis wird bereits von einem anderen Dienst benutzt."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Versteckte Dienste"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion-Adresse"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtueller Port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Ziel"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Verzeichnispfad"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Gestartet"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Füge einen neuen Service hinzu"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Entferne den gewählten Service"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopiere die Onion-Adresse in die Zwischenablage"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Durchsuchen Sie ihr lokales Dateisystem um ein Verzeichnis auszuwählen"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Erstellt von Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr "Vidalia hat Tor nicht gestartet. Du musst Tor mit den Interface stoppen, mit dem du es gestartet hast."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Prozess %1 wurde nicht gestoppt. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr "torrc bearbeiten"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Einstellungen speichern. Falls nicht ausgewählt werden die Einstellungen nur auf die aktuelle Tor-Instanz angewandt."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Ausschneiden"
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr "Alles auswählen"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Alles anwenden"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Nur Ausgewähltes anwenden"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Fehler beim Verbinden zu Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Auswahl ist leer. Bitte wählen Sie einen Text aus oder verwenden Sie \"Alles anwenden\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Fehler in Zeile %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Fehler"
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Version"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Lade Absturzmeldung hoch"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Kann Report nicht senden: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Konnte Nachrichtendatei nicht öffnen '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Ungültiger Sprachcode festgestellt:"
 
diff --git a/el/vidalia_el.po b/el/vidalia_el.po
index 0a9ae82..dec5bc9 100644
--- a/el/vidalia_el.po
+++ b/el/vidalia_el.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Το Vidalia αÏ?έÏ?Ï?Ï?ε Ï?Ï?η διαγÏ?αÏ?ή Ï?ηÏ? Ï?Ï?ηÏ?εÏ?ίαÏ? Tor.\n\nÎ?Ï?οÏ?εί να Ï?Ï?ειαÏ?Ï?εί Ï?ειÏ?οκίνηÏ?η διαγÏ?αÏ?ή."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Î?λÏ?Ï?Ï?α"
@@ -220,6 +258,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 "Î?Ï?Ï?:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Î?οινή ΧÏ?ήÏ?η"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Î¥Ï?ηÏ?εÏ?ίεÏ?"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Î?μÏ?άνιÏ?η"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Î? Ï?Ï?οδοÏ?ή ελέγÏ?οÏ? δεν είναι Ï?Ï?νδεδεμένη."
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Î?Ï?ιλέξÏ?ε Ï?ην Î?ιαδÏ?ομή για Ï?ο Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Î?Ï?ιλέξÏ?ε Ï?ο Î?κÏ?ελέÏ?ιμο Ï?οÏ? Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? (Proxy)"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "ΠÏ?έÏ?ει να οÏ?ίÏ?ειÏ? Ï?ο Ï?νομα Ï?οÏ? εκÏ?ελέÏ?ιμοÏ? αÏ?Ï?είοÏ? Ï?οÏ? Tor."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Î?Ï?αÏ?μογή ΠληÏ?εξοÏ?Ï?ιοÏ? (Proxy) (Ï?Ï?οεÏ?αιÏ?ικÏ?)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Î?κκίνηÏ?η μιαÏ? εÏ?αÏ?μογήÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή (proxy) Ï?Ï?αν εκκινεί Ï?ο Tor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "ΠαÏ?άμεÏ?Ï?οι Î?Ï?αÏ?μογήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομιÏ?Ï?ή (Proxy):"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Î?νημεÏ?Ï?Ï?ειÏ? Î?ογιÏ?μικοÏ?"
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Î?οήθεια"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Î?έα ΤαÏ?Ï?Ï?Ï?ηÏ?α"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Î?μÏ?άνιÏ?η"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "ΣÏ?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?οÏ? Ï?εÏ?ιηγηÏ?ή ιÏ?Ï?οÏ?"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ον Ï?Ï?θμιÏ?μένο Ï?εÏ?ιηγηÏ?ή ιÏ?Ï?οÏ?."
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "ΣÏ?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ? Î?μεÏ?Ï?ν Î?ηνÏ?μάÏ?Ï?ν."
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ο Ï?Ï?θμιÏ?μένο Ï?Ï?Ï?γÏ?αμμα Î?μεÏ?Ï?ν Î?ηνÏ?μάÏ?Ï?ν"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "ΣÏ?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? (proxy server)"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ον Ï?Ï?θμιÏ?μένο Ï?ληÏ?εξοÏ?Ï?ιο διακομιÏ?Ï?ή (proxy server)"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "ΣÏ?νδεÏ?η Ï?ε ενδιάμεÏ?ο (relay) καÏ?άλογο"
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr "ΣÏ?νδέθηκε Ï?Ï?ο δίκÏ?Ï?ο Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Î?γνÏ?Ï?Ï?η καÏ?άÏ?Ï?αÏ?η εκκίνηÏ?ηÏ?"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "διάÏ?οÏ?α"
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Î?Ï?Ï?Ï?μαÏ?η αÏ?οθήκεÏ?Ï?η νέÏ?ν μηνÏ?μάÏ?Ï?ν καÏ?αγÏ?αÏ?ήÏ? Ï?ε αÏ?Ï?είο"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "ΠάνÏ?α να αÏ?οθηκεÏ?ειÏ? Ï?α νέα αÏ?Ï?εία καÏ?αγÏ?αÏ?ήÏ? μηνÏ?μάÏ?Ï?ν"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "ΠάνÏ?α να αÏ?οθηκεÏ?ειÏ? Ï?α νέα αÏ?Ï?εία καÏ?αγÏ?αÏ?ήÏ? μηνÏ?μάÏ?Ï?ν"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Î?η έγκÏ?Ï?η γέÏ?Ï?Ï?α"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Î? καθοÏ?ιÏ?μένοÏ? αÏ?ιθμÏ?Ï? αναγνÏ?Ï?ιÏ?ηÏ? Ï?ηÏ? γέÏ?Ï?Ï?αÏ? δεν είναι έγκÏ?Ï?οÏ?"
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "αÏ?Ï?Ï?Ï?ιÏ?η"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "ΣÏ?νδεδεμένο"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Î?άÏ?οιο λάθοÏ? Ï?αÏ?οÏ?Ï?ιάÏ?Ï?ηκε Ï?Ï?ην Ï?Ï?οÏ?Ï?άθεια αÏ?ενεÏ?γοÏ?οίηÏ?ηÏ? Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "ΠαÏ?ακαλοÏ?με Ï?Ï?θμίÏ?Ï?ε Ï?οÏ?λάÏ?ιÏ?Ï?ον ένα καÏ?άλογο Ï?Ï?ηÏ?εÏ?ίαÏ? και μία εικονική Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ? για κάθε μία Ï?Ï?ηÏ?εÏ?ία Ï?οÏ? θέλεÏ?ε να αÏ?οθηκεÏ?Ï?εÏ?ε. Î?ιαγÏ?άÏ?Ï?ε Ï?α Ï?Ï?Ï?λοιÏ?α."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Î?άθοÏ?"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "ΠαÏ?ακαλοÏ?με εÏ?ιλέξÏ?ε μια Ï?Ï?ηÏ?εÏ?ία."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Î?Ï?ιλογή Î?αÏ?αλÏ?γοÏ? Î¥Ï?ηÏ?εÏ?ίαÏ?"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Î?ι εικονικέÏ? Ï?Ï?Ï?Ï?εÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? μÏ?οÏ?οÏ?ν να Ï?εÏ?ιέÏ?οÏ?ν μÏ?νο έγκÏ?Ï?οÏ?Ï? αÏ?ιθμοÏ?Ï? Ï?οÏ?Ï?Ï?ν Ï?Ï?Ï?Ï?ήμαÏ?οÏ?, αÏ?Ï? 1 έÏ?Ï? 65535."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Î? Ï?Ï?Ï?Ï?οÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει Ï?α εξήÏ? Ï?Ï?ο Ï?εδίο διεÏ?θÏ?νÏ?ηÏ?:Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?, διεÏ?θÏ?νÏ?η ή Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Î? Ï?άκελοÏ? Ï?Ï?ηÏ?ιμοÏ?οιήÏ?ε ήδη αÏ?Ï? άλλη Ï?Ï?ηÏ?εÏ?ία."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "ΠαÏ?εÏ?Ï?μενεÏ? κÏ?Ï?Ï?έÏ? Ï?Ï?ηÏ?εÏ?ίεÏ?"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "''Î?ιεÏ?θÏ?νÏ?η Î?Ï?εμμÏ?διοÏ?'' (masked IP)"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Î?ικονική Î?Ï?Ï?α"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "ΣÏ?Ï?Ï?οÏ?"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Î?ιαδÏ?ομή καÏ?αλÏ?γοÏ?"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Î?νεÏ?γοÏ?οιημένη"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "ΠÏ?οÏ?θήκη νέαÏ? Ï?Ï?ηÏ?εÏ?ίαÏ? Ï?Ï?η λίÏ?Ï?α"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Î?Ï?ομάκÏ?Ï?νÏ?η Ï?ηÏ? εÏ?ιλεγμένηÏ? Ï?Ï?ηÏ?εÏ?ίαÏ? αÏ?Ï? Ï?η λίÏ?Ï?α"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Î?νÏ?ιγÏ?αÏ?ή Ï?ηÏ? ''διεÏ?θÏ?νÏ?ηÏ? κÏ?εμμÏ?διοÏ?'' (masked IP) Ï?ηÏ? εÏ?ιλεγμένηÏ? Ï?Ï?ηÏ?εÏ?ίαÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "ΠεÏ?ιήγηÏ?η Ï?Ï?ο Ï?οÏ?ικÏ? Ï?Ï?Ï?Ï?ημα αÏ?Ï?είÏ?ν και εÏ?ιλογή καÏ?αλÏ?γοÏ? για Ï?ην εÏ?ιλεγμένη Ï?Ï?ηÏ?εÏ?ία."
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Î?ημιοÏ?Ï?γήθηκε αÏ?Ï? Ï?ο Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Î? διεÏ?γαÏ?ία %1 αÏ?έÏ?Ï?Ï?ε να Ï?Ï?αμαÏ?ήÏ?ει. [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Î?κδοÏ?η"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Î?Î?"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Î?εν ήÏ?αν δÏ?ναÏ?Ï? να ανοίξει Ï?ο αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ? '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/eo/vidalia_eo.po b/eo/vidalia_eo.po
index 0f67fe2..a58a682 100644
--- a/eo/vidalia_eo.po
+++ b/eo/vidalia_eo.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia ne povis forigi Tor-servon.\n\nEble vi devas forigi Ä?in permane. "
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Lingvo"
@@ -220,6 +258,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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Dividante"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Servoj"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Apero"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Elektu vojon al Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Elektu prokurilan komandodosieron"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Vi devas specifi la nomon de via Tor-komandodosiero."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Prokurila aplikaĵo (fakultativa)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Komenci prokurilan aplikaĵon kiam Tor komencas"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Prokurila aplikaĵa argumentoj:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Programara Ä?isdatigo"
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Helpo"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nova idento"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Rigardi"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Eraro lanÄ?ante foliumilon"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia ne povis lanÄ?i la agorditan foliumilon"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Eraro lanÄ?ante tujmesaÄ?klienton"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia ne povis lanÄ?i la agorditan tujmesaÄ?klienton"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Eraro lanÄ?ante prokuran servilon"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia ne povis lanÄ?i la agorditan prokuran servilon"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Konektante al relajsa dosierujo"
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
-msgstr "fiaskis (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", eble Telnet,"
+msgid "failed (%1)"
+msgstr "fiaskis (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", eble retpoÅ?tkliento,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/es/vidalia_es.po b/es/vidalia_es.po
index 43569da..0f07be4 100644
--- a/es/vidalia_es.po
+++ b/es/vidalia_es.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: JosuaFalken <josua.falken@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -196,12 +196,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Selecciona un archivo para su uso vía la ruta del Tor socket"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia no fue capaz de eliminar el servicio de Tor.\n\nPuede que necesite eliminarlo de manera manual."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Idioma"
@@ -222,6 +260,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:"
@@ -387,10 +442,6 @@ msgid "Sharing"
 msgstr "Compartiendo"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Servicios"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Apariencia"
 
@@ -436,6 +487,12 @@ msgstr "Error de conexión con Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia puede intentar reiniciar Tor por usted.   Si lo hace, se cerrarán todas las conexiones activas a través de su proceso de Tor."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -447,12 +504,6 @@ msgid ""
 "one."
 msgstr "Usted tendrá que detener el proceso antes de Tor Vidalia puede iniciar uno nuevo."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia puede intentar reiniciar Tor por usted.   Si lo hace, se cerrarán todas las conexiones activas a través de su proceso de Tor."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "La conexión de control no esta conectada."
@@ -1274,24 +1325,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia ha encontrado un error y es necesario para cerrar"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Un reporte de error se ha creado que puede enviar automáticamente a los desarrolladores de Vidalia para ayudar a identificar y solucionar el problema. El informe presentado no contiene ninguna información de identificación personal, pero su conexión con el servidor de informes de accidente no pueden ser anónimas."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Por favor, describa lo que estaba haciendo antes de que la aplicación fallara (opcional):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Enviar mi informe de errores a los desarrolladores de Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Reiniciar Vidalia"
 
@@ -1309,17 +1342,44 @@ msgid ""
 "manually."
 msgstr "No hemos podido reiniciar automáticamente Vidalia. Por favor, reinicia manualmente."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Conectando ..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Enviando informe de errores ..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Recibiendo respuesta ..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1330,10 +1390,6 @@ msgid "Select Path to Tor"
 msgstr "Seleccione la ruta de Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Seleccionar el Ejecutable del Proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Debe especificar el nombre del ejecutable de Tor."
 
@@ -1350,18 +1406,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Aplicación Proxy (opcional)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Iniciar una aplicación proxy cuando Tor se inicie"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Argumentos de la aplicación Proxy:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Actualizaciones de software"
 
@@ -1655,10 +1699,6 @@ msgid "Help"
 msgstr "Ayuda"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nueva Identidad"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1667,30 +1707,6 @@ msgid "View"
 msgstr "Ver"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Error al iniciar navegador web"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia no pudo iniciar el navegador web configurado"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Error al inicial el cliente IM"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia no pudo iniciar el cliente IM configurado"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Error al iniciar el servidor proxy"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia no pudo iniciar el servidor proxy configurado"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Conectando a un directorio repetidor"
 
@@ -1731,10 +1747,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"
 
@@ -1953,12 +1965,6 @@ msgstr "Ocurrió el siguiente error:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Una de sus aplicaciones %1a puede estar haciendo una conexión sin encriptar y potencialmente peligrosa por el puerto %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1969,14 +1975,6 @@ msgid "toolBar"
 msgstr "Barra de Herramientas"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Iniciar"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Parar"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -1994,6 +1992,79 @@ msgstr "inicio independiente de torrc desde %1 a %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia trató de reiniciar Tor, pero no pudo. Por favor, consulte el Administrador de tareas para asegurar que no haya otros procesos de Tor iniciados."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Error recargando configuracion"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia no pudo recargar la configuración de Tor."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2007,22 +2078,22 @@ msgid ""
 msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia trató de reiniciar Tor, pero no pudo. Por favor, consulte el Administrador de tareas para asegurar que no haya otros procesos de Tor iniciados."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "falló (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr "probablemente Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", probablemente un cliente de correo electrónico,"
+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 ""
@@ -2030,14 +2101,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Su repetidor se está deteniendo.\nHaga clic de nuevo en â??Detenerâ?? para detener ahora su repetidor."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Error recargando configuracion"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia no pudo recargar la configuración de Tor."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Error configurando filtro"
@@ -2291,14 +2354,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Guardar automáticamente a un archivo los nuevos mensajes del registro"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Guardar siempre nuevos mensajes del registro"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "Barra de Herramientas"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Guardar siempre nuevos mensajes del registro"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2453,13 +2516,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Estado"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Puente no válido"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "El identificador de puente especificado no es válido."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2594,13 +2671,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aceptar"
@@ -2609,6 +2748,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "rechazar"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "En Línea"
@@ -3039,83 +3208,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Dirección de correo electrónico en la cual podría localizársele si hubiera un\nproblema con su repetidor. Pudiera incluir también su huella PGP o GPG."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Error al tratar de quitar la publicación de todos los servicios"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Por favor, configure al menos un servidor de directorios y un puerto virtual por cada servicio que quiera guardar. Elimine los otros."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Error"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Por favor, seleccione un Servicio."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Seleccione Servicio de Directorio"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "El Puerto Virtual sólo puede contener puertos válidos [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "El destino sólo puede contener dirección:puerto, dirección, o puerto."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Directorio ya en uso por otro servicio."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Provistos Servicios Ocultos"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Dirección Onion"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Puerto Virtual"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Destino"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Ruta del Directorio"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Habilitado"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Agregar nuevo servicio a la lista"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Quitar servicio seleccionado de la lista"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copiar dirección onion del servicio seleccionado al portapapeles"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Explorar sus archivos y elegir un directorio para servicios seleccionados"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Creado por Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3420,6 +3567,22 @@ msgid ""
 "started it."
 msgstr "Vidalia no ha iniciado Tor. Tiene que parar el proceso activo Tor a través de la interfaz con la que lo inició."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Proceso %1 no pudo detener [%2]"
@@ -3441,12 +3604,6 @@ msgid "Editing torrc"
 msgstr "Edición de torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Guardar la configuración. Si no marca el checklist sólo se aplicarán los cambios al proceso activo,actual de Tor."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Cortar"
 
@@ -3471,26 +3628,6 @@ msgid "Select All"
 msgstr "Seleccionar todo"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Aplicar a todo"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Aplicar solo a lo seleccionado"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Error de conexión a Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "La selección está vacía. Por favor, seleccione un texto, o consulte \"Aplicar a todo\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Error en la línea %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Error"
 
@@ -3650,14 +3787,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Versión"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Subir Informe de Errores"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "No se puede enviar el informe: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Aceptar"
@@ -3751,6 +3880,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "No se puede abrir el archivo de registro '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Código de idioma especificado no válido:"
 
diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po
index 1bf037c..bdb60a7 100644
--- a/eu/vidalia_eu.po
+++ b/eu/vidalia_eu.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-03-08 16:47+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Hautatu Tor socket bidea erabiltzeko fitxategi bat"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidaliak ezin izan du Tor zerbitzua kendu.\\n\n\\n\nEskuz kendu beharko duzu."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Hizkuntza"
@@ -220,6 +258,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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Elkarbanaketa"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Zerbitzuak"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Itxura"
 
@@ -434,6 +485,12 @@ msgstr "Arazoa Torera konektatzerakoan"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidaliak Tor berrabiarazten saia daiteke zure ordez. Hori egiteak zure Tor prozesuaren bidez aktibo dauden konexio guztiak itxiko ditu."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr "Tor prozesua itzali beharko duzu Vidaliak berri bat abiarazi dezan."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidaliak Tor berrabiarazten saia daiteke zure ordez. Hori egiteak zure Tor prozesuaren bidez aktibo dauden konexio guztiak itxiko ditu."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Socket kontrola ez dago konektatuta."
@@ -1272,24 +1323,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidaliak akats bat aurkitu du eta itxi behar izan du"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Vidalia garatzaileak arazoa identifikatzen eta konpontzen lagunduko dituen eta bidali dezakezun talka txosten bat sortu da. Aurkeztutako txostenak ez du inolako informazio pertsonalik, baina zure talka txosten zerbitzarekiko konexioa baliteke anonimoa ez izatea."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Mesedez deskriba ezazu ere aplikazioak talka egin baino lehen egiten ari zinena (hautazkoa):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Bidali nire talka txostena Vidalia garatzaileei"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Vidalia berrabiarazi"
 
@@ -1307,17 +1340,44 @@ msgid ""
 "manually."
 msgstr "Ezin izan dugu Vidalia automatikoki berrabiarazi. Mesedez Vidalia eskuz berrabiarazi."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Konektatzen..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Talka txostena bidaltzen..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Erantzuna jasotzen..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Aukeratu Torerako bidea"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Aukeratu Proxy exekutagarria"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Zure Tor exekutagarriaren izena zehaztu behar duzu."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Aplikazioa (hautazkoa)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Proxy aplikazio bat abiarazi Tor abiarazterakoan"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy aplikazioaren argumentuak:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Software Eguneraketak"
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Laguntza"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nortasun berria"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Ikusi"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Huts web nabigatzailea abiarazterakoan"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidaliak ezin izan du konfiguratutako web nabigatzailea abiarazi"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Huts IM bezeroa abiarazterakoan"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidaliak ezin izan du konfiguratutako IM bezeroa abiarazi"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Huts proxy zerbitzaria abiarazterakoan"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidaliak ezin izan du konfiguratutako proxy zerbitzaria abiarazi"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Errele direktorio batera konektatzen"
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr "Hurrengo akatsa gertatu da:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Antza denez zure aplikazioren bat %1a enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,14 +1973,6 @@ msgid "toolBar"
 msgstr "Tresna-barra"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Hasi"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Gelditu"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Berrabiarazi"
 
@@ -1992,6 +1990,79 @@ msgstr "%1 etik %2 ra torrc abio-uhaltzen"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia Tor berrabiarazten saiatu da, baina ezin izan du. Mesedez egiaztatu zure Ataza Kudeatzailea beste Tor prozesurik ez dagoela ziurtatzeko."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Huts konfigurazioa birkargatzerakoan"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidaliak ezin izan du Toren konfigurazioa birkargatu."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2005,22 +2076,22 @@ msgid ""
 msgstr "Vidaliak Tor softwarea ustekabean irten dela detektatu du.\\n\n\\n\nMesedez begiratu mezu erregistroan azkeneko ohar edo akats mezuak."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia Tor berrabiarazten saiatu da, baina ezin izan du. Mesedez egiaztatu zure Ataza Kudeatzailea beste Tor prozesurik ez dagoela ziurtatzeko."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "huts egin du (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", ziurrenik Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", ziurrenik email bezero bat,"
+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 ""
@@ -2028,14 +2099,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Zure errelea itzaltzen ari da orain.\\n\nSakatu 'Gelditu' berriz zure errelea orain gelditzeko."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Huts konfigurazioa birkargatzerakoan"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidaliak ezin izan du Toren konfigurazioa birkargatu."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Huts Filtroa ezartzerakoan"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Erregistro mezua berriak fitxategi batean automatikoki gorde"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Beti gorde Erregistro Mezu berriak "
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "Tresna-barra"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Beti gorde Erregistro Mezu berriak "
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Egoera"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Baliogabeko Zubia"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Zehaztutako zubi identifikatzailea ez da baliogarria."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,13 +2669,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "onartu"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "ezetsi"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Zure errelearekin arazoren bat badago baliteke email bat helbide honetara iristea. Agian zure PGP edo GPG hatz-markak gehitu nahiko zenituzke ere."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Huts zerbitzuak desargitaratzerakoan"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Mesedez konfigura ezazu gutxienez zerbitzu direktorio bat eta portu birtual bat gorde nahi duzun zerbitzu bakoitzerako. Kendu besteak."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Akatsa"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Mesedez Zerbitzu bat aukera ezazu."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Aukeratu Zerbitzu Direktorioa"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Portu Birtualak bakarrik portu zenbaki baliogarriak izan ditzake [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Helburuak bakarrik helbideak eduki ditzake:portua, helbidea, edo portua."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Beste zerbitzuren batek direktorioa erabiltzen ari da jadanik."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Emandako Ezkutuko Zerbitzuak"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Tipula Helbidea"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Portu Birtuala"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Helburua"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Direktorioaren Bidea"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Gaitua"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Zerrendara zerbitzu berri bat gehitu"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Aukeratutako zerbitzua zerrendatik kendu"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopiatu aukeratutako zerbitzuaren tipula helbidea arbelera"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Arakatu fitxategi sistema lokalean eta hautatu direktorio bat aukeratutako zerbitzuarentzat"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Torek sortua"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr "Vidaliak ez du Tor abiarazi. Abiarazi duzun interfazetik gelditu behar duzu Tor."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "%1 prozesuak huts egin du gelditzerakoan. [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr "torrc editatzen"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Ezarpenak gorde. Ezgaituta badago oraingo Tor instantziari bakarrik aplikatuko zaizkio ezarpenak."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Ebaki"
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr "Hautatu dena"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Aplikatu dena"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Aukeratutakoa bakarrik aplikatu"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Huts Torera konektatzen"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Aplikatu dena\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Huts %1 lerroan: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Akatsa"
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Bertsioa"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Talka Txostena igotzen"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Ezin izan da txostena bidali: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Ados"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Ezin izan da '%1' erregistro fitxategia ireki: %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Zehaztutako hizkuntza kodea baliogabekoa da:"
 
diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po
index 84222be..35c8f18 100644
--- a/fa/vidalia_fa.po
+++ b/fa/vidalia_fa.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-21 04:12+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Ardeshir <ardeshir@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Û?Ú© Ù?اÛ?Ù? براÛ? استÙ?ادÙ? Ù?سÛ?رÙ? سÙ?کتÙ? تÙ?ر اÙ?تخاب Ú©Ù?Û?د"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست سرÙ?Û?س تÙ?ر را حذÙ? Ú©Ù?د.â??\nâ??\nشاÛ?د Ù?ازÙ? باشد بÙ? Ø·Ù?ر دستÛ? Ø¢Ù? را حذÙ? Ú©Ù?Û?د"
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "زباÙ?"
@@ -221,6 +259,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 "از:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "بÙ? اشتراک گذارÛ?"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "خدÙ?ات"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "ظاÙ?ر"
 
@@ -435,6 +486,12 @@ msgstr "Ù?Ø´Ú©Ù? در برÙ?رارÛ? ارتباط با تÙ?ر"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "سÙ?کت Ú©Ù?ترÙ? Ù?صÙ? Ù?Û?ست."
@@ -1273,63 +1324,68 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgid "Executables (*.exe)"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgid "Select Path to Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "بÙ? رÙ?زرساÙ?Û? Ù?اÛ? Ù?رÙ? اÙ?زار"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1730,10 +1746,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1952,12 +1964,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,73 +1974,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2290,11 +2353,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2452,12 +2515,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2593,11 +2670,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3038,82 +3207,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr "Ù?Û?راÛ?Ø´ torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "برÛ?دÙ?"
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po
index bfef8de..08402a2 100644
--- a/fr/vidalia_fr.po
+++ b/fr/vidalia_fr.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-15 07:48+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: arpalord <arpalord@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -197,12 +197,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Sélectionnez un fichier à utiliser pour le chemin de la socket de Tor"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia a été incapable de supprimer le service Tor.\n\nVous pourriez avoir besoin de le supprimer manuellement."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Langue"
@@ -223,6 +261,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia n'a pas pu charger la traduction pour la langue 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:"
@@ -388,10 +443,6 @@ msgid "Sharing"
 msgstr "Partage"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Services"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Apparence"
 
@@ -437,6 +488,12 @@ msgstr "Problème de connexion à Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia peut tenter de relancer Tor pour vous.  Cela permettra de fermer toutes les connexions actuellement actives sur le processus Tor."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -448,12 +505,6 @@ msgid ""
 "one."
 msgstr "Il sera nécessaire d'arrêter le processus Tor avant que Vidalia puisse en lancer un nouveau."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia peut tenter de relancer Tor pour vous.  Cela permettra de fermer toutes les connexions actuellement actives sur le processus Tor."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Le socket de contrôle n'est pas connecté."
@@ -1275,24 +1326,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia a rencontré une erreur et doit fermer"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Un rapport d'erreur a été créé, vous pouvez l'envoyer automatiquement aux développeurs Vidalia pour aider à l'identification et à la résolution du problème. Le rapport soumis ne contient aucune information d'identification personnelle  mais votre connexion au serveur de rapport d'erreur peut ne pas être anonyme."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Merci de bien vouloir décrire ce que vous faisiez avant le plantage de l'applicaiton (optionnel):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Envoyer mon rapport d'erreur aux développeurs de Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Redémarrer Vidalia"
 
@@ -1310,17 +1343,44 @@ msgid ""
 "manually."
 msgstr "Redémarrage automatique de Vidalia impossible. Merci de redémarrer manuellement."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Connexion..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Envoi du rapport d'erreur..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Réception de la réponse..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1331,10 +1391,6 @@ msgid "Select Path to Tor"
 msgstr "Sélectionner le chemin de Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Sélectionner le fichier exécutable du proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Vous devez définir le nom de votre exécutable Tor"
 
@@ -1351,18 +1407,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Application Proxy (optionnel)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Lancer une application proxy lorsque Tor démarre"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Arguments de l'application Proxy"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Mises à jour logicielles"
 
@@ -1656,10 +1700,6 @@ msgid "Help"
 msgstr "Aide"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nouvelle Identité"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1668,30 +1708,6 @@ msgid "View"
 msgstr "Voir"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Erreur au lancement du navigateur"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia n'est pas parvenu à démarrer le navigateur Web configuré"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Erreur au lancement du client IM"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia n'a pas pu lancer le client IM configuré"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Erreur au lancement du serveur proxy"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia n'est pas parvenu à démarrer le serveur mandataire (proxy) configuré"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Connexion à un annuaire de relais"
 
@@ -1732,10 +1748,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connecté au réseau Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Etat du démarrage inconnu"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "divers"
 
@@ -1954,12 +1966,6 @@ msgstr "L'erreur suivante s'est produite:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Une de vos applications%1apparaît effectuer une connexion non chiffrée et non sécurisée sur le port %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1970,14 +1976,6 @@ msgid "toolBar"
 msgstr "Barre d'outils"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Démarrer"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Arrêter"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Redémarrer"
 
@@ -1995,6 +1993,79 @@ msgstr "Démarrage torrc de %1 à %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia a essayé de relancer Tor, sans succès. Merci de vérifier votre Gestionnaire de tâches afin de vérifier qu'il n'existe pas un autre processus Tor en cours d'exécution."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Erreur lors du rechargement de la configuration"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia n'a pas pu relancer la configuration de Tor."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2008,22 +2079,22 @@ msgid ""
 msgstr "Vidalia a détecté que le logiciel Tor a quitté de façon inattendue.\n\nMerci de vérifier le journal des messages afin de trouver des alertes ou messages d'erreur récents."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia a essayé de relancer Tor, sans succès. Merci de vérifier votre Gestionnaire de tâches afin de vérifier qu'il n'existe pas un autre processus Tor en cours d'exécution."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "échec (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", probablement Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", probablement un client email,"
+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 ""
@@ -2031,14 +2102,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Votre relai est en cours d'arrêt.\nCliquez 'Stop' encore une fois pour arrêter votre relai maintenant."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Erreur lors du rechargement de la configuration"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia n'a pas pu relancer la configuration de Tor."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Erreur lors de l'application d'un filtre"
@@ -2292,14 +2355,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Enregistrer les nouveaux messages automatiquement dans un fichier"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Toujours enregistrer les nouveaux messages du Journal"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "Barre d'outils"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Toujours enregistrer les nouveaux messages du Journal"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2454,13 +2517,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Etat"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Passerelle invalide"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identifiant de la passerelle défini est invalide."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2595,13 +2672,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accepter"
@@ -2610,6 +2749,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "rejeter"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "En ligne"
@@ -3040,83 +3209,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Adresse email à laquelle vous pouvez être joint s'il y a un \nproblème avec votre relais. Vous pouvez aussi inclure votre empreinte PGP ou GPG."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Erreur lors de la dépublication de tous les services"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Merci de configurer au moins un service d'annuaire et un port virtuel pour chacun des services que vous voulez sauvegarder. Supprimez les autres."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Error"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Merci de sélectionner un Service."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Sélectionnez le service d'annuaire"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Les ports virtuels peuvent uniquement contenir des numéros de ports valides [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "La destination doit uniquement contenir addresse:port, adresse, ou port."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Répertoire déjà utilisé par un autre service"
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Services Cachés hébergés"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Adresse de l'onion"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Port Virtuel"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Cible"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Chemin du dossier"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Activé"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Ajouter un nouveau service à la liste"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Supprimer le service selectionné de la liste"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copier l'adresse onion du service sélectionné dans le presse-papiers."
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Parcourez le système de fichiers et choisissez le dossier du service sélectionné"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Créé par Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3421,6 +3568,22 @@ msgid ""
 "started it."
 msgstr "Vidalia n'a pas démarré Tor. Vous devez l'arrêter depuis l'interface où vous l'avez démarré."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Le processus %1 ne s'est pas arrêté. [%2]"
@@ -3442,12 +3605,6 @@ msgid "Editing torrc"
 msgstr "Edition de torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Sauvegarde des paramètres. Si non cochée les réglages seront appliqués seulement à l'instance Tor actuelle."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Couper"
 
@@ -3472,26 +3629,6 @@ msgid "Select All"
 msgstr "Sélectionner Tout."
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Appliquer tout"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Appliquer seulement la sélection"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Erreur de connexion à Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "La sélection est vide. Merci de sélectionner du texte, ou cocher \"Appliquer tout\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Erreur à la ligne %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Error"
 
@@ -3651,14 +3788,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Version"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Envoi du Rapport d'erreur"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Impossible d'envoyer le rapport: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Ok"
@@ -3752,6 +3881,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Impossible d'ouvrir le fichier du Journal des messages '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Code de langue demandé invalide:"
 
diff --git a/gu/vidalia_gu.po b/gu/vidalia_gu.po
index ef05b26..5909cfb 100644
--- a/gu/vidalia_gu.po
+++ b/gu/vidalia_gu.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
@@ -220,6 +258,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 ""
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr ""
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr ""
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
@@ -1272,63 +1323,68 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgid "Executables (*.exe)"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgid "Select Path to Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/he/vidalia_he.po b/he/vidalia_he.po
index b5a9f9f..e9acbd4 100644
--- a/he/vidalia_he.po
+++ b/he/vidalia_he.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "שפ×?"
@@ -220,6 +258,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 "×?×?×?:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr ""
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr ""
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "×?ר×?×?"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "ס×?ק×? ש×?×?×?×? ×?×? ×?×?×?×?ר."
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "×?×?ר נת×?×? ×?-Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "×?×?×?×? ×?צ×?×?×? ×?ת ק×?×?×¥ ×?רצת Tor ש×?×?."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "×¢×?ר×?"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "×?×?×?ת ×?×?ש×?"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "תצ×?×?×?"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "ש×?×?×¢×? ×?עת פת×?×?ת ×?פ×?פ×?"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia × ×?ש×? ×?×?פע×?ת ×?×?פ×?פ×? ×?×?×?×?×?ר"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "ש×?×?ר×?×?×?×?×?×?×?ת  ×?×?×?×¢×?ת ×?×?ש×?ת ×?ק×?×?×¥"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "ש×?×?ר ת×?×?×? ×?×?×?×¢×?ת ×?×?×?×? ×?×?ש×?ת"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "ש×?×?ר ת×?×?×? ×?×?×?×¢×?ת ×?×?×?×? ×?×?ש×?ת"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "×?שר ×?×? תק×?×?"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "×?×?×?×? ×?×?שר ×?נת×?×? ×?×?× ×? תק×?×?."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "×?×?×?"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "×?×?×?×?ר"
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "ש×?×?×¢×?"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "ת×?×?×?×? %1 ×?×? ×?צ×?×?×? ×?עצ×?ר. (%2)"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "×?×?ש×?ר"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "×?ש×?×?×? ×?פת×?×?×?ת ק×?×?×¥ ×?×?×?×? '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po
index dae7296..5e22235 100644
--- a/hi/vidalia_hi.po
+++ b/hi/vidalia_hi.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "भाषा"
@@ -220,6 +258,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 ""
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "सहभा�न"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "स�वा��"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
@@ -1272,63 +1323,68 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgid "Executables (*.exe)"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgid "Select Path to Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/hu/vidalia_hu.po b/hu/vidalia_hu.po
index 1493527..2ee045e 100644
--- a/hu/vidalia_hu.po
+++ b/hu/vidalia_hu.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Válasszon ki egy fájlt a Tor socket útvonalhoz"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia nem tudta eltávolítani a Tor szolgáltatást.\n\nKézzel kell majd eltávolítania."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Nyelv"
@@ -221,6 +259,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:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "Megosztás"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Szolgáltatások"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Megjelenés"
 
@@ -435,6 +486,12 @@ msgstr "Probléma a Tor-hoz csatlakozás közben"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "A Vidalia megpróbálhatja újraindítani a Tor-t. Ez le fogja csukni az aktuálisan aktív kapcsolatokat a Tor folyamaton keresztül."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr "Le kell állítania a Tor folyamatot, mielÅ?tt a Vidalia el tudna indítani egy újat."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "A Vidalia megpróbálhatja újraindítani a Tor-t. Ez le fogja csukni az aktuálisan aktív kapcsolatokat a Tor folyamaton keresztül."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "A Vezérlõ szál (socket) nem kapcsolódott."
@@ -1273,24 +1324,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "A Vidalia hibát észlelt és bezárása szükséges"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Egy összeomlási jelentés készült, amit automatikusan el tud küldeni a Vidalia fejlesztÅ?i részére, hogy azonosíthassák, és javíthassák a problémát. Az elküldött jelentés nem tartalmaz személyes azonosításra alkalmas információt, de a csatlakozás a bejelentÅ? szerverhez lehet, hogy nem lesz névtelen."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Kérjük írja le, hogy mit csinált, mielÅ?tt az alkalmazás összeomlott (opcionális):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Az összeomlási jelentés elküldése a Vidalia fejlesztÅ?i felé"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "A Vidalia újraindítása"
 
@@ -1308,17 +1341,44 @@ msgid ""
 "manually."
 msgstr "Nem sikerült automatikusan újraindítani a Vidalia-t. Kérjük indítsa el kézzel."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Kapcsolódás..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "�sszeomlási jelentés küldése..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Válasz fogadása..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "A Tor elérési útjának megadása"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Proxy indítófájl kiválasztása"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Meg kell határoznia a TOR indítófájl nevét."
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Program (opcionális)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Proxy program indítása a Tor indításakor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy program parancssori kapcsolói:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Szoftver frissítések"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "Súgó"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "�j identitás"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "Nézet"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Hiba a böngészÅ? indításakor"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "A beállított böngészõ indítása sikertelen"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Hiba az IM (azonnali üzenetküldÅ?) program indításakor"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "A beállított IM program indítása sikertelen"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Hiba a proxy kiszolgáló indításakor"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "A beállított proxy kiszolgáló indítása sikertelen"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Csatlakozás egy Elosztó címtárhoz"
 
@@ -1730,10 +1746,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"
 
@@ -1952,12 +1964,6 @@ msgstr "Az alábbi hiba történt:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Az alkalmazásai egyike %1a titkosítatlan és nem biztonságos kapcsolatot próbál létrehozni a %2 porton keresztül."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,14 +1974,6 @@ msgid "toolBar"
 msgstr "eszköztár"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Indítás"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Leállítás"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "�jraindítás"
 
@@ -1993,6 +1991,79 @@ msgstr "RendszertÅ?ltÅ? torrc a %1 -tÅ?l %2 -ig"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "A Vidalia megpróbálta újraindítani a Tor-t, de nem sikerült neki. Kérjük ellenÅ?rizze a FeladatkezelÅ?ben, hogy nem fut más Tor folyamat."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Hiba a konfiguráció betöltése közben"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "A Vidalia nem tudta újratölteni a Tor konfigurációját."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2006,22 +2077,22 @@ msgid ""
 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 ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "A Vidalia megpróbálta újraindítani a Tor-t, de nem sikerült neki. Kérjük ellenÅ?rizze a FeladatkezelÅ?ben, hogy nem fut más Tor folyamat."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "sikertelen (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", valószínűleg Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", valószínüleg egy levelezÅ? kliens,"
+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 ""
@@ -2029,14 +2100,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Az Elosztója leállítás alatt.\nKattintson a 'Leállítás'-ra az azonnali leállításhoz."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Hiba a konfiguráció betöltése közben"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "A Vidalia nem tudta újratölteni a Tor konfigurációját."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Hiba a szűrÅ? beállításakor"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Mindig mentse automatikusan az új üzeneteket"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Mindig mentse az új üzeneteket"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "eszköztár"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Mindig mentse az új üzeneteket"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,13 +2515,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Ã?llapot"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "�rvénytelen Hídkapcsolat"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A megadott Hídkapcsolat azonosító érvénytelen."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2593,13 +2670,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "elfogad"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "visszautasít"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Csatlakozva"
@@ -3038,83 +3207,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Email cím amin elérhetÅ?, ha probléma van az Ã?n elosztójával. Megadhatja mellé a PGP vagy GPG ujjlenyomatát is."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Hiba minden futó szolgáltatás lekapcsolásakor"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Adjon meg minimum egy szolgáltatás könyvtárat és egy portot minden elmentendÅ? szolgáltatáshoz, a többit pedig törölje."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Hiba"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Válasszon egy szolgáltatást."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Szolgáltatás könyvtár kiválasztása"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "A Virtuális port csak érvényes (1..65535) számokat tartalmazhat"
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "A cél cím a következÅ? formátumú lehet: cím:port vagy csak cím, vagy csak port."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "A könyvár már használatban van egy másik szolgáltatás által."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Biztosított rejtett szolgáltatások"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion cím"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtuális Port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Cél"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Címtár útvonal"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Státusz"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "�j szolgáltatás felvétele a listába"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Kiválasztott szolgáltatás eltávolítása a listából"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "A kiválasztott szolgáltatás .onion címének vágólapra  másolása"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "A kiválasztott szolgáltatás helyének kitallózása a számítógépen"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Tor által létrehozva"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr "A Vidalia nem indította el a Tor-t. Le kell állítania a Tor-t azon a felületen keresztül, ahogy indította azt."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "%1 folyamat leállítása sikertelen. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr "torrc fájl szerkesztése"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Beállítások mentése. Ha nem kerül bejelölésre, akkor csak az aktuális Tor példányhoz kerül beállításra."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Kivág"
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr "Mindent kijelöl"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Mindenre végrehajt"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Csak a kijelöltre hajt végre"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Hiba a Tor-hoz kapcsolódásban"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "A kijelölés üres. Válasszon ki szöveget, vagy jelölje a Mindenre végrehajt opciót."
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Hiba a %1 sorban: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Hiba"
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Verzió"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "�sszeomlási jelentés feltöltése"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "A jelentés küldése sikertelen: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "A '%1' napló megnyitása sikertelen: %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "�rvénytelen nyelvi kód lett megadva:"
 
diff --git a/id/vidalia_id.po b/id/vidalia_id.po
index 9725f5a..c56f9d1 100644
--- a/id/vidalia_id.po
+++ b/id/vidalia_id.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Bahasa"
@@ -220,6 +258,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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Berbagi"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Layanan"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Penampilan"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Kendali socket tidak terhubung."
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Pilih path ke Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Pilih Proxy Executable"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Anda harus merinci nama Tor executable."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Application (pilihan)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Jalankan Proxy Application ketika Tor berjalan"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy Application Arguments:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Bantuan"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Identitas Baru"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Tampilan"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Error menjalankan browser"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia tidak bisa menjalankan browser yang telah dikonfigurasi"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Error menjalankan IM klien"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia tidak bisa menjalankan IM klien yang telah dikonfigurasi"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Error menjalankan proxy server"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia tidak bisa menjalankan proxy server yang telah dikonfigurasi"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Menghubungkan diri ke direktori relay"
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/is/vidalia_is.po b/is/vidalia_is.po
index fbef7a8..4330f5c 100644
--- a/is/vidalia_is.po
+++ b/is/vidalia_is.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Tungumál"
@@ -220,6 +258,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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Deiling"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "�jónustur"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Ã?tlit"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Veldu slóð að Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr ""
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Hjálp"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nýtt auðkenni"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Sýn"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Tókst ekki að ræsa vefskoðara"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia tókst ekki að ræsa innstilltan vefskoðara"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Villa við að ræsa spjallforrit"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia tókst ekki að ræsa instillt spjallforrit"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,11 +2352,11 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2451,12 +2514,26 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
@@ -3037,82 +3206,60 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr ""
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
+msgctxt "ServerPage"
+msgid "per"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
 msgstr ""
 
 msgctxt "StatusEventWidget"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr ""
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/it/vidalia_it.po b/it/vidalia_it.po
index 231bba9..d06c0aa 100644
--- a/it/vidalia_it.po
+++ b/it/vidalia_it.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+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"
@@ -199,12 +199,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Seleziona il percorso del file da usare come socket per Tor"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia non ha potuto rimuovere il servizio Tor.\n\nDovresti rimuoverlo manualmente."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Lingua"
@@ -225,6 +263,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:"
@@ -390,10 +445,6 @@ msgid "Sharing"
 msgstr "Condivisione"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Servizi"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Aspetto"
 
@@ -439,6 +490,12 @@ msgstr "Problema nel connettersi a Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia può provare a riavviare Tor per voi. Questo chiuderà tutte le connessioni attive attraverso il vostro processo Tor."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -450,12 +507,6 @@ msgid ""
 "one."
 msgstr "Dovete terminare il processo di Tor prima che Vidalia ne possa avviare un altro."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia può provare a riavviare Tor per voi. Questo chiuderà tutte le connessioni attive attraverso il vostro processo Tor."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Il socket di controllo non è connesso."
@@ -1277,24 +1328,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia ha riscontrato un errore e deve essere chiuso."
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Un rapporto sul crash è stato creato automaticamente in modo che sia possibile inviarlo agli sviluppatori di Vidalia per aiutarli ad identificare e correggere il problema. Il rapporto inviato non contiene alcuna informazione personale, ma potrebbe essere possibile associare la vostra identità al rapporto stesso."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Si prega di descrivere quello che si stava facendo prima che l'applicazione smettesse di rispondere (facoltativo):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Manda una segnalazione dell'errore agli sviluppatori di Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Riavvia Vidalia"
 
@@ -1312,17 +1345,44 @@ msgid ""
 "manually."
 msgstr "Vidalia non è riuscito a riavviarsi automaticamente, per favore lo riavvi manualmente."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Connessione in corso..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Invio segnalazione errore in corso..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Ricezione risposta in corso..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1333,10 +1393,6 @@ msgid "Select Path to Tor"
 msgstr "Imposta il percorso di Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Seleziona l'eseguibile del proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Devi indicare il nome dell'eseguibile di Tor"
 
@@ -1353,18 +1409,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Applicazione Proxy (facoltativa)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Avvia un'applicazione proxy quando Tor si avvia"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Argomenti applicazione proxy:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Aggiornamenti Software"
 
@@ -1658,10 +1702,6 @@ msgid "Help"
 msgstr "Aiuto"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nuova identità"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1670,30 +1710,6 @@ msgid "View"
 msgstr "Mostra"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Errore nell'avvio del browser web"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia non è riuscito ad avviare il browser web impostato"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Errore all'avvio del client IM"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia non è riuscito a configurare il client IM"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Errore nell'avvio del proxy server"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia non è riuscito ad avviare il proxy server configurato"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Connessione ad una directory dei relay"
 
@@ -1734,10 +1750,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"
 
@@ -1956,12 +1968,6 @@ msgstr "Si è verificato questo errore:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Una delle applicazioni in uso %1a sembra utilizzare una connessione non criptata e potenzialmente non sicura verso la porta %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1972,14 +1978,6 @@ msgid "toolBar"
 msgstr "Barra degli strumenti"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Avvia"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Stop"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Riavvia"
 
@@ -1997,6 +1995,79 @@ msgstr "Inizializzando torrc fa %1 a %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia ha provato a riavviare Tor, ma non è stata in grado. Si consiglia di controllare il gestore dei processi per assicurarsi che non ci siano altri processi Tor in esecuzione."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Errore durante il caricamento delle impostazioni"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia non ha potuto ricaricare la configurazione di Tor."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2010,22 +2081,22 @@ msgid ""
 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 ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia ha provato a riavviare Tor, ma non è stata in grado. Si consiglia di controllare il gestore dei processi per assicurarsi che non ci siano altri processi Tor in esecuzione."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "fallito (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", probabilmente Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", probabilmente un client email,"
+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 ""
@@ -2033,14 +2104,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Il tuo relay si sta spegnendo.\nFai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Errore durante il caricamento delle impostazioni"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia non ha potuto ricaricare la configurazione di Tor."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Errore nell'impostazione del filtro"
@@ -2294,14 +2357,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Salva automaticamente i nuovi messaggi su file"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Salva sempre i nuovi messaggi di log"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "barra degli strumenti"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Salva sempre i nuovi messaggi di log"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2456,13 +2519,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Stato"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge non valido"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identifier del bridge specificat non è valido."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2597,13 +2674,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accetta"
@@ -2612,6 +2751,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "rifiuta"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3042,83 +3211,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "L'indirizzo email per contattarti se ci fosse un \nproblema col tuo relay. Puoi inserire anche il tuo fingerprint PGP o GPG."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Errore durante il ritiro dei servizi"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Configura almeno una cartella per il servizio e una porta virtuale per ogni servizio che vuoi salvare. Rimuovi gli altri."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Errore"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Seleziona un servizio"
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Seleziona la cartella del servizio"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "La porta virtuale può solo contenere numeri di porta validi [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Il target può solo contenere indirizzo:porta, indirizzo o porta."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Cartella già in uso da parte di un altro servizio."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Hidden service forniti"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Indirizzo .onion"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Porta virtuale"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Target"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Percorso della cartella"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Attivato"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Aggiungi un nuovo servizio alla lista"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Rimuovi il servizio selezionato dalla lista"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copia l'indirizzo onion selezionato negli appunti"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Esplora nei file di sistema locali e scegli una cartella per i servizi selezionati"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Creato da Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3423,6 +3570,22 @@ msgid ""
 "started it."
 msgstr "Vidalia non ha avviato Tor. Sarà necessario terminare Tor attraverso l'interfaccia dalla quale è stato avviato."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Il processo %1 non è riuscito a terminare. [%2]"
@@ -3444,12 +3607,6 @@ msgid "Editing torrc"
 msgstr "Modifica il file di configurazione torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Salva la configurazione. Se non selezionato, applicherà i cambiamenti solo all'istanza corrente di Tor."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Taglia"
 
@@ -3474,26 +3631,6 @@ msgid "Select All"
 msgstr "Seleziona tutto"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Applica tutte"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Applica solo quelle selezionate"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Errore durante la connessione di Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "La selezione è vuota. Per favore selezioni qualche opzione, o spunti \"Applica tutto\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Errore alla linea %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Errore"
 
@@ -3653,14 +3790,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "versione"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Invio segnalazione errore in corso"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Impossibile inviare il report: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3754,6 +3883,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Non è stato possibile aprire il file di log '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Il codice della lingua indicato non è valido:"
 
diff --git a/my/vidalia_my.po b/my/vidalia_my.po
index a1d4a0f..6521ad3 100644
--- a/my/vidalia_my.po
+++ b/my/vidalia_my.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "á??á?¬á??á?¬á??á??á?¬á?¸"
@@ -220,6 +258,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 "á??á??á??á?¹á?¸á??:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "á?¡á??á?°á??á??á?¼á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á?³"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "á??á??á?¹á?±á??á?¬á??á?¹á??á?½á?³á??á?ºá?¬á?¸"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "á??á?¶á?¯á??á?¶"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?½á?³ socket á?¡á?¬á?¸á??á??á?ºá?­á??á?¹á??á??á?¹á??á?¬á?¸á??á?«á??"
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Tor á?¡á??á?¼á??á?¹á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á?±á??á?¼á?¸á??á?ºá??á?¹á??á??á?¹"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ Proxy á??á?¯á?­ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "á??á??á?¹á?? á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?­á?¯á??á?¹á?±á??á?¬ Tor á??á?¯á?­ á?¡á??á??á?¹ á??á??á?¹á??á?½á??á?¹á?±á??á?¸á??á?«"
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Application (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Proxy application á??á?­á?¯ Tor á??á??á??á?¹á??á?ºá?­á??á?¹á??á?¼á??á?¹ á??á??á??á?¹á??á?«"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy Application á??á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸ :"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "á?¡á??á?°á?¡á??á?®"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "á??á?¯á?­á??á?¹á??á?­á?¯á??á?¹á?¡á??á?½á??á?¹á?¡á??á?¬á?¸á?¡á??á??á?¹"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "á?¾á??á??á?¹á?·á??á??á??á??á?¹"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Web browser á??á??á??á?¹á??á?¬á??á?¼á??á?¹ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia á??á?½ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ Web browser á??á?­á?¯ á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "IM client á??á?¯á?­ á??á??á??á?¹á??á?¬á??á?¼á??á?¹ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ IM client á??á?¯á?­ á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Proxy server á??á??á??á?¹á??á?¬á??á?¼á??á?¹ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ Proxy server á??á?­á?¯ á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Relay directory á??á?¯á?­ á??á??á?¹á??á?¼á??á?¹á?±á??á??á?«á??á??á?¹"
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor Network á??á?­á?¯á?? á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á??á?«á??á??á?¹ !"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "á?¡á??á?­á?¡á??á?½á??á?¹á??á?»á??á?³á??á?¯á?­á??á?¹á?±á??á?¬ á??á??á??á?¹á??á?? á?¡á?±á?»á??á?¡á?±á??"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "á?¡á?±á??á?¼á?±á??á?¼"
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?½á??á?¹á??á??á?¹á?¸ á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ á??á?¯á?­á??á?¹á??á??á?¹á??á?¯á??á?­á?¯á?? á??á?­á??á?¹á?¸á??á?«"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?½á??á?¹á??á??á?¹á?¸á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?¡á?»á??á?²á??á??á?¹á?¸ á??á?­á??á?¹á?¸á??á?«"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?½á??á?¹á??á??á?¹á?¸á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?¡á?»á??á?²á??á??á?¹á?¸ á??á?­á??á?¹á?¸á??á?«"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "á??á??á?®á?±á??á?ºá?¬á?¹á?±á??á?¬ Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "á?±á??á?¬á?¹á?»á??á??á?¬á?¸á?±á??á?¬ bridge á?±á??á?¬á?¹á?»á??á??á?ºá??á?¹á??á??á?¹ á??á??á?®á?±á??á?ºá?¬á?¹á??á?«"
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "á?»á??á??á?¹á?¸á??á??á?¹á??á?«á??á??á?¹"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á??á?¯á??á?¹á??á?¯á??á?¹á?»á??á??á?¹á??á??á?ºá?­á??á??á?? á??á?¯á??á?¹á??á?­á??á?¹á?¸á?±á??á??á?¥á?¹ á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??á??á?½á?­á??á?«á??á??á?¹"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?­á?¯á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á??á?¹á??á?¯á??á?®á?¡á??á?¼á??á?¹ á?¡á??á??á?¹á?¸á??á?¶á?¯á?¸ service directory á??á?½á??á?¹á?· virtual port á??á??á?¹á??á?¯á??á?® á??á??á?¹á??á?½á??á?¹á??á?«á?? á?¡á?»á??á?¬á?¸ á?¡á??á?¬á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á??á?½á?¬á?¸á??á?«"
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á??"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á??á?¹á??á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Service directory á??á??á?¹á??á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtual Port á??á??á?¹ Port á??á?¶á??á?«á??á?¹ á?? á??á?½ á??á??á??á??á?? á?¡á??á?­á??á?¬ á?¡á??á?ºá?¶á?³á?¸á??á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "á??á??á?¹á??á?½á??á?¹á??á??á?¹ á??á?­á??á?¹á??á?¬:port, á??á?­á??á?¹á??á?¬ á??á?­á?¯á??á??á??á?¯á??á?¹ port á??á?¬ á??á?«á??á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Directory á??á??á?¹ á?¡á?»á??á?¬á?¸ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á??á?¹á??á?¯á??á?½ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á??á?¹á?·á?»á??á?®á?¸ á?»á??á??á?¹á??á?«á??á??á?¹"
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "á??á?½á?ºá?­á?³á??á??á?½á??á?¹á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á??á??á?½á?­á?»á??á?®á?¸ á?»á??á??á?¹á??á?«á??á??á?¹"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion á??á?­á??á?¹á??á?¬"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "á??á??á?¹á??á?½á??á?¹"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Directory á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "á??á?¬á??á??á?¹á?¸á??á?²á??á?­á?¯á?? á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á??á??á?¹ á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á?¹"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "á??á?¬á??á??á?¹á?¸á??á?²á??á?½ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?¯á?­ á??á??á?¹á??á?½á?¬á?¸á??á??á?¹"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?? Onion á??á?­á??á?¹á??á?¬á??á?­á?¯ clipboard á??á?­á?¯á?? á??á?°á?¸á??á??á?¹"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "local á??á?­á?¯á??á?¹ á??á??á??á?¹á?¡á??á?¼á??á?¹á?¸á??á?¼á??á?¹ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á??á?¼á??á?¹ directory á?±á??á?¼á?¸á??á?ºá??á?¹á?±á??á?¸á??á?«"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Tor á??á?½ á??á?®á??á?¼á??á?¹á??á??á?¹á??á?®á?¸á??á??á?¹"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?? %1 á??á??á?¹á??á??á?¹á??á??á??á?¹ á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?« [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "á?¡á?­á?¯á?±á??"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "á??á?½á??á?¹á??á??á?¹á?¸ á??á?¯á?­á??á?¹á??á?¯á?­ á??á??á?¼á??á?¹á?·á??á?­á?¯á??á?¹á??á?« '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po
index e71bbd5..b39d999 100644
--- a/nb/vidalia_nb.po
+++ b/nb/vidalia_nb.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia klarte ikke å fjerne Tor-tjenesten.\n\nDu kan bli nødt til å måtte fjerne det manuelt."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Språk"
@@ -220,6 +258,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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Deling"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Tjenester"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Utseende"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Kontroll-socket er ikke tilkoblet."
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Velg sti til Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Velg kjørbar proxy-fil"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Du må spesifisere navnet på din kjørbare Tor-fil."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy-applikasjon (valgfritt)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Start en proxy-applikasjon når Tor starter"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy-applikasjons argumenter:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Programvareoppdateringer"
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Hjelp"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Ny Identitet"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Vis"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Feil ved start av nettleser"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia klarte ikke å starte den konfigurerte nettleseren"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Feil ved start av IM-klient"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia klarte ikke å starte den konfigurerte IM-klienten"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Feil ved start av proxy-server"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia klarte ikke å starte den konfigurerte proxy-serveren"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Kobler til en relékatalog "
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr "Følgende feil skjedde:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,27 +1973,92 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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"
@@ -2005,36 +2076,28 @@ msgid ""
 msgstr "Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n\nVennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "feilet (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", sannsynligvis Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", sannsynligvis en epostklient,"
+msgid "(probably an email client)"
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Din relé stenges ned.\nTrykk på \"Stopp\" igjen for å stenge din relé nå."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Din relé stenges ned.\nTrykk på \"Stopp\" igjen for å stenge din relé nå."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Lagre automatisk nye loggmeldinger til en fil"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Alltid lagre nye loggmeldinger"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Alltid lagre nye loggmeldinger"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ugyldig Bro"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den oppgitte broidentifikatoren er ikke gyldig"
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "avslå"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Tilkoblet"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Epostadressen du kan bli nådd på hvis det skulle være et\nproblem med din relé. Du kan også inkludere ditt PGP eller GPG fingeravtrykk."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Feil mens forsøk på å upublisere alle tjenester"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Vennligst konfigurer minst en tjenestekatalog og en virituell port for hver tjeneste du vil lagre. Fjern de andre."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Feil"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Vennligst velg en tjeneste."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Velg tjenestekatalog"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Den virtuelle porten kan kun inneholde gyldige portnummer [1..65535]"
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "MÃ¥let kan kun inneholdet adresse:port, adresse, eller port."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Katalog allerede i bruk av en annen tjeneste."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Valgte skjulte tjenester"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion-adresse"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtuell port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "MÃ¥l"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Katalogsti"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Aktivert"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Legg ny tjeneste til listen"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Fjern valgte tjeneste fra listen"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopier onion-adressen av valgte tjenester til utklipstavle"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Bla i det lokale filsystemet og velg en katalog for valgte tjeneste"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Opprettet av Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Prosess %1 nektet å stoppe. [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Versjon"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Kunne ikke åpne loggfil '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Ugyldig språkkode angitt:"
 
diff --git a/nl/vidalia_nl.po b/nl/vidalia_nl.po
index ab83aef..0048a84 100644
--- a/nl/vidalia_nl.po
+++ b/nl/vidalia_nl.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Shondoit Walker <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Selecteer een bestande om als Tor socket pad te gebruiken."
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia kon de Tor service niet verwijderen.\n\nDe service moet misschien manueel verwijderd worden."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Taal"
@@ -221,6 +259,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:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "Delen"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Diensten"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Uiterlijk"
 
@@ -435,6 +486,12 @@ msgstr "Probleem tijdens verbinding maken met Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia kan proberen om Tor voor je te herstarten. Dit zal alle momenteel actieve verbindingen via je Tor process afsluiten."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr "Je zult het Tor proces af moeten sluiten voordat Vidalia een nieuwe kan starten."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia kan proberen om Tor voor je te herstarten. Dit zal alle momenteel actieve verbindingen via je Tor process afsluiten."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Control socket is niet verbonden."
@@ -1273,24 +1324,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia is een fout tegengekomen en moest afgesloten worden"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Er is een crashrapportage gemaakt die je automatisch naar de Vidalia ontwikkelaars kan versturen om problemen te helpen te identificeren en op te lossen. De verstuurde rapportage bevat geen persoonlijk identificeerbare informatie, maar de verbinding met de crashraportage server mag niet anoniem zijn."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Beschrijf wat je deed voordat de applicatie crashte (optioneel):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Stuur mijn crashraportage naar de Vidalia ontwikkelaars"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Herstart Vidalia"
 
@@ -1308,17 +1341,44 @@ msgid ""
 "manually."
 msgstr "We waren niet in staat om Vidalia automatisch te herstarten. Start Vidalia handmatig opnieuw op."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Verbinden..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Bezig met crashraport versturen..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Bezig met antwoord ontvangen..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "Kies het Pad naar Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Proxy-toepassing selecteren"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Er moet een naam gekozen worden voor de tor-toepassing"
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy toepassing (optioneel)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "De proxy toepassing starten als Tor start"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy toepassingsargumenten:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Software Updates"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "Help"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nieuwe Identiteit"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "Bekijk"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Fout tijdens het starten van de browser"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia kon de geconfigureerde browser niet starten"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Fout tijdens het starten van de IM-toepassing"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia kon de geconfigureerde IM-toepassing niet starten"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Fout tijdens het start van de proxy server"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia kon de geconfigureerde proxy server niet starten"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Verbinden met een verbindingslijst"
 
@@ -1730,10 +1746,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"
 
@@ -1952,12 +1964,6 @@ msgstr "De volgende fout vond plaats:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Eén van je applicaties%1a lijkt een mogelijk onversleutelde en onveilige verbinding te maken naar poort %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,14 +1974,6 @@ msgid "toolBar"
 msgstr "Werkbalk"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Start"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Stop"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Herstart"
 
@@ -1993,6 +1991,79 @@ msgstr "Bezig met bootstrappen van torrc van %1 naar %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia probeerde Tor te herstarten, maar was daartoe niet in staat. Controleer je taakbeheer om er voor te zorgen dat er geen andere Tor processen uitgevoerd worden."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Fout tijdens laden van configuratie"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia was niet in staat om Tor's configuratie te herladen."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2006,22 +2077,22 @@ msgid ""
 msgstr "Vidalia ontdekte dat de Tor software onverwacht stopte.\n\nControleert u alstublieft de berichtenlog voor recente waarschuwingen of foutmeldingen."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia probeerde Tor te herstarten, maar was daartoe niet in staat. Controleer je taakbeheer om er voor te zorgen dat er geen andere Tor processen uitgevoerd worden."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "mislukt (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", mogelijk Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", mogelijk een email cliënt,"
+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 ""
@@ -2029,14 +2100,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Uw relay is aan het afsluiten.\nKlik opnieuw op 'Stop' om uw relay nu te stoppen."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Fout tijdens laden van configuratie"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia was niet in staat om Tor's configuratie te herladen."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Fout bij Instellen Filter"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Automatisch nieuwe log berichten opslaan naar bestand"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Altijd Nieuwe Log Berichten Opslaan"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "werkbalk"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Altijd Nieuwe Log Berichten Opslaan"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,13 +2515,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Status"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ongeldige Brug"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "De opgegeven bridge identifier is niet geldig."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2593,13 +2670,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "toestaan"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "weigeren"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3038,83 +3207,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "E-mailadres waarop u kan worden bereikt als er een probleem is met uw server. Je kan ook je PGP of GPG fingerprint toevoegen."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Fout tijdens depubliceren van services"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Configureer tenminste één service directory en een virtuele poort voor elke dienst die je wilt opslaan. Verwijder de andere."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Fout"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Selecteer een Service."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Kies service directory"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtuele poort mag alleen geldige poortnummers bevatten [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Doel kan alleen adres:port, adres of poort bevatten."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Folder is al in gebruik door een andere service."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Aangeboden hidden services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion-adres"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtuele poort"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Doel"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Directory pad"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Ingeschakeld"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Voeg een nieuwe service toe aan de lijst"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Verwijder geselecteerde service uit de lijst"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopieer onion-adres van de geselecteerde service naar het klembord"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Blader in het lokale bestandssysteem en folder voor de gekozen service"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Gemaakt door Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr "Vidalia heeft Tor niet gestart. Je moet Tor stoppen de interface waarmee je het gestart hebt."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Stoppen van proces %1 mislukt. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr "Bezig met bewerken van torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Instellingen opslaan. Indien niet aangevinkt zal het alleen toegepast worden op de huidige Tor instantie."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Knippen"
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr "Alles selecteren"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Alles toepassen"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Alleen selectie toepassen"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Fout tijdens verbinden met Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Selectie is leeg. Selecteer een stuk tekst, of vink \"Alles toepassen\" aan"
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Fout op regel %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Fout"
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Versie"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Bezig met uploaden van crashraportage"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Kan rapport niet verzenden: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Openen mislukt van log bestand '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Ongeldige taalcode opgegeven:"
 
diff --git a/pl/vidalia_pl.po b/pl/vidalia_pl.po
index eb1e624..6e537df 100644
--- a/pl/vidalia_pl.po
+++ b/pl/vidalia_pl.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-27 19:51+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: mojojojo <ipjsdfpojsdf@xxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -196,12 +196,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia nie mogÅ?a usunÄ?Ä? usÅ?ugi Tor.\n\nBÄ?dziesz musiaÅ? usunÄ?Ä? jÄ? rÄ?cznie."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "JÄ?zyk"
@@ -222,6 +260,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:"
@@ -387,10 +442,6 @@ msgid "Sharing"
 msgstr "WspóÅ?dzielenie"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "UsÅ?ugi"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "WyglÄ?d"
 
@@ -436,6 +487,12 @@ msgstr "Problem poÅ?Ä?czenia z sieciÄ? Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -447,12 +504,6 @@ msgid ""
 "one."
 msgstr "Musisz wyÅ?Ä?czyÄ? proces Tor'a zanim Vidalia bÄ?dzie mogÅ?a uruchomiÄ? go ponownie."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Gniazdo sterujÄ?ce nie jest podÅ?Ä?czone."
@@ -1274,24 +1325,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia napotkaÅ?a bÅ?Ä?d i musiaÅ?a zakoÅ?czyÄ? dziaÅ?anie"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "WyÅ?lij raport bÅ?Ä?dów do developerów Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Restart Vidalia"
 
@@ -1309,17 +1342,44 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Å?Ä?czÄ?..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "WysyÅ?am raport bÅ?Ä?dów..."
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "OtrzymujÄ? odpowiedź..."
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1330,10 +1390,6 @@ msgid "Select Path to Tor"
 msgstr "Wybierz Å?cieżkÄ? do Tora"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Wybierz plik wykonywalny Proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Musisz okreÅ?liÄ? nazwÄ? pliku wykonywalnego Tora."
 
@@ -1350,18 +1406,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Aplikacja proxy (opcjonalnie)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Uruchamiaj aplikacjÄ? proxy gdy Tor startuje"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Parametry aplikacji proxy:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Uaktualnienia oprogramowania"
 
@@ -1655,10 +1699,6 @@ msgid "Help"
 msgstr "Pomoc"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nowa TożsamoÅ?Ä?"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1667,30 +1707,6 @@ msgid "View"
 msgstr "Widok"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "BÅ?Ä?d przy uruchamianiu przeglÄ?darki internetowej"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia nie mogÅ?a uruchomiÄ? wskazanej przeglÄ?darki internetowej"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "BÅ?Ä?d uruchamiania klienta IM"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia nie mogÅ?a uruchomiÄ? ustalonego klienta IM."
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "WystÄ?piÅ? bÅ?Ä?d przy uruchamianiu serwera proxy"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia nie mogÅ?a uruchomiÄ? wskazanego serwera proxy"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "PodÅ?Ä?czanie do katalogu wÄ?zÅ?ów"
 
@@ -1731,10 +1747,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"
 
@@ -1953,12 +1965,6 @@ msgstr "WystÄ?piÅ? nastÄ?pujÄ?cy bÅ?Ä?d:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1969,14 +1975,6 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Start"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Stop"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Restart"
 
@@ -1994,6 +1992,79 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "BÅ?ad podczas wczytywania konfiguracji"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia nie potrafiÅ?a przeÅ?adowaÄ? konfiguracji Tor'a"
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2007,22 +2078,22 @@ msgid ""
 msgstr "Vidalia wykryÅ?a, że Tor nieoczekiwanie zakoÅ?czyÅ? dziaÅ?anie.\n\nProszÄ? sprawdziÄ? logi w celu poznania przyczyny."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "nie powiodÅ?o siÄ? (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", prawdopodobnie Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", prawdopodobnie klient e-mail,"
+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 ""
@@ -2030,14 +2101,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Twój wÄ?zeÅ? zostanie wyÅ?Ä?czony.\n\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymaÄ?."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "BÅ?ad podczas wczytywania konfiguracji"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia nie potrafiÅ?a przeÅ?adowaÄ? konfiguracji Tor'a"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "BÅ?Ä?d ustawiania filtru"
@@ -2291,14 +2354,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Automatycznie zapisuj wiadomoÅ?ci do pliku"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Zawsze zapisuj nowe wiadomoÅ?ci"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Zawsze zapisuj nowe wiadomoÅ?ci"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2453,13 +2516,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Stan"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Niepoprawny WÄ?zeÅ?-Most"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "OkreÅ?lony identyfikator WÄ?zÅ?a-Mostu nie jest poprawny."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2594,13 +2671,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "akceptuj"
@@ -2609,6 +2748,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "odrzuÄ?"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Aktywny"
@@ -3039,83 +3208,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Adres e-mail, pod którym jesteÅ? dostÄ?pny w przypadku\nproblemów z dziaÅ?aniem Twojego wÄ?zÅ?a. Możesz również zamieÅ?ciÄ? sygnatury PGP lub GPG."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "WystÄ?piÅ? bÅ?Ä?d podczas dezaktywacji wszystkich usÅ?ug"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "ProszÄ? skonfigurowaÄ? przynajmniej katalog usÅ?ug oraz wirtualny port dla każdej usÅ?ugi. Inne proszÄ? usunÄ?Ä?."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "BÅ?Ä?d"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "ProszÄ? wybraÄ? usÅ?ugÄ?."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Wybierz katalog usÅ?ug"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Wirtualny port może zawieraÄ? tylko poprawne numery portów [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Cel może tylko zawieraÄ? adres:port, adres lub port."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Katalog jest aktualnie w użyciu przez innÄ? usÅ?ugÄ?."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Dostarczane ukryte usÅ?ugi"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Adres Onion"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Port wirtualny"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Cel"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Å?cieżka do katalogu"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "WÅ?Ä?czony"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Dodaj nowÄ? usÅ?ugÄ? do listy"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "UsuÅ? zaznaczonÄ? usÅ?ugÄ? z listy"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Skopiuj adres Onion wybranej usÅ?ugi do schowka"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "PrzeglÄ?daj lokalny system plików i wskaż katalog dla wybranej usÅ?ugi"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Utworzone przez Tora"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3420,6 +3567,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Nieudana próba zatrzymania procesu %1. [%2]"
@@ -3441,12 +3604,6 @@ msgid "Editing torrc"
 msgstr "Edycja torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Wytnij"
 
@@ -3471,26 +3628,6 @@ msgid "Select All"
 msgstr "Wybierz wszystko"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Zaznacz wszystko"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Zaznacz wybrane"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "BÅ?Ä?d poÅ?Ä?czenia z sieciÄ? Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "BÅ?Ä?d w linii %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "BÅ?Ä?d"
 
@@ -3650,14 +3787,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "wersja"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "WyÅ?lij raport bÅ?Ä?dów"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Nie można wysÅ?aÄ? raportu: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3751,6 +3880,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Nie udaÅ?o siÄ? otworzyÄ? pliku logu '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Niepoprawny kod jÄ?zyka:"
 
diff --git a/pt/vidalia_pt.po b/pt/vidalia_pt.po
index b632a00..2ad55f1 100644
--- a/pt/vidalia_pt.po
+++ b/pt/vidalia_pt.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: Filipe <nfscp@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Selecione um arquivo para usar no caminho do socket Tor "
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "O Vidalia falhou na remoção do serviço Tor.\n\nPode ter que o remover manualmente."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Idioma"
@@ -221,6 +259,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:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "Partilha"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Serviços"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Aparência"
 
@@ -435,6 +486,12 @@ msgstr "Poblemas a ligar a Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr "Temos que desligar o processo Tor antes que Vidalia lance um novo."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "O socket de controle não está conectado."
@@ -1273,24 +1324,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia encontrou um erro e necessita fechar."
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Um relatório de erros foi criado para que você pode enviar automaticamente para os programadores Vidalia para ajudar a identificar e corrigir o problema. O relatório apresentado não contém qualquer informação de identificação pessoal, mas a sua conexão com o servidor de relatórios de erros pode não ser anônima."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Por favor descreva o que estava a fazer antes de a aplicação dar erro. (opcional):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Envie o meu relatório de erro para os programadores de Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Reinicar Vidalia"
 
@@ -1308,17 +1341,44 @@ msgid ""
 "manually."
 msgstr "impossivel de reiniciar automaticamente Vidalia. Por favor proceda ao reinicio manualmente."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Ligando-se..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "A enviar relatório de erros..."
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "A receber resposta..."
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "Selecione o Diretório para o Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Selecione o Executável do Proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Deve especificar o nome do seu executável Tor."
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Aplicação Proxy (opcional)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Iniciar uma aplicação proxy quando iniciar o Tor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Argumentos da Aplicação Proxy:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Actualizações do Software"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "Ajuda"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nova Identidade"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "Visualizar"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Erro ao iniciar navegador web:"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "O Vidalia foi incapaz de iniciar o Navegador Web configurado"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Erro ao iniciar cliente IM"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "O Vidália foi incapaz de iniciar o cliente IM configurado"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Erro ao iniciar o servidor proxy"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "O Vidália foi incapaz de iniciar o servidor proxy configurado"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Conectando-se a uma pasta do retransmissor"
 
@@ -1730,10 +1746,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectado à rede Tor"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicialização desconhecido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diversos"
 
@@ -1952,12 +1964,6 @@ msgstr "Ocorreu o seguinte erro:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,14 +1974,6 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Iniciar"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Parar"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -1993,6 +1991,79 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2006,36 +2077,28 @@ msgid ""
 msgstr "Vidalia detectou que o software Tor encerrou inesperadamente.\n\nPor favor, verifique no seu log a existência de mensagens de alerta recente ou mensagens de erro."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Falhou (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", provavelmente Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", provavelmente um cliente de email,"
+msgid "(probably an email client)"
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "O seu retransmissor está a encerrar.\nClique 'Stop' novamente para parar o seu retransmissor agora."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "O seu retransmissor está a encerrar.\nClique 'Stop' novamente para parar o seu retransmissor agora."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Salvar automaticamente as novas mensagens de log para arquivo"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Sempre Salvar Novas Mensagens de Log"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Sempre Salvar Novas Mensagens de Log"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,13 +2515,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge inválida"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A bridge especificada não é válida."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2593,11 +2670,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "Rejeitar"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Ativo"
@@ -3038,83 +3207,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Endereço de email através do qual você pode ser contactado\nse ocorrer algum problema com o seu retransmissor.\nPode também incluir a sua impressão digital PGP ou GPG."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
+msgctxt "ServerPage"
+msgid "day"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Por favor, configure pelo menos um serviço de pastas e uma porta virtual para cada serviço que deseje guardar. Remova os outros."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Erro"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Por favor, selecione um Serviço."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Seleccionar o Serviço de Pastas"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Porta Virtual só pode conter números de portas válidas [1..65535]."
-
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Alvo só pode conter o endereço:porta, endereço, ou porta."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Pasta em uso por outro serviço."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Serviços Ocultos Prestados"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Porta Virtual"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Alvo"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Caminho da Pasta"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Permitir"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Adicionar um novo serviço à lista"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Remover o serviço seleccionado da lista"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copiar para o clipboard o endereço onion do serviço seleccionado"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Navegue no sistema de ficheiros local e escolha pasta para o serviço seleccionado"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Criado por Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "O Processo %1 não pôde ser encerrado. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "versão"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Não foi possível abrir o arquivo de log '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "� Inválido o código do idioma especificado:"
 
diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po
index 63fbbc3..610a423 100644
--- a/pt_BR/vidalia_pt_BR.po
+++ b/pt_BR/vidalia_pt_BR.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
-"Last-Translator: n3t0 <>\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
+"Last-Translator: m4lqu1570 <>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Selecione um arquivo para o Tor usar como caminho do socket"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia não conseguiu remover o serviço Tor.\n\nVocê precisa fazê-lo manualmente."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Idioma"
@@ -221,6 +259,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "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:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "Compartilhando"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Serviços"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Aparência"
 
@@ -435,6 +486,12 @@ msgstr "Problema ao conectar ao Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia pode tentar reiniciar o Tor para você.  Fazendo isto, todas as conexões Tor ativas no momento serão fechadas."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr "Você precisará parar o processo Tor antes do Vidalia iniciar um novo."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia pode tentar reiniciar o Tor para você.  Fazendo isto, todas as conexões Tor ativas no momento serão fechadas."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Conexão de controle não estabelecida."
@@ -1273,24 +1324,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia encontrou um erro e precisa ser fechado"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Um relatório do erro foi criado, e você pode automaticamente enviá-lo ao desenvolvedores do Vidalia para ajudar a identificá-lo e solucioná-lo. O envio do relatório não contém nenhuma informação pessoal, mas sua conexão com o servidor de relatório de erros pode não ser anônima."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Por favor, descreva o que você estava fazendo antes de ocorrer o erro na aplicação (opcional)"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Envie meu relatório de erro aos desenvolvedores Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Reiniciar Vidalia"
 
@@ -1308,17 +1341,44 @@ msgid ""
 "manually."
 msgstr "Nós estamos impossibilitados de reiniciar o Vidalia automaticamente. Por favor, reinicie o Vidalia manualmente"
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Conectando..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Enviando relatório de erro..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Recebendo resposta..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "Selecionar caminho para o Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Selecionar executável de proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Você deve especificar o nome do executável Tor."
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Aplicativo de Proxy (opcional)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Iniciar um aplicativo de proxy junto com o Tor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Parâmetros do aplicativo de proxy:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Atualizações do Programa"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "Ajuda"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Nova identidade"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "Ver"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Erro ao iniciar navegador de internet"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia foi incapaz de iniciar o navegador de internet configurado"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Erro ao iniciar cliente de mensagens instantâneas"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia foi incapaz de iniciar o cliente de mensagens instantâneas configurado"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Erro ao iniciar servidor de proxy"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia foi incapaz de iniciar o servidor de proxy"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Conectando a um diretório de servidores"
 
@@ -1730,10 +1746,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectado a rede Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicio não reconhecido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "variados"
 
@@ -1952,12 +1964,6 @@ msgstr "Ocorreu o seguinte erro:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Uma de suas aplicações%1aparenta estar fazendo uma potencial conexão desencriptada e insegura na porta %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,14 +1974,6 @@ msgid "toolBar"
 msgstr "Barra de Ferramentas"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Iniciar"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Parar"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -1993,6 +1991,79 @@ msgstr "Bootstrapping torrc de %1 a %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia tentou reiniciar Tor, mas não conseguiu. Por favor, cheque seu Gerenciador de Tarefas para ter certeza de que não há outro processo Tor rodando."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Erro ao recarregar a configuração"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia estava impossibilitado de recarregar a configuração do Tor"
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2006,22 +2077,22 @@ msgid ""
 msgstr "Vidalia detectou que o Tor fechou inesperadamente.\n\nPor favor, cheque o log de mensagens para recentes avisos ou mensagens de erro."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia tentou reiniciar Tor, mas não conseguiu. Por favor, cheque seu Gerenciador de Tarefas para ter certeza de que não há outro processo Tor rodando."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "falhou (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", provavelmente Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", provavelmente um cliente de e-mail,"
+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 ""
@@ -2029,14 +2100,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Sua retransmissão está sendo encerrada.\nClique em \"Parar\" de novo para encerrar sua retransmissão agora."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Erro ao recarregar a configuração"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia estava impossibilitado de recarregar a configuração do Tor"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Erro ao configurar filtro"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Salvar, automaticamente, novas mensagens de registro para um arquivo"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Sempre salvar novas mensagens de registro"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "barra de ferramentas"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Sempre salvar novas mensagens de registro"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,13 +2515,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Status"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ponte inválida"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A ponte especificada é invalida."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2593,13 +2670,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aceitar"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "rejeitar"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Disponível"
@@ -3038,83 +3207,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Endereço de e-mail onde você pode ser encontrado se houver um\nproblema com sua retransmissão. Você pode, também, usar sua impressão digital PGP ou GPG."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Erro ao tentar esconder todos os serviços"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Por favor, configure ao menos um diretório de serviço e uma porta virtual para cada serviço que você deseja gravar. Remova os demais."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Erro"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Por favor, selecione um serviço."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Selecionar diretório de serviço"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "A porta virtual deve conter apenas números de portas validas [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "O alvo deve conter apenas endereço:porta, endereço ou porta."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Diretório já em uso por outro serviço."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Serviços ocultos oferecidos"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Endereço Onion"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Porta virtual"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Alvo"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Caminho do diretório"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Ligado"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Adicionar novo serviço a lista"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Remover da lista serviço selecionado"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copiar endereço onion do serviço seleciona para área de transferência"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Procure e defina no sistema de arquivos local um diretório para o serviço escolhido"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Criado pelo Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr "Vidalia não iniciou o Tor. Você deve parar o Tor através da interface onde você o iniciou."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Falha ao interromper o processo %1. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr "Editando torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Salvar configurações. Se não for selecionado, somente serão aplicadas à instância atual do Tor."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Cortar"
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr "Selecionar tudo"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Aplicar em tudo"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Aplicar somente à seleção"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Erro ao conetar ao Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Seleção está vazia. Por favor, selecione algum texto, ou em \"Aplicar em tudo\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Erro na linha %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Erro"
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Versão"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Enviando relatório de erros"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Impossível enviar relatório: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Incapaz de abrir o arquivo de registro '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Código de língua local inválido"
 
diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po
index f1cb879..aaf81f3 100644
--- a/ru/vidalia_ru.po
+++ b/ru/vidalia_ru.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+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"
@@ -197,12 +197,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл длÑ? иÑ?полÑ?зованиÑ? длÑ? пÑ?Ñ?и Ñ?океÑ?а Tor"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia не Ñ?могла Ñ?далиÑ?Ñ? Ñ?еÑ?виÑ? Tor. Ð?озможно, вам пÑ?идеÑ?Ñ?Ñ? Ñ?далиÑ?Ñ? его вÑ?Ñ?Ñ?нÑ?Ñ?."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "ЯзÑ?к"
@@ -223,6 +261,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 "Со вÑ?емени:"
@@ -388,10 +443,6 @@ msgid "Sharing"
 msgstr "Ð?бмен"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "СеÑ?виÑ?Ñ?"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Ð?неÑ?ний вид"
 
@@ -437,6 +488,12 @@ msgstr "Ð?Ñ?облема Ñ?оединениÑ? Ñ? Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia можеÑ? попÑ?обоваÑ?Ñ? пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor. ЭÑ?о пÑ?еÑ?веÑ? вÑ?е акÑ?ивнÑ?е на даннÑ?й моменÑ? Ñ?оединениÑ? Ñ?еÑ?ез ваÑ? пÑ?оÑ?еÑ?Ñ? Tor."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -448,12 +505,6 @@ msgid ""
 "one."
 msgstr "Ð?еобÑ?одимо завеÑ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Tor пеÑ?ед Ñ?ем как Vidalia Ñ?можеÑ? запÑ?Ñ?Ñ?иÑ?Ñ? новÑ?й."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia можеÑ? попÑ?обоваÑ?Ñ? пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor. ЭÑ?о пÑ?еÑ?веÑ? вÑ?е акÑ?ивнÑ?е на даннÑ?й моменÑ? Ñ?оединениÑ? Ñ?еÑ?ез ваÑ? пÑ?оÑ?еÑ?Ñ? Tor."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Ð?онÑ?Ñ?олÑ?нÑ?й Ñ?океÑ? не подклÑ?Ñ?ен."
@@ -1275,24 +1326,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia Ñ?овеÑ?Ñ?ила оÑ?ибкÑ? и Ñ?Ñ?ебÑ?еÑ? завеÑ?Ñ?ениÑ?"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "Ð?Ñ?Ñ?еÑ? об аваÑ?ийном завеÑ?Ñ?ении бÑ?л Ñ?оздан и вÑ? можеÑ?е авÑ?омаÑ?иÑ?еÑ?ки оÑ?пÑ?авиÑ?Ñ? его Ñ?азÑ?абоÑ?Ñ?икам Vidalia Ñ?Ñ?о бÑ? помоÑ?Ñ? им найÑ?и и Ñ?Ñ?Ñ?Ñ?аниÑ?Ñ? оÑ?ибкÑ?. Ð?Ñ?пÑ?авлÑ?емÑ?й оÑ?Ñ?еÑ? не Ñ?одеÑ?жиÑ? какой-либо пеÑ?Ñ?оналÑ?ной инÑ?оÑ?маÑ?ии, но ваÑ?е Ñ?оединение Ñ? Ñ?еÑ?веÑ?ом Ñ?ообÑ?ений об аваÑ?ийнÑ?Ñ? завеÑ?Ñ?ениÑ?Ñ? можеÑ? бÑ?Ñ?Ñ? неанонимнÑ?м."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Ð?ожалÑ?йÑ?Ñ?а, Ñ?ак же опиÑ?иÑ?е Ñ?Ñ?о вÑ? делали пеÑ?ед аваÑ?ийнÑ?м завеÑ?Ñ?ением пÑ?иложениÑ? (по желаниÑ?):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? мой оÑ?Ñ?еÑ? об аваÑ?ийном завеÑ?Ñ?ении Ñ?азÑ?абоÑ?Ñ?икам Vidalia"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Ð?еÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Vidalia"
 
@@ -1310,17 +1343,44 @@ msgid ""
 "manually."
 msgstr "Ð?Ñ? не Ñ?могли авÑ?омаÑ?иÑ?еÑ?ки пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Vidalia. Ð?ожалÑ?йÑ?Ñ?а, пеÑ?езапÑ?Ñ?Ñ?иÑ?е Vidalia вÑ?Ñ?Ñ?нÑ?Ñ?."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Ð?одклÑ?Ñ?ение..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Ð?Ñ?Ñ?Ñ?лка оÑ?Ñ?еÑ?а об аваÑ?ийном завеÑ?Ñ?ении..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Ð?олÑ?Ñ?ение оÑ?веÑ?а..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1331,10 +1391,6 @@ msgid "Select Path to Tor"
 msgstr "Ð?Ñ?беÑ?иÑ?е пÑ?Ñ?Ñ? к Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Ð?Ñ?беÑ?иÑ?е иÑ?полнÑ?емÑ?й Ñ?айл пÑ?окÑ?и"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? имÑ? иÑ?полнÑ?емого Ñ?айла Tor."
 
@@ -1351,18 +1407,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Ð?Ñ?окÑ?и (опÑ?ионалÑ?но)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Ð?апÑ?Ñ?каÑ?Ñ? пÑ?окÑ?и пÑ?и запÑ?Ñ?ке Tor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Ð?бновлениÑ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?"
 
@@ -1656,10 +1700,6 @@ msgid "Help"
 msgstr "Ð?омоÑ?Ñ?"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Ð?оваÑ? Ð?иÑ?ноÑ?Ñ?Ñ?"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1668,30 +1708,6 @@ msgid "View"
 msgstr "Ð?Ñ?оÑ?моÑ?Ñ?"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке веб-бÑ?аÑ?зеÑ?а"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?казаннÑ?й в наÑ?Ñ?Ñ?ойкаÑ? веб-бÑ?аÑ?зеÑ?"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке IM-клиенÑ?а"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?казаннÑ?й в наÑ?Ñ?Ñ?ойкаÑ? IM-клиенÑ?"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке пÑ?окÑ?и-Ñ?еÑ?веÑ?a"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?казаннÑ?й в наÑ?Ñ?Ñ?ойкаÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Ð?одклÑ?Ñ?ение к каÑ?алогy Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ов"
 
@@ -1732,10 +1748,6 @@ msgid "Connected to the Tor network!"
 msgstr "Ð?одклÑ?Ñ?ен к Ñ?еÑ?и Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ð?еÑ?аÑ?познаннÑ?й Ñ?Ñ?аÑ?Ñ?Ñ? запÑ?Ñ?ка"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "pазное"
 
@@ -1954,12 +1966,6 @@ msgstr "Ð?Ñ?оизоÑ?ла Ñ?ледÑ?Ñ?Ñ?аÑ? оÑ?ибка:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "Ð?оÑ?оже, Ñ?Ñ?о одно из ваÑ?иÑ? пÑ?иложений %1a Ñ?оздаеÑ? поÑ?енÑ?иалÑ?но незаÑ?иÑ?Ñ?ованное и небезопаÑ?ное Ñ?оединение на поÑ?Ñ? %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1970,14 +1976,6 @@ msgid "toolBar"
 msgstr "toolBar"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "СÑ?аÑ?Ñ?"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "СÑ?оп"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Ð?еÑ?езапÑ?Ñ?Ñ?иÑ?Ñ?"
 
@@ -1995,6 +1993,79 @@ msgstr "Ð?аÑ?алÑ?наÑ? загÑ?Ñ?зка Tor оÑ? %1 до %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia пÑ?Ñ?алаÑ?Ñ? пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor, но не Ñ?могла. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е ваÑ? диÑ?пеÑ?Ñ?еÑ? задаÑ?, Ñ?Ñ?о бÑ? Ñ?доÑ?Ñ?овеÑ?иÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о неÑ? дÑ?Ñ?гого Ñ?абоÑ?аÑ?Ñ?его пÑ?оÑ?еÑ?Ñ?а Tor."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Ð?Ñ?ибка пеÑ?езагÑ?Ñ?зки конÑ?игÑ?Ñ?аÑ?ии"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia не Ñ?могла пеÑ?езагÑ?Ñ?зиÑ?Ñ? конÑ?игÑ?Ñ?аÑ?иÑ? Tor"
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2008,22 +2079,22 @@ msgid ""
 msgstr "Vidalia обнаÑ?Ñ?жила, Ñ?Ñ?о пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor неожиданно завеÑ?Ñ?ило Ñ?абоÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е жÑ?Ñ?нал Ñ?ообÑ?ений на поÑ?ледние пÑ?едÑ?пÑ?еждениÑ? или Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ?."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia пÑ?Ñ?алаÑ?Ñ? пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor, но не Ñ?могла. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е ваÑ? диÑ?пеÑ?Ñ?еÑ? задаÑ?, Ñ?Ñ?о бÑ? Ñ?доÑ?Ñ?овеÑ?иÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о неÑ? дÑ?Ñ?гого Ñ?абоÑ?аÑ?Ñ?его пÑ?оÑ?еÑ?Ñ?а Tor."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "не Ñ?далоÑ?Ñ? (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", веÑ?оÑ?Ñ?но, Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", веÑ?оÑ?Ñ?но, клиенÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?,"
+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 ""
@@ -2031,14 +2102,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Ð?аÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? вÑ?клÑ?Ñ?аеÑ?Ñ?Ñ?.\nÐ?ажмиÑ?е \"СÑ?оп\" длÑ? немедленной оÑ?Ñ?ановки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Ð?Ñ?ибка пеÑ?езагÑ?Ñ?зки конÑ?игÑ?Ñ?аÑ?ии"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia не Ñ?могла пеÑ?езагÑ?Ñ?зиÑ?Ñ? конÑ?игÑ?Ñ?аÑ?иÑ? Tor"
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?Ñ?ановке Ñ?илÑ?Ñ?Ñ?а"
@@ -2292,14 +2355,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? новÑ?е Ñ?ообÑ?ениÑ? в Ñ?айл"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Ð?Ñ?егда Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? новÑ?е Ñ?ообÑ?ениÑ?"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "toolbar"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Ð?Ñ?егда Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? новÑ?е Ñ?ообÑ?ениÑ?"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2454,13 +2517,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "СÑ?аÑ?Ñ?Ñ?"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ð?евеÑ?нÑ?й моÑ?Ñ?"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "УказаннÑ?й иденÑ?иÑ?икаÑ?оÑ? моÑ?Ñ?а не дейÑ?Ñ?виÑ?елен."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2595,13 +2672,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "пÑ?инÑ?Ñ?Ñ?"
@@ -2610,6 +2749,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "оÑ?клониÑ?Ñ?"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Ð?нлайн"
@@ -3040,83 +3209,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Ð?дÑ?еÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?, по коÑ?оÑ?омÑ? ваÑ? можно найÑ?и, еÑ?ли\nвозникнеÑ? пÑ?облема Ñ? ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом. Ð?Ñ? Ñ?акже можеÑ?е Ñ?казаÑ?Ñ? ваÑ? PGP или GPG оÑ?пеÑ?аÑ?ок."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Ð?Ñ?ибка пÑ?и попÑ?Ñ?ке оÑ?мениÑ?Ñ? пÑ?бликаÑ?иÑ? вÑ?еÑ? Ñ?еÑ?виÑ?ов"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е по кÑ?айней меÑ?е каÑ?алог Ñ?еÑ?виÑ?ов и виÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? длÑ? каждого Ñ?еÑ?виÑ?а, коÑ?оÑ?Ñ?й вÑ? Ñ?оÑ?иÑ?е  Ñ?оÑ?Ñ?аниÑ?Ñ?. УдалиÑ?е дÑ?Ñ?гие."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Ð?Ñ?ибка"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е Ñ?еÑ?виÑ?."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Ð?Ñ?беÑ?иÑ?е каÑ?алог Ñ?еÑ?виÑ?ов"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? Ñ?олÑ?ко допÑ?Ñ?Ñ?имÑ?е номеÑ?а поÑ?Ñ?а [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "ЦелÑ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? Ñ?олÑ?ко адÑ?еÑ?:поÑ?Ñ?, адÑ?еÑ? или поÑ?Ñ?."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Ð?аÑ?алог Ñ?же иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? дÑ?Ñ?гой Ñ?лÑ?жбой."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?й Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ?"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "\"Ð?Ñ?ковÑ?й\" адÑ?еÑ? Tor"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ?"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "ЦелÑ?"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Ð?Ñ?Ñ?Ñ? к каÑ?алогÑ?"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Ð?клÑ?Ñ?ено"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Ð?обавиÑ?Ñ? новÑ?й Ñ?еÑ?виÑ? к Ñ?пиÑ?кÑ?"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "УдалиÑ?Ñ? вÑ?бÑ?аннÑ?й Ñ?еÑ?виÑ? из Ñ?пиÑ?ка"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Ð?опиÑ?оваÑ?Ñ? \"лÑ?ковÑ?й\" адÑ?еÑ? вÑ?бÑ?анного Ñ?еÑ?виÑ?а в бÑ?Ñ?еÑ?"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Ð?Ñ?оÑ?моÑ?Ñ? в локалÑ?ной Ñ?айловой Ñ?иÑ?Ñ?еме и вÑ?бÑ?аÑ?Ñ? каÑ?алог длÑ? вÑ?бÑ?анного Ñ?еÑ?виÑ?а"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Создано Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3421,6 +3568,22 @@ msgid ""
 "started it."
 msgstr "Vidalia не запÑ?Ñ?кала Tor. Ð?еобÑ?одимо оÑ?Ñ?ановиÑ?Ñ? Tor Ñ?еÑ?ез Ñ?оÑ? инÑ?еÑ?Ñ?ейÑ? Ñ?еÑ?ез коÑ?оÑ?Ñ?й он бÑ?л запÑ?Ñ?ен."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Ð?Ñ?оÑ?еÑ?Ñ? %1 не Ñ?далоÑ?Ñ? оÑ?Ñ?ановиÑ?Ñ?. [%2]"
@@ -3442,12 +3605,6 @@ msgid "Editing torrc"
 msgstr "РедакÑ?иÑ?ование torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки. Ð?Ñ?ли не вÑ?бÑ?ано, наÑ?Ñ?Ñ?ойки бÑ?дÑ?Ñ? пÑ?имененÑ? Ñ?олÑ?ко к Ñ?екÑ?Ñ?емÑ? запÑ?Ñ?кÑ? Tor."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ?"
 
@@ -3472,26 +3629,6 @@ msgid "Select All"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? вÑ?Ñ?"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Ð?Ñ?имениÑ?Ñ? вÑ?Ñ?"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Ð?Ñ?имениÑ?Ñ? вÑ?бÑ?анное"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Ð?Ñ?ибка Ñ?оединениÑ? Ñ? Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Ð?Ñ?бÑ?аннаÑ? облаÑ?Ñ?Ñ? пÑ?Ñ?Ñ?а. Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е необÑ?одимÑ?й Ñ?екÑ?Ñ?, или нажмиÑ?е \"Ð?Ñ?имениÑ?Ñ? вÑ?Ñ?\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Ð?Ñ?ибка в Ñ?Ñ?Ñ?оке %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Ð?Ñ?ибка"
 
@@ -3651,14 +3788,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Ð?еÑ?Ñ?иÑ?"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Ð?агÑ?Ñ?зка оÑ?Ñ?еÑ?а об аваÑ?ийном завеÑ?Ñ?ении"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Ð?евозможно оÑ?пÑ?авиÑ?Ñ? оÑ?Ñ?еÑ?: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Ð?Ð?"
@@ -3752,6 +3881,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Ð?евозможно оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл жÑ?Ñ?нала \n%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Указан невеÑ?нÑ?й код Ñ?зÑ?ка:"
 
diff --git a/templates/vidalia.pot b/templates/vidalia.pot
index 23c54d3..454f668 100644
--- a/templates/vidalia.pot
+++ b/templates/vidalia.pot
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr "Select a file to use for Tor socket path"
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr "Configure ControlPort automatically"
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr "<b>WARNING</b>: If you hand pick the password it will be saved as plain text in Vidalia's configuration file. Using a random password is safer."
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr "Panic"
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr "<b>WARNING</b>: The panic button will erease the application if pressed"
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr "Enable panic button"
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+msgstr "Panic path:"
+
+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."
 msgstr "Vidalia was unable to remove the Tor service.\n\nYou may need to remove it manually."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr "Select a Directory to Use for Panic"
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Language"
@@ -220,6 +258,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:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Sharing"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Services"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Appearance"
 
@@ -434,6 +485,12 @@ msgstr "Problem connecting to Tor"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia can try to restart Tor for you.  Doing so will close all currently active connections through your Tor process."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr "You will need to shut down the Tor process before Vidalia can launch a new one."
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr "Vidalia can try to restart Tor for you.  Doing so will close all currently active connections through your Tor process."
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Control socket is not connected."
@@ -1272,24 +1323,6 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr "Vidalia encountered an error and needed to close"
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
-msgstr "A crash report has been created that you can automatically send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information, but your connection to the crash reporting server may not be anonymous."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
-msgstr "Please also describe what you were doing before the application crashed (optional):"
-
-msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
-msgstr "Send my crash report to the Vidalia developers"
-
-msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
 msgstr "Restart Vidalia"
 
@@ -1307,17 +1340,44 @@ msgid ""
 "manually."
 msgstr "We were unable to automatically restart Vidalia. Please restart Vidalia manually."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr "Please fill a ticket in:"
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr "Sending crash report..."
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
-msgstr "Receiving response..."
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr "A crash report has been created that you can send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr "with a description of what you were doing before the application crashed, along with the following files corresponding to the crash report:"
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr "Plugin debug output"
+
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr "Plugin Output"
+
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr "Syntax Errors"
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr "Exceptions"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Select Path to Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Select Proxy Executable"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "You must specify the name of your Tor executable."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Application (optional)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Start a proxy application when Tor starts"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy Application Arguments:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Software Updates"
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Help"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "New Identity"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "View"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Error starting web browser"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia was unable to start the configured web browser"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Error starting IM client"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia was unable to start the configured IM client"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Error starting proxy server"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia was unable to start the configured proxy server"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Connecting to a relay directory"
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr "The following error occurred:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2."
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,14 +1973,6 @@ msgid "toolBar"
 msgstr "toolBar"
 
 msgctxt "MainWindow"
-msgid "Start"
-msgstr "Start"
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr "Stop"
-
-msgctxt "MainWindow"
 msgid "Restart"
 msgstr "Restart"
 
@@ -1992,6 +1990,79 @@ msgstr "Bootstrapping torrc from %1 to %2"
 
 msgctxt "MainWindow"
 msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia tried to restart Tor, but was not able to. Please check your Task Manager to ensure there are no other Tor processes running."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Error reloading configuration"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia was unable to reload Tor's configuration."
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr "No dettached tabs"
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr "Panic is enabled"
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr "<b>WARNING:</b> The Panic button is enabled. Use it carefully because it will remove Tor completely."
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr "New Circuit"
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr "Debug output"
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr "Panic!"
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr "Reattach tabs"
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr "Plugins"
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr "Your clock is wrong"
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr "Your computer's clock is wrong, tor may not work as expected. Please check the Message Log for more information."
+
+msgctxt "MainWindow"
+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 ""
 "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?"
@@ -2005,22 +2076,22 @@ msgid ""
 msgstr "Vidalia detected that the Tor software exited unexpectedly.\n\nPlease check the message log for recent warning or error messages."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr "Vidalia tried to restart Tor, but was not able to. Please check your Task Manager to ensure there are no other Tor processes running."
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "failed (%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr "(probably Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probably an email client)"
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", probably an email client,"
+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 ""
@@ -2028,14 +2099,6 @@ msgid ""
 "Click 'Stop' again to stop your relay now."
 msgstr "Your relay is shutting down.\nClick 'Stop' again to stop your relay now."
 
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr "Error reloading configuration"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr "Vidalia was unable to reload Tor's configuration."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Error Setting Filter"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Automatically save new log messages to a file"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Always Save New Log Messages"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr "toolbar"
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Always Save New Log Messages"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr "Status"
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr "<a href=\"server.offline\">Why is my relay offline?</a>"
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr "If your relay isn't listed among the others, it may be because it doesn't have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr "Exit circuits"
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr "Internal circuits"
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr "Hidden Service circuits"
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,13 +2669,75 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr "WARNING: %1 doesn't have an info file."
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr "%1: Processing..."
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr "%4: ERROR: Line: %1 - Column: %2\n%3"
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr "%1: Error opening file %2"
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr "%2: ERROR: Cannot open %1"
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr "%2: ERROR: Parsing %1"
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr "Line: %1 - Column: %2\nMessage: %3"
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr "%1: Starting..."
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr "%1: Stoping..."
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr "%2:\n*** Exception in line %1"
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr "*** Backtrace:"
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr "(untitled)"
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr "Error: buildGUI() failed for plugin %1"
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accept"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "reject"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr "There were some settings that Vidalia wasn't able to apply together"
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr "Failed to set %1:\nReason: %2"
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr "The failed options were saved in your torrc and will be applied when you restart."
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr "The failed options were NOT saved in your torrc and will be applied when you restart."
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr "Vidalia was unable to save the options to the torrc file."
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Email address at which you may be reached if there is a\nproblem with your relay. You might also include your PGP or GPG fingerprint."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Error while trying to unpublish all services"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Error"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Please select a Service."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Select Service Directory"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtual Port may only contain valid port numbers [1..65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr "day"
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "week"
+msgstr "week"
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "month"
+msgstr "month"
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr "Enable accounting"
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr "h:mm"
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr "at"
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Target"
+msgctxt "ServerPage"
+msgid "per"
+msgstr "per"
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr "bytes"
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr "KB"
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr "MB"
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr "GB"
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr "TB"
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Browse in local file system and choose directory for selected service"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr "Push no more than"
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr "time"
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr "Vidalia has not started Tor. You need to stop Tor through the interface you started it."
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr "Start failed: %1"
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr "Process finished: ExitCode=%1"
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr "Connection failed: %1"
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr "Disconnected"
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Process %1 failed to stop. [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr "Editing torrc"
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Save settings. If unchecked it will only apply settings to the current Tor instance."
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr "Cut"
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr "Select All"
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Apply all"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Apply selection only"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Error connecting to Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Selection is empty. Please select some text, or check \"Apply all\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Error at line %1: \"%2\""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr "Error"
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Version"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr "Uploading Crash Report"
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr "Unable to send report: %1"
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Unable to open log file '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr "Value required for parameter :"
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "Invalid language code specified:"
 
diff --git a/th/vidalia_th.po b/th/vidalia_th.po
index 26c9c8b..2795bd6 100644
--- a/th/vidalia_th.po
+++ b/th/vidalia_th.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "ภาษา"
@@ -220,6 +258,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 "�ั�����:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "�����ั�"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "�ริ�าร"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "�าร�ส���ล"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "�ม������ื�อม��อ�ั� socket �ว��ุม"
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "�ลือ��ี�อยู��อ���ร��รม Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "�ลือ���ร��รม�ี��ะ����า� Tor ���� Proxy"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "�ุ���อ�ระ�ุ�ื�อ�อ���ร��รม Tor �ห��ู���อ�"
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "��ร��รม�ี��ะ����า� Tor ���� Proxy(�ม���อ��ส������)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "�ริ�ม��ร��รม�ี��ะ����า� Tor ���� Proxy หลั� Tor �ำ�า�����ล�ว"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "รายละ�อีย�สั���า��อ���ร��รม�ี��ะ����า� Tor ���� Proxy:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "��วย�หลือ"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "สร�า��ัว���หม�"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "มอ��ู"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "�ิ��ลา����ารสั���ริ�ม��ร��รม��อ�อิ���อร�����(web browser)"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia �ม�สามาร��ริ�ม��ร��รม��อ�อิ���อร������ี��ั����า�ว����"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "�ิ��ลา����ารสั���ริ�ม��ร��รมส����อ�วาม(IM)"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia �ม�สามาร��ริ�ม��ร��รมส����อ�วาม�ี��ั����า�ว����"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "�ิ��ลา����าร�ริ�ม�ำ�า����� proxy server"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia �ม�สามาร��ริ�ม�ำ�า����� proxy server �าม�ี��ั����า�อา�ว����"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "�ำลั���ื�อม��อ�ั� �ลั�����ราย�ื�อ relay (relay directory)"
 
@@ -1729,10 +1745,6 @@ msgid "Connected to the Tor network!"
 msgstr "��ื�อม��อสู���รือ��าย Tor �รีย�ร�อย!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "ส�า�ะ�ริ�ม����ี��ม�รู��ั�"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "������ล��"
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "�ั����� ��อ�วามสิ���ี���ิ���ำ���หม�� ล���ล���ยอั���มั�ิ"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "�ั�������อ�วามสิ���ี���ิ���ำ���หม���สมอ"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "�ั�������อ�วามสิ���ี���ิ���ำ���หม���สมอ"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge �ม��ู���อ� "
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "��า Bridge �ี�ระ�ุ �ม��ู���อ�"
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "��ิิ�ส�"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Online"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "�ิ��ลา�ระหว�า��ยายามยุ�ิ�ห��ริ�าร�ั��หม�"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "�รุ�า�ั����า ระ�ุ�ี��ั�����รายละ�อีย��าร�ห��ริ�าร �ละระ�ุ�ล� port �สมือ�(virtual port) อย�า���อยห�ึ�� port. ล�สิ���ี��ม���ี�ยว��อ�ออ��ห�หม�"
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "�ิ��ลา�"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "�รุ�า�ลือ��ริ�าร"
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "�ลือ��ี��ั������าร�ั����า�าร�ห��ริ�าร"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "�ล� port �สมือ� (Virtual Port) �ะ��อ������ล� 1 �ึ� 65535 ���า�ั��."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "���าหมาย���ารส����อ�าร�ำ�า� �ะ��อ�อยู���รู� address:port, address หรือ port."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "�ี��ั������ี�มี�ริ�ารอื�����อยู��ล�ว"
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "�าร�ห��ริ�าร�����อ��ัว��"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "�ี�อยู���ระ�� Tor"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "�ล� Port �สมือ�"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "ส����อ��ยั�"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "�ี�������อมูล�อ��ริ�าร"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "ยอม�ห��ำ�า�"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "��ิ�ม�ริ�าร�หม�ล���ราย�าร"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "ล��ริ�าร�ี��ลือ�ออ��า�ราย�าร"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "�ั�ลอ� �ี�อยู���ระ�� Tor �อ��ริ�าร�ี��ลือ� �ส� clipboard"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "�ลือ��ี��ั������อ�มูล�อ��ริ�าร�ี��ลือ�อยู�"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "สร�า���ย Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "ล�ม�หลว���ารหยุ��าร�ำ�า� %1. [%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "��ล�"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "�ม�สามาร���ิ���ล�����สิ���ี��ำ�� '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po
index 764dd12..6f48c42 100644
--- a/tr/vidalia_tr.po
+++ b/tr/vidalia_tr.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia Tor servisini kaldıramıyor.\n\nKendiniz kaldırmayı deneyebilirsiniz."
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Dil"
@@ -220,6 +258,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ıç:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "PaylaÅ?ım"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Hizmetler"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Görünüm"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Kontrol soketi baÄ?lı deÄ?il."
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Tor için klasör seç"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Proxy seçin"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Tor için bir isim belirlemek zorundasınız."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy (isteÄ?e baÄ?lı)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Tor baÅ?ladıÄ?ında proxyide baÅ?lat"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Proxy parametleri:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "Güncellemeler"
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Yardım"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Yeni BaÄ?lantı"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Görünüm"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Web gezgini baÅ?latırlırken hata oluÅ?tu"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia web gezginini baÅ?latamıyor"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Im kullanıcısını baÅ?latamada hata oluÅ?tu"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia IM kullanıcısını baÅ?latamıyor"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Proxy sunucusu baÅ?latmada hata"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Proxy sunucusu baÅ?latılamıyor"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Aktarım klasörüne baÄ?lanıyor"
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr "Belirtilen hatalar oluÅ?tu:"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,27 +1973,92 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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"
@@ -2005,36 +2076,28 @@ msgid ""
 msgstr "Tor beklenmedik Å?ekilde sonlandırıldı.\n\nGünlük kayıtlarından hata sebebini kontrol edebilirsiniz."
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "Hata(%1)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ", Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", e-posta istemcisi,"
+msgid "(probably an email client)"
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "BaÄ?lantınız sonlandırılıyor."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "BaÄ?lantınız sonlandırılıyor."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Yeni günlük mesajlarını otomatik kaydet"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Yeni günlük mesajlarını herzaman kaydet"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Yeni günlük mesajlarını herzaman kaydet"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Hatalı köprü"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "BelirlediÄ?iniz köprü tanımı geçerli deÄ?il."
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "Reddet"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "�evrimiçi"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "Geçidinizle ilgili bir problem olduÄ?undan ulaÅ?ılabileceÄ?iniz bir eposta adresi.\nÄ°sterseniz PGP veya GPG imzanızı da ekleyebilirsiniz."
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Türm servsileri durdururken ahta oluÅ?tu"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Lütfen sanal port kullanımı  için en az biri hizmet klasörü belirleyiniz.DiÄ?erlerini kaldırın."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Hata"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Lütfen bir hizmet seçin."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Hizmet klasörü seç"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Sanal porltar sadece geçerli aralıktaki portlar olabilir[1.65535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Hedef adres sadece:port,adres veya port olabilir."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Bu klasör zaten baÅ?ka bir hizmet tarafından kullanılıyor."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Arkaplan hizmetleri"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Tor adresi"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Sanal port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Hedef"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Klasör yolu"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Aktif"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Yeni hizmet ekle"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Seçilen hizmeti sil"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "AÄ? hizmetinin adresini panoya kopyala"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Seçili hizmet için klasör seç"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Tor tarafından oluÅ?uturuldu"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "%1 iÅ?lemini durdurken hata oluÅ?tu.[%2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "Sürüm"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "Tamam"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Günlük dosyası açılamıyor'%1':%2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "YanlıÅ? dil kodu belirtildi:"
 
diff --git a/vi/vidalia_vi.po b/vi/vidalia_vi.po
index a56b42a..2cd1ce0 100644
--- a/vi/vidalia_vi.po
+++ b/vi/vidalia_vi.po
@@ -5,8 +5,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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -194,12 +194,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr ""
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "Ngôn ngữ"
@@ -220,6 +258,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ừ:"
@@ -385,10 +440,6 @@ msgid "Sharing"
 msgstr "Chia sẻ"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Những d�ch vụ"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "Xuất hi�n"
 
@@ -434,6 +485,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -445,12 +502,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "Socket kiá»?m soát không Ä?ược kết ná»?i."
@@ -1272,51 +1323,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1328,10 +1388,6 @@ msgid "Select Path to Tor"
 msgstr "Chá»?n Ä?Æ°á»?ng dẫn tá»?i Tor"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Chá»?n Proxy Executable"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Bạn phải chá»? Ä?á»?nh tên của Tor thá»±c thi của bạn."
 
@@ -1348,18 +1404,6 @@ msgid "Tor"
 msgstr "The-onion-router"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy ứng dụng (tùy ch�n)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Bắt Ä?ầu má»?t ứng dụng proxy khi Tor bắt Ä?ầu"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Các Ä?á»?i sá»? Proxy ứng dụng:"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr ""
 
@@ -1653,10 +1697,6 @@ msgid "Help"
 msgstr "Giúp"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Giám Ä?á»?nh Má»?i"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1665,30 +1705,6 @@ msgid "View"
 msgstr "Xem"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Lá»?i bắt Ä?ầu trình duyá»?t web"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia không thá»? bắt Ä?ầu trình duyá»?t web cấu hình"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Lá»?i bắt Ä?ầu nhắn tin khách hàng IM"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia không thá»? bắt Ä?ầu các thân chủ nhắn tin cấu hình IM"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Lá»?i bắt Ä?ầu máy chủ proxy"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia không thá»? bắt Ä?ầu máy chủ cấu hình proxy "
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "Kết n�i vào m�t thư mục chuy�n tiếp "
 
@@ -1729,10 +1745,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"
 
@@ -1951,12 +1963,6 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1967,73 +1973,130 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"Here's the last error message:\n"
+" %2"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"It seems Tor has stopped running since Vidalia started it.\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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 "failed (%1)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2289,14 +2352,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "Tá»± Ä?á»?ng lÆ°u các tin nhắn Ä?Ä?ng nhập má»?i vào má»?t tập tin"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Luôn luôn Ä?Ä?ng LÆ°u Thông Ä?iá»?p má»?i"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Luôn luôn Ä?Ä?ng LÆ°u Thông Ä?iá»?p má»?i"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2451,13 +2514,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Cầu không hợp l�"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-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 "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2592,11 +2669,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2607,6 +2746,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "từ ch�i"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "Trực tuyến"
@@ -3037,83 +3206,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Lá»?i trong khi Ä?ang thÆ°Ì? thôi xuất bản tất cả các dá»?ch vụ"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "Xin cấu hình ít nhất m�t thư mục d�ch vụ và m�t c�ng ảo cho m�i d�ch vụ mà bạn mu�n lưu. Hãy hủy b� những cái khác."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Lá»?i"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Hãy ch�n m�t D�ch vụ."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Ch�n Thư mục D�ch vụ"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "C�ng thật ch� có th� chứa những s� c�ng hợp l� [1 .. 65.535]."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Mục tiêu chá»? có thá»? chứa các Ä?á»?a chá»?: cá»?ng, Ä?á»?a chá»?, hoặc cá»?ng."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "ThÆ° mục Ä?ã Ä?ược sá»­ dụng bá»?i dá»?ch vụ khác."
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Những dá»?ch vụ ẩn Ä?ược cung cấp"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Ä?á»?a chá»? onion"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Ảo Cảng"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Mục tiêu"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Ä?Æ°á»?ng dẫn thÆ° mục"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Bật"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Thêm d�ch vụ m�i vào danh sách"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Hủy b� d�ch vụ lựa ch�n từ danh sách"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Sao laÌ£i Ä?á»?a chá»? onion của dá»?ch vụ Ä?ược chá»?n vào bá»? nhá»? tạm"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Trình duyá»?t trong há»? thá»?ng tập tin Ä?á»?a phÆ°Æ¡ng và chá»?n thÆ° mục cho dá»?ch vụ Ä?ược chá»?n"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Tạo b�i Tor"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3418,6 +3565,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "Quá trình % 1 không ngừng. [% 2]"
@@ -3439,12 +3602,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3469,26 +3626,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3648,14 +3785,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "OK"
@@ -3749,6 +3878,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "Không thá»? má»? hôÍ? sÆ¡ Ä?Ä?ng nhập '%1':% 2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po
index 5801871..c8cb944 100644
--- a/zh_CN/vidalia_zh_CN.po
+++ b/zh_CN/vidalia_zh_CN.po
@@ -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-05-03 14:28+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
+"PO-Revision-Date: 2012-03-22 09:01+0000\n"
 "Last-Translator: s10010 <reg@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -195,12 +195,50 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: If you hand pick the password it will be saved as plain text"
+" in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+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."
 msgstr "Vidalia æ? æ³?å? é?¤ Tor æ??å?¡ã??\n\nä½ é??è¦?æ??å·¥å°?å?¶å? é?¤ã??"
 
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr "语�"
@@ -221,6 +259,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 "起���:"
@@ -386,10 +441,6 @@ msgid "Sharing"
 msgstr "å??享"
 
 msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "æ??å?¡"
-
-msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr "��"
 
@@ -435,6 +486,12 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
+"Vidalia can try to restart Tor for you.  Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
 "Tor is already running, but Vidalia can't connect to it.\n"
 "\n"
 "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
@@ -446,12 +503,6 @@ msgid ""
 "one."
 msgstr ""
 
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you.  Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
-
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr "æ?§å?¶æ?¥å?£å½?å??æ?ªè¿?æ?¥ã??"
@@ -1273,51 +1324,60 @@ msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can automatically send to the "
-"Vidalia developers to help identify and fix the problem. The submitted "
-"report does not contain any personally identifying information, but your "
-"connection to the crash reporting server may not be anonymous."
+msgid "Restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid ""
-"Please also describe what you were doing before the application crashed "
-"(optional):"
+msgid "Don't Restart"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Send my crash report to the Vidalia developers"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid "Please fill a ticket in:"
 msgstr ""
 
 msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
 msgctxt "CrashReportDialog"
 msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"A crash report has been created that you can send to the Vidalia developers "
+"to help identify and fix the problem. The submitted report does not contain "
+"any personally identifying information."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"with a description of what you were doing before the application crashed, "
+"along with the following files corresponding to the crash report:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+msgctxt "DebugDialog"
+msgid "Plugin Output"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Receiving response..."
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
 msgstr ""
 
 msgctxt "GeneralPage"
@@ -1329,10 +1389,6 @@ msgid "Select Path to Tor"
 msgstr "请é??æ?© Tor ç??è·¯å¾?"
 
 msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "请é??æ?©ä»£ç??ç¨?åº?"
-
-msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "æ?¨å¿?é¡»æ??å®? Tor ç¨?åº?ç??å??å­?ã??"
 
@@ -1349,18 +1405,6 @@ msgid "Tor"
 msgstr "Tor"
 
 msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "代ç??ç¨?åº?ï¼?å?¯é??ï¼?"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Tor å?¯å?¨æ?¶è¿?è¡?代ç??ç¨?åº?"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "代ç??ç¨?åº?å??æ?°ï¼?"
-
-msgctxt "GeneralPage"
 msgid "Software Updates"
 msgstr "软件��"
 
@@ -1654,10 +1698,6 @@ msgid "Help"
 msgstr "帮�"
 
 msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "��身份"
-
-msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
@@ -1666,30 +1706,6 @@ msgid "View"
 msgstr "æ?¥ç??"
 
 msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "å?¯å?¨æµ?è§?å?¨æ?¶å??ç??äº?é??误"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia æ? æ³?å?¯å?¨é??å®?ç??æµ?è§?å?¨"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "å?¯å?¨å?³æ?¶é??讯客æ?·ç«¯æ?¶å??ç??äº?é??误"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia æ? æ³?å?¯å?¨é??å®?ç??å?³æ?¶é??讯客æ?·ç«¯"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "å?¯å?¨ä»£ç??æ??å?¡å?¨æ?¶å??ç??äº?é??误"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia æ? æ³?å?¯å?¨é??å®?ç??代ç??æ??å?¡å?¨"
-
-msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr "��中继��"
 
@@ -1730,10 +1746,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor ��已����"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "æ?ªç?¥ç??å?¯å?¨ç?¶æ??"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "æ??项"
 
@@ -1952,12 +1964,6 @@ msgstr "å??ç??å¦?ä¸?é??误ï¼?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
 "Anything sent over this connection could be monitored. Please check your "
 "application's configuration and use only encrypted protocols, such as SSL, "
 "if possible."
@@ -1968,27 +1974,92 @@ msgid "toolBar"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Start"
+msgid "Restart"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Stop"
+msgid "Reload Tor's config"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Restart"
+msgid "Actions"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "No dettached tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic is enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"<b>WARNING:</b> The Panic button is enabled. Use it carefully because it "
+"will remove Tor completely."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Debug output"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Panic!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reattach tabs"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Plugins"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your clock is wrong"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your computer's clock is wrong, tor may not work as expected. Please check "
+"the Message Log for more information."
+msgstr ""
+
+msgctxt "MainWindow"
+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"
@@ -2006,36 +2077,28 @@ msgid ""
 msgstr "Vidaliaæ£?æµ?å?°Tor软件æ??å¤?é??å?ºã??\n\n请æ£?æ?¥æ¶?æ?¯æ?¥å¿?è?·å??æ??è¿?ç??è­¦å??å??é??误信æ?¯ã??"
 
 msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "failed (%1)"
 msgstr "失败�%1�"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr "��许�Telnet���"
+msgid "(probably Telnet)"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr "��许�Email客�端�"
+msgid "(probably an email client)"
+msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "æ­£å?¨å?³é?­æ?¨ç??中继æ??å?¡ã??\nå??次å??å?»'å??æ­¢'ç«?å?»å?³é?­ä¸­ç»§ã??"
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "æ­£å?¨å?³é?­æ?¨ç??中继æ??å?¡ã??\nå??次å??å?»'å??æ­¢'ç«?å?»å?³é?­ä¸­ç»§ã??"
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2290,14 +2353,14 @@ msgid "Automatically save new log messages to a file"
 msgstr "è?ªå?¨ä¿?å­?æ?°ç??æ¶?æ?¯å??容è?³æ??件"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "�������"
-
-msgctxt "MessageLog"
 msgid "toolbar"
 msgstr ""
 
 msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "�������"
+
+msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
@@ -2452,13 +2515,27 @@ msgctxt "NetViewer"
 msgid "Status"
 msgstr ""
 
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "æ? æ??ç½?æ¡¥"
+msgctxt "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
 
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "æ??å®?ç½?æ¡¥è¯?å?«æ? æ??"
+msgctxt "NetViewer"
+msgid ""
+"If your relay isn't listed among the others, it may be because it doesn't "
+"have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
@@ -2593,11 +2670,73 @@ 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 "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid ""
+"%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
 msgstr ""
 
 msgctxt "Policy"
@@ -2608,6 +2747,36 @@ msgctxt "Policy"
 msgid "reject"
 msgstr "æ??ç»?"
 
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were saved in your torrc and will be applied when you "
+"restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid ""
+"The failed options were NOT saved in your torrc and will be applied when you"
+" restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+msgstr ""
+
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr "è??æ?º"
@@ -3038,83 +3207,61 @@ msgid ""
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr "中继æ??é??æ?¶è??ç³»æ?¨ç??Emailå?°å??\næ?¨è¿?å?¯ä»¥å??æ?¶æ??ä¾?æ?¨ç??PGP/GPGæ??纹ã??"
 
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "å??æ¶?å??å¸?æ??æ??æ??å?¡æ?¶å?ºé??"
-
-msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "请è?³å°?é??ç½®ä¸?个æ??å?¡ç?®å½?并为æ¯?项æ??å?¡é??ç½®ä¸?个è??æ??端å?£ã??å? é?¤å?¶ä»?ç??项ç?®ã??"
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "é??误"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "请é??æ?©ä¸?项æ??å?¡"
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "é??æ?©æ??å?¡ç?®å½?"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "è??æ??端å?£å¿?é¡»å??æ³?ç??端å?£å?·[1-65535]ã??"
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "ç?®æ ?å?¯å¿?é¡»å??å?«å?°å??:端å?£ã??å?°å??æ??端å?£ã??"
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "æ­¤ç?®å½?已被å?¶ä»?æ??å?¡å? ç?¨ã??"
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "å·²æ??ä¾?é??è??æ??å?¡"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Oinonå?°å??"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "è??æ??端å?£"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "����"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "���置"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "��"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "å??å??表中添å? æ?°æ??å?¡"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "ä»?å??表中移é?¤é??中ç??æ??å?¡"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "å°?é??中æ??å?¡ç??.Onionå?°å??å¤?å?¶å?°å?ªè´´æ?¿"
+msgctxt "ServerPage"
+msgid "TB"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "æµ?è§?æ?¬å?°æ??件系ç»?为æ??é??æ??å?¡è®¾å®?æ??å?¡ç?®å½?"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
 
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "ç?±Torå??建"
+msgctxt "ServerPage"
+msgid "time"
+msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3419,6 +3566,22 @@ msgid ""
 "started it."
 msgstr ""
 
+msgctxt "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+msgstr ""
+
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr "è¿?ç¨? %1 å??止失败. [%2]"
@@ -3440,12 +3603,6 @@ msgid "Editing torrc"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Cut"
 msgstr ""
 
@@ -3470,26 +3627,6 @@ msgid "Select All"
 msgstr ""
 
 msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
 msgid "Error"
 msgstr ""
 
@@ -3649,14 +3786,6 @@ msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr "ç??æ?¬"
 
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
-
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr "确�"
@@ -3750,6 +3879,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "æ? æ³?æ??å¼?æ?¥å¿?æ??件 '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr "æ??å®?语è¨?代ç ?æ? æ??ï¼?"
 

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