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

[tor-commits] [vidalia/master] Update translations



commit fabd43768c07cd89dc17f017f44bc13de54ea46b
Author: Tomás Touceda <chiiph@xxxxxxxxxxxxxx>
Date:   Sun May 13 18:30:02 2012 -0300

    Update translations
---
 src/vidalia/i18n/po/af/qt_af.po            |    5 +-
 src/vidalia/i18n/po/af/vidalia_af.po       |   82 +-
 src/vidalia/i18n/po/ak/qt_ak.po            |    5 +-
 src/vidalia/i18n/po/ak/vidalia_ak.po       |   82 +-
 src/vidalia/i18n/po/am/qt_am.po            |    5 +-
 src/vidalia/i18n/po/am/vidalia_am.po       |   82 +-
 src/vidalia/i18n/po/ar/qt_ar.po            |   28 +-
 src/vidalia/i18n/po/ar/vidalia_ar.po       |  373 ++---
 src/vidalia/i18n/po/arn/qt_arn.po          |    5 +-
 src/vidalia/i18n/po/arn/vidalia_arn.po     |   82 +-
 src/vidalia/i18n/po/ast/qt_ast.po          |    5 +-
 src/vidalia/i18n/po/ast/vidalia_ast.po     |   82 +-
 src/vidalia/i18n/po/az/qt_az.po            |    5 +-
 src/vidalia/i18n/po/az/vidalia_az.po       |   82 +-
 src/vidalia/i18n/po/be/qt_be.po            |    5 +-
 src/vidalia/i18n/po/be/vidalia_be.po       |  756 ++++++--
 src/vidalia/i18n/po/bg/qt_bg.po            |    5 +-
 src/vidalia/i18n/po/bg/vidalia_bg.po       |  492 ++----
 src/vidalia/i18n/po/bn/qt_bn.po            |    5 +-
 src/vidalia/i18n/po/bn/vidalia_bn.po       |  756 ++++++--
 src/vidalia/i18n/po/bn_IN/qt_bn_IN.po      |    5 +-
 src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po |   82 +-
 src/vidalia/i18n/po/bo/qt_bo.po            |    5 +-
 src/vidalia/i18n/po/bo/vidalia_bo.po       | 2882 +++++++++++++++++++---------
 src/vidalia/i18n/po/br/qt_br.po            |    5 +-
 src/vidalia/i18n/po/br/vidalia_br.po       |  756 ++++++--
 src/vidalia/i18n/po/bs/qt_bs.po            |    5 +-
 src/vidalia/i18n/po/bs/vidalia_bs.po       |  756 ++++++--
 src/vidalia/i18n/po/ca/qt_ca.po            |   29 +-
 src/vidalia/i18n/po/ca/vidalia_ca.po       |  413 ++---
 src/vidalia/i18n/po/cs/qt_cs.po            |   28 +-
 src/vidalia/i18n/po/cs/vidalia_cs.po       |  402 ++---
 src/vidalia/i18n/po/csb/qt_csb.po          |    5 +-
 src/vidalia/i18n/po/csb/vidalia_csb.po     |   82 +-
 src/vidalia/i18n/po/cy/qt_cy.po            |   38 +-
 src/vidalia/i18n/po/cy/vidalia_cy.po       |  186 +-
 src/vidalia/i18n/po/da/qt_da.po            |   26 +-
 src/vidalia/i18n/po/da/vidalia_da.po       |  455 ++---
 src/vidalia/i18n/po/de/qt_de.po            |   26 +-
 src/vidalia/i18n/po/de/vidalia_de.po       |  502 ++----
 src/vidalia/i18n/po/de_CH/qt_de_CH.po      |    5 +-
 src/vidalia/i18n/po/de_CH/vidalia_de_CH.po |   82 +-
 src/vidalia/i18n/po/de_DE/qt_de_DE.po      |    5 +-
 src/vidalia/i18n/po/de_DE/vidalia_de_DE.po | 2882 +++++++++++++++++++---------
 src/vidalia/i18n/po/dz/qt_dz.po            |    5 +-
 src/vidalia/i18n/po/dz/vidalia_dz.po       |   82 +-
 src/vidalia/i18n/po/el/qt_el.po            |   28 +-
 src/vidalia/i18n/po/el/vidalia_el.po       |  566 ++----
 src/vidalia/i18n/po/eo/qt_eo.po            |   28 +-
 src/vidalia/i18n/po/eo/vidalia_eo.po       |  191 +-
 src/vidalia/i18n/po/es/qt_es.po            |   23 +-
 src/vidalia/i18n/po/es/vidalia_es.po       |  719 +++-----
 src/vidalia/i18n/po/et/qt_et.po            |    5 +-
 src/vidalia/i18n/po/et/vidalia_et.po       |   82 +-
 src/vidalia/i18n/po/eu/qt_eu.po            |   28 +-
 src/vidalia/i18n/po/eu/vidalia_eu.po       | 1955 ++++++++++---------
 src/vidalia/i18n/po/fa/qt_fa.po            |   26 +-
 src/vidalia/i18n/po/fa/vidalia_fa.po       |  448 ++---
 src/vidalia/i18n/po/fi/qt_fi.po            |   26 +-
 src/vidalia/i18n/po/fi/vidalia_fi.po       |  334 ++--
 src/vidalia/i18n/po/fil/qt_fil.po          |    5 +-
 src/vidalia/i18n/po/fil/vidalia_fil.po     |   82 +-
 src/vidalia/i18n/po/fo/qt_fo.po            |    5 +-
 src/vidalia/i18n/po/fo/vidalia_fo.po       |  756 ++++++--
 src/vidalia/i18n/po/fr/qt_fr.po            |   28 +-
 src/vidalia/i18n/po/fr/vidalia_fr.po       |  551 ++----
 src/vidalia/i18n/po/fur/qt_fur.po          |    5 +-
 src/vidalia/i18n/po/fur/vidalia_fur.po     |   82 +-
 src/vidalia/i18n/po/fy/qt_fy.po            |    5 +-
 src/vidalia/i18n/po/fy/vidalia_fy.po       |  756 ++++++--
 src/vidalia/i18n/po/ga/qt_ga.po            |    5 +-
 src/vidalia/i18n/po/ga/vidalia_ga.po       |   82 +-
 src/vidalia/i18n/po/gl/qt_gl.po            |    5 +-
 src/vidalia/i18n/po/gl/vidalia_gl.po       |   82 +-
 src/vidalia/i18n/po/gu/qt_gu.po            |   15 +-
 src/vidalia/i18n/po/gu/vidalia_gu.po       |  157 +-
 src/vidalia/i18n/po/gun/qt_gun.po          |    5 +-
 src/vidalia/i18n/po/gun/vidalia_gun.po     |   82 +-
 src/vidalia/i18n/po/ha/qt_ha.po            |    5 +-
 src/vidalia/i18n/po/ha/vidalia_ha.po       |   82 +-
 src/vidalia/i18n/po/he/qt_he.po            |   30 +-
 src/vidalia/i18n/po/he/vidalia_he.po       |  225 +--
 src/vidalia/i18n/po/hi/qt_hi.po            |    5 +-
 src/vidalia/i18n/po/hi/vidalia_hi.po       |  598 +++---
 src/vidalia/i18n/po/hr/qt_hr.po            |    5 +-
 src/vidalia/i18n/po/hr/vidalia_hr.po       |   82 +-
 src/vidalia/i18n/po/ht/qt_ht.po            |    5 +-
 src/vidalia/i18n/po/ht/vidalia_ht.po       |   82 +-
 src/vidalia/i18n/po/hu/qt_hu.po            |   28 +-
 src/vidalia/i18n/po/hu/vidalia_hu.po       |  441 ++---
 src/vidalia/i18n/po/hy/qt_hy.po            |    5 +-
 src/vidalia/i18n/po/hy/vidalia_hy.po       |  756 ++++++--
 src/vidalia/i18n/po/id/qt_id.po            |   26 +-
 src/vidalia/i18n/po/id/vidalia_id.po       |  443 ++---
 src/vidalia/i18n/po/is/qt_is.po            |    5 +-
 src/vidalia/i18n/po/is/vidalia_is.po       |  157 +-
 src/vidalia/i18n/po/it/qt_it.po            |   30 +-
 src/vidalia/i18n/po/it/vidalia_it.po       |  480 ++----
 src/vidalia/i18n/po/ja/qt_ja.po            |   49 +-
 src/vidalia/i18n/po/ja/vidalia_ja.po       | 1358 +++++++++----
 src/vidalia/i18n/po/jv/qt_jv.po            |    5 +-
 src/vidalia/i18n/po/jv/vidalia_jv.po       |  756 ++++++--
 src/vidalia/i18n/po/ka/qt_ka.po            |    5 +-
 src/vidalia/i18n/po/ka/vidalia_ka.po       | 2882 +++++++++++++++++++---------
 src/vidalia/i18n/po/km/qt_km.po            |    5 +-
 src/vidalia/i18n/po/km/vidalia_km.po       | 2882 +++++++++++++++++++---------
 src/vidalia/i18n/po/kn/qt_kn.po            |    5 +-
 src/vidalia/i18n/po/kn/vidalia_kn.po       |   82 +-
 src/vidalia/i18n/po/ko/qt_ko.po            |    6 +-
 src/vidalia/i18n/po/ko/vidalia_ko.po       |  247 +--
 src/vidalia/i18n/po/ku/qt_ku.po            |    5 +-
 src/vidalia/i18n/po/ku/vidalia_ku.po       | 2882 +++++++++++++++++++---------
 src/vidalia/i18n/po/kw/qt_kw.po            |    5 +-
 src/vidalia/i18n/po/kw/vidalia_kw.po       |  756 ++++++--
 src/vidalia/i18n/po/ky/qt_ky.po            |    5 +-
 src/vidalia/i18n/po/ky/vidalia_ky.po       |  756 ++++++--
 src/vidalia/i18n/po/lb/qt_lb.po            |    5 +-
 src/vidalia/i18n/po/lb/vidalia_lb.po       |   82 +-
 src/vidalia/i18n/po/ln/qt_ln.po            |    5 +-
 src/vidalia/i18n/po/ln/vidalia_ln.po       |   82 +-
 src/vidalia/i18n/po/lo/qt_lo.po            |    5 +-
 src/vidalia/i18n/po/lo/vidalia_lo.po       |   82 +-
 src/vidalia/i18n/po/lt/qt_lt.po            |    5 +-
 src/vidalia/i18n/po/lt/vidalia_lt.po       |  600 +++---
 src/vidalia/i18n/po/lv/qt_lv.po            |    5 +-
 src/vidalia/i18n/po/lv/vidalia_lv.po       |   82 +-
 src/vidalia/i18n/po/mg/qt_mg.po            |    5 +-
 src/vidalia/i18n/po/mg/vidalia_mg.po       |   82 +-
 src/vidalia/i18n/po/mi/qt_mi.po            |    5 +-
 src/vidalia/i18n/po/mi/vidalia_mi.po       |   82 +-
 src/vidalia/i18n/po/mk/qt_mk.po            |    5 +-
 src/vidalia/i18n/po/mk/vidalia_mk.po       |   82 +-
 src/vidalia/i18n/po/ml/qt_ml.po            |    5 +-
 src/vidalia/i18n/po/ml/vidalia_ml.po       |   82 +-
 src/vidalia/i18n/po/mn/qt_mn.po            |    5 +-
 src/vidalia/i18n/po/mn/vidalia_mn.po       |   82 +-
 src/vidalia/i18n/po/mr/qt_mr.po            |    5 +-
 src/vidalia/i18n/po/mr/vidalia_mr.po       |   82 +-
 src/vidalia/i18n/po/ms/qt_ms.po            |    5 +-
 src/vidalia/i18n/po/ms/vidalia_ms.po       |   82 +-
 src/vidalia/i18n/po/mt/qt_mt.po            |    5 +-
 src/vidalia/i18n/po/mt/vidalia_mt.po       |   82 +-
 src/vidalia/i18n/po/my/qt_my.po            |   26 +-
 src/vidalia/i18n/po/my/vidalia_my.po       | 1963 +++++++++----------
 src/vidalia/i18n/po/nah/qt_nah.po          |    5 +-
 src/vidalia/i18n/po/nah/vidalia_nah.po     |   82 +-
 src/vidalia/i18n/po/nap/qt_nap.po          |    5 +-
 src/vidalia/i18n/po/nap/vidalia_nap.po     |   82 +-
 src/vidalia/i18n/po/nb/qt_nb.po            |   26 +-
 src/vidalia/i18n/po/nb/vidalia_nb.po       |  291 ++--
 src/vidalia/i18n/po/ne/qt_ne.po            |    5 +-
 src/vidalia/i18n/po/ne/vidalia_ne.po       |   82 +-
 src/vidalia/i18n/po/nl/qt_nl.po            |   28 +-
 src/vidalia/i18n/po/nl/vidalia_nl.po       |  610 +++----
 src/vidalia/i18n/po/nn/qt_nn.po            |    5 +-
 src/vidalia/i18n/po/nn/vidalia_nn.po       |   82 +-
 src/vidalia/i18n/po/nso/qt_nso.po          |    5 +-
 src/vidalia/i18n/po/nso/vidalia_nso.po     |   82 +-
 src/vidalia/i18n/po/oc/qt_oc.po            |    5 +-
 src/vidalia/i18n/po/oc/vidalia_oc.po       |   82 +-
 src/vidalia/i18n/po/or/qt_or.po            |    5 +-
 src/vidalia/i18n/po/or/vidalia_or.po       |  756 ++++++--
 src/vidalia/i18n/po/pa/qt_pa.po            |    5 +-
 src/vidalia/i18n/po/pa/vidalia_pa.po       |   82 +-
 src/vidalia/i18n/po/pap/qt_pap.po          |    5 +-
 src/vidalia/i18n/po/pap/vidalia_pap.po     |   82 +-
 src/vidalia/i18n/po/pl/qt_pl.po            |   26 +-
 src/vidalia/i18n/po/pl/vidalia_pl.po       |  493 +++---
 src/vidalia/i18n/po/pms/qt_pms.po          |    5 +-
 src/vidalia/i18n/po/pms/vidalia_pms.po     |   82 +-
 src/vidalia/i18n/po/ps/qt_ps.po            |    5 +-
 src/vidalia/i18n/po/ps/vidalia_ps.po       |   82 +-
 src/vidalia/i18n/po/pt/qt_pt.po            |   28 +-
 src/vidalia/i18n/po/pt/vidalia_pt.po       |  494 ++----
 src/vidalia/i18n/po/pt_BR/qt_pt_BR.po      |   28 +-
 src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po |  480 ++----
 src/vidalia/i18n/po/ro/qt_ro.po            |   26 +-
 src/vidalia/i18n/po/ro/vidalia_ro.po       |  326 ++--
 src/vidalia/i18n/po/ru/qt_ru.po            |   28 +-
 src/vidalia/i18n/po/ru/vidalia_ru.po       |  471 ++---
 src/vidalia/i18n/po/sco/qt_sco.po          |    5 +-
 src/vidalia/i18n/po/sco/vidalia_sco.po     |   82 +-
 src/vidalia/i18n/po/sk/qt_sk.po            |   47 +-
 src/vidalia/i18n/po/sk/vidalia_sk.po       | 2105 +++++++++++++--------
 src/vidalia/i18n/po/sl/qt_sl.po            |    6 +-
 src/vidalia/i18n/po/sl/vidalia_sl.po       | 1817 ++++++++----------
 src/vidalia/i18n/po/so/qt_so.po            |    5 +-
 src/vidalia/i18n/po/so/vidalia_so.po       |  756 ++++++--
 src/vidalia/i18n/po/son/qt_son.po          |    5 +-
 src/vidalia/i18n/po/son/vidalia_son.po     |   82 +-
 src/vidalia/i18n/po/sq/qt_sq.po            |    6 +-
 src/vidalia/i18n/po/sq/vidalia_sq.po       |  813 +++++++--
 src/vidalia/i18n/po/sr/qt_sr.po            |   26 +-
 src/vidalia/i18n/po/sr/vidalia_sr.po       | 2380 ++++++++++++++---------
 src/vidalia/i18n/po/st/qt_st.po            |    5 +-
 src/vidalia/i18n/po/st/vidalia_st.po       |  756 ++++++--
 src/vidalia/i18n/po/su/qt_su.po            |    5 +-
 src/vidalia/i18n/po/su/vidalia_su.po       |   82 +-
 src/vidalia/i18n/po/sv/qt_sv.po            |   24 +-
 src/vidalia/i18n/po/sv/vidalia_sv.po       |  310 ++--
 src/vidalia/i18n/po/sw/qt_sw.po            |    5 +-
 src/vidalia/i18n/po/sw/vidalia_sw.po       |   82 +-
 src/vidalia/i18n/po/ta/qt_ta.po            |    5 +-
 src/vidalia/i18n/po/ta/vidalia_ta.po       |   82 +-
 src/vidalia/i18n/po/te/qt_te.po            |    5 +-
 src/vidalia/i18n/po/te/vidalia_te.po       |   82 +-
 src/vidalia/i18n/po/tg/qt_tg.po            |    5 +-
 src/vidalia/i18n/po/tg/vidalia_tg.po       |   82 +-
 src/vidalia/i18n/po/th/qt_th.po            |    5 +-
 src/vidalia/i18n/po/th/vidalia_th.po       |  260 ++--
 src/vidalia/i18n/po/ti/qt_ti.po            |    5 +-
 src/vidalia/i18n/po/ti/vidalia_ti.po       |   82 +-
 src/vidalia/i18n/po/tk/qt_tk.po            |    5 +-
 src/vidalia/i18n/po/tk/vidalia_tk.po       |   82 +-
 src/vidalia/i18n/po/tr/qt_tr.po            |   47 +-
 src/vidalia/i18n/po/tr/vidalia_tr.po       |  802 ++++----
 src/vidalia/i18n/po/uk/qt_uk.po            |  173 +-
 src/vidalia/i18n/po/uk/vidalia_uk.po       | 2899 +++++++++++++++++++---------
 src/vidalia/i18n/po/ur/qt_ur.po            |    5 +-
 src/vidalia/i18n/po/ur/vidalia_ur.po       |   82 +-
 src/vidalia/i18n/po/ve/qt_ve.po            |    5 +-
 src/vidalia/i18n/po/ve/vidalia_ve.po       |   82 +-
 src/vidalia/i18n/po/vi/qt_vi.po            |    5 +-
 src/vidalia/i18n/po/vi/vidalia_vi.po       |  264 ++--
 src/vidalia/i18n/po/wa/qt_wa.po            |    5 +-
 src/vidalia/i18n/po/wa/vidalia_wa.po       |  756 ++++++--
 src/vidalia/i18n/po/wo/qt_wo.po            |    5 +-
 src/vidalia/i18n/po/wo/vidalia_wo.po       |  756 ++++++--
 src/vidalia/i18n/po/zh_CN/qt_zh_CN.po      |   20 +-
 src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po |  158 +-
 src/vidalia/i18n/po/zh_HK/qt_zh_HK.po      |    5 +-
 src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po |   82 +-
 src/vidalia/i18n/po/zh_TW/qt_zh_TW.po      |   24 +-
 src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po |  828 +++++++--
 src/vidalia/i18n/po/zu/qt_zu.po            |    5 +-
 src/vidalia/i18n/po/zu/vidalia_zu.po       |   82 +-
 236 files changed, 37826 insertions(+), 24031 deletions(-)

diff --git a/src/vidalia/i18n/po/af/qt_af.po b/src/vidalia/i18n/po/af/qt_af.po
index 2ab4636..b5f5ffb 100644
--- a/src/vidalia/i18n/po/af/qt_af.po
+++ b/src/vidalia/i18n/po/af/qt_af.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/af/vidalia_af.po b/src/vidalia/i18n/po/af/vidalia_af.po
index df5ee68..6cf46f2 100755
--- a/src/vidalia/i18n/po/af/vidalia_af.po
+++ b/src/vidalia/i18n/po/af/vidalia_af.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ak/qt_ak.po b/src/vidalia/i18n/po/ak/qt_ak.po
index 1c3c55f..22f6acf 100644
--- a/src/vidalia/i18n/po/ak/qt_ak.po
+++ b/src/vidalia/i18n/po/ak/qt_ak.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ak/vidalia_ak.po b/src/vidalia/i18n/po/ak/vidalia_ak.po
index d84aacd..5647b86 100644
--- a/src/vidalia/i18n/po/ak/vidalia_ak.po
+++ b/src/vidalia/i18n/po/ak/vidalia_ak.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/am/qt_am.po b/src/vidalia/i18n/po/am/qt_am.po
index 2fdc094..7214fd3 100644
--- a/src/vidalia/i18n/po/am/qt_am.po
+++ b/src/vidalia/i18n/po/am/qt_am.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/am/vidalia_am.po b/src/vidalia/i18n/po/am/vidalia_am.po
index 845e243..2cd8ed0 100644
--- a/src/vidalia/i18n/po/am/vidalia_am.po
+++ b/src/vidalia/i18n/po/am/vidalia_am.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ar/qt_ar.po b/src/vidalia/i18n/po/ar/qt_ar.po
index 4cef292..7688207 100644
--- a/src/vidalia/i18n/po/ar/qt_ar.po
+++ b/src/vidalia/i18n/po/ar/qt_ar.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # OsamaK <osamak@xxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-22 16:13+0000\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
 "Last-Translator: OsamaK <osamak@xxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 Ù?Ù?جÙ?د Ù?عÙ?ا.\n"
-"Ù?Ù? ترغب باستبداÙ?Ù?Ø?"
+msgstr "%1 Ù?Ù?جÙ?د Ù?عÙ?ا.\nÙ?Ù? ترغب باستبداÙ?Ù?Ø?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Ù?Ù?Ù? غÙ?ر Ù?Ù?جÙ?د.\n"
-"رجاءاÙ? تأÙ?د Ù?Ù? صحة سÙ? اÙ?Ù?Ù?Ù?."
+msgstr "%1\nÙ?Ù?Ù? غÙ?ر Ù?Ù?جÙ?د.\nرجاءاÙ? تأÙ?د Ù?Ù? صحة سÙ? اÙ?Ù?Ù?Ù?."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Ù?جÙ?د غÙ?ر Ù?Ù?جÙ?د.\n"
-"رجاءاÙ? تأÙ?د Ù?Ù? صحة إسÙ? اÙ?Ù?جÙ?د."
+msgstr "%1\nÙ?جÙ?د غÙ?ر Ù?Ù?جÙ?د.\nرجاءاÙ? تأÙ?د Ù?Ù? صحة إسÙ? اÙ?Ù?جÙ?د."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' Ù?Ø­Ù?Ù? Ù?Ù? اÙ?Ù?تابة.\n"
-"Ù?Ù? ترÙ?د حذÙ?Ù? عÙ?Ù? Ø£Ù? حاÙ?Ø?"
+msgstr "'%1' Ù?Ø­Ù?Ù? Ù?Ù? اÙ?Ù?تابة.\nÙ?Ù? ترÙ?د حذÙ?Ù? عÙ?Ù? Ø£Ù? حاÙ?Ø?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Ù?اÙ?Ù?Ù?Ù? إستعÙ?اÙ? اÙ?اسÙ? \"%1\".</b>حاÙ?Ù? استخداÙ? اسÙ? أخر Ù?ع تÙ?Ù?Ù?Ù? عدد اÙ?Ù?حارÙ?"
-" Ø£Ù? دÙ?Ù? استخداÙ? عÙ?اÙ?ات اÙ?تÙ?Ù?Ù?Ø·<p>"
+msgstr "<b>Ù?اÙ?Ù?Ù?Ù? إستعÙ?اÙ? اÙ?اسÙ? \"%1\".</b>حاÙ?Ù? استخداÙ? اسÙ? أخر Ù?ع تÙ?Ù?Ù?Ù? عدد اÙ?Ù?حارÙ? Ø£Ù? دÙ?Ù? استخداÙ? عÙ?اÙ?ات اÙ?تÙ?Ù?Ù?Ø·<p>"
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 Ù?Ù?Ù?Ù? باÙ?ت"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 باÙ?ت"
-
-
diff --git a/src/vidalia/i18n/po/ar/vidalia_ar.po b/src/vidalia/i18n/po/ar/vidalia_ar.po
index 47abd9f..6065c82 100644
--- a/src/vidalia/i18n/po/ar/vidalia_ar.po
+++ b/src/vidalia/i18n/po/ar/vidalia_ar.po
@@ -1,6 +1,7 @@
 # 
 # Translators:
 # Ahmad LuvSy <donotplay@xxxxxxxxxx>, 2012.
+# Ahmad Mohammad <>, 2012.
 # IBRAHIM <mradonadiego@xxxxxxxxxx>, 2011.
 #   <manmacdeath@xxxxxxxxx>, 2011.
 #   <moazbaghdadi@xxxxxxxxx>, 2011.
@@ -8,12 +9,13 @@
 # Mohammed Al-Doub <voulnet@xxxxxxxxx>, 2012.
 # OsamaK <osamak@xxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# Yehia Badawy <the1legend_2010@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-08 20:27+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-17 16:48+0000\n"
 "Last-Translator: Mohammed Al-Doub <voulnet@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -176,17 +178,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Ù?Ù?Ù? اÙ?إعدادات اÙ?Ù?حدد Ù?حتÙ?Ù? عÙ?Ù? أحرÙ? Ù?ا Ù?ستطÙ?ع Ù?ظاÙ?Ù? إظÙ?ارÙ?ا Ù?اعتÙ?ادÙ? عÙ?Ù? "
-"Ù?ظاÙ? ترÙ?Ù?Ù? 8-بت "
+msgstr "Ù?Ù?Ù? اÙ?إعدادات اÙ?Ù?حدد Ù?حتÙ?Ù? عÙ?Ù? أحرÙ? Ù?ا Ù?ستطÙ?ع Ù?ظاÙ?Ù? إظÙ?ارÙ?ا Ù?اعتÙ?ادÙ? عÙ?Ù? Ù?ظاÙ? ترÙ?Ù?Ù? 8-بت "
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Ù?جÙ?د اÙ?Ù?عÙ?Ù?Ù?ات اÙ?Ù?حدد Ù?حتÙ?Ù? عÙ?Ù? أحرÙ? Ù?ا Ù?ستطÙ?ع Ù?ظاÙ?Ù? إظÙ?ارÙ?ا Ù?اعتÙ?ادÙ? عÙ?Ù? "
-"Ù?ظاÙ? ترÙ?Ù?Ù? 8-بت"
+msgstr "Ù?جÙ?د اÙ?Ù?عÙ?Ù?Ù?ات اÙ?Ù?حدد Ù?حتÙ?Ù? عÙ?Ù? أحرÙ? Ù?ا Ù?ستطÙ?ع Ù?ظاÙ?Ù? إظÙ?ارÙ?ا Ù?اعتÙ?ادÙ? عÙ?Ù? Ù?ظاÙ? ترÙ?Ù?Ù? 8-بت"
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -210,13 +208,17 @@ 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"
-"Ù?د تضطر Ù?إزاÙ?تÙ?ا Ù?دÙ?Ù?اÙ?."
+msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? إزاÙ?Ø© خدÙ?Ø© تÙ?ر.\n\nÙ?د تضطر Ù?إزاÙ?تÙ?ا Ù?دÙ?Ù?اÙ?."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -238,6 +240,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 "Ù?Ù?Ø°:"
@@ -458,8 +477,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"اتصÙ? Ú¤Ù?داÙ?Ù?ا بعÙ?Ù?Ù?Ø© تÙ?ر جارÙ?Ø© تتطÙ?ب Ù?Ù?Ù?Ø© سر. Ù?رجÙ? Ø£Ù? تدخÙ? Ù?Ù?Ù?Ø© سر اÙ?تحÙ?Ù?:"
+msgstr "اتصÙ? Ú¤Ù?داÙ?Ù?ا بعÙ?Ù?Ù?Ø© تÙ?ر جارÙ?Ø© تتطÙ?ب Ù?Ù?Ù?Ø© سر. Ù?رجÙ? Ø£Ù? تدخÙ? Ù?Ù?Ù?Ø© سر اÙ?تحÙ?Ù?:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1307,25 +1325,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"تÙ? Ù?تابة إخطار Ù?Ø´Ù? تستطÙ?ع إرساÙ?Ù? Ø¥Ù?Ù? Ù?برÙ?جÙ? Ù?Ù?داÙ?Ù?ا Ù?Ù?Ù? Ù?ساعدÙ?Ù? عÙ?Ù? Ø¥Ù?جاد "
-"Ù?Ø­Ù? اÙ?Ù?Ø´Ù?Ù?Ø©. Ù?ا Ù?حتÙ?Ù? عÙ?Ù? Ø£Ù? Ù?عÙ?Ù?Ù?ات شخصÙ?Ø©."
+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 ""
-"بÙ?صÙ? Ù?Ù?ا Ù?Ù?ت تÙ?عÙ? Ù?بÙ? Ù?Ø´Ù? اÙ?برÙ?اÙ?جØ? Ù?ع اÙ?Ù?Ù?Ù?ات اÙ?آتÙ?Ø© اÙ?تÙ? تتصÙ? باÙ?إخطار:"
+msgstr "بÙ?صÙ? Ù?Ù?ا Ù?Ù?ت تÙ?عÙ? Ù?بÙ? Ù?Ø´Ù? اÙ?برÙ?اÙ?جØ? Ù?ع اÙ?Ù?Ù?Ù?ات اÙ?آتÙ?Ø© اÙ?تÙ? تتصÙ? باÙ?إخطار:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1544,9 +1557,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Ù?Ù?Ù?Ù? Ù?Ú¤Ù?داÙ?Ù?ا Ù?تح اÙ?رابط اÙ?Ø°Ù? حددتÙ? Ù?Ù? Ù?تصÙ?Ø­Ù? اÙ?Ù?بدئÙ? Ù?Ù?Ø¥Ù?ترÙ?ت. إذا Ù?Ù? Ù?Ù?Ù? "
-"Ù?تصÙ?Ø­Ù? حاÙ?Ù?ا Ù?ضبÙ?طاÙ? Ù?استخداÙ? تÙ?ر Ù?Ø¥Ù? Ù?ذا اÙ?Ø·Ù?ب Ù?Ù? Ù?Ù?Ù?Ù? سرÙ?Ù?ا."
+msgstr "Ù?Ù?Ù?Ù? Ù?Ú¤Ù?داÙ?Ù?ا Ù?تح اÙ?رابط اÙ?Ø°Ù? حددتÙ? Ù?Ù? Ù?تصÙ?Ø­Ù? اÙ?Ù?بدئÙ? Ù?Ù?Ø¥Ù?ترÙ?ت. إذا Ù?Ù? Ù?Ù?Ù? Ù?تصÙ?Ø­Ù? حاÙ?Ù?ا Ù?ضبÙ?طاÙ? Ù?استخداÙ? تÙ?ر Ù?Ø¥Ù? Ù?ذا اÙ?Ø·Ù?ب Ù?Ù? Ù?Ù?Ù?Ù? سرÙ?Ù?ا."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1560,9 +1571,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? Ù?تح اÙ?Ù?صÙ?Ø© اÙ?Ù?حددة Ù?Ù? Ù?تصÙ?Ø­Ù? Ù?Ù?Ù?ب. Ù?ا Ù?زاÙ? بإÙ?Ù?اÙ?Ù? Ù?سخ "
-"اÙ?Ù?سار Ù?Ù?صÙ?Ù? Ù?Ù? Ù?تصÙ?Ø­Ù?."
+msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? Ù?تح اÙ?Ù?صÙ?Ø© اÙ?Ù?حددة Ù?Ù? Ù?تصÙ?Ø­Ù? Ù?Ù?Ù?ب. Ù?ا Ù?زاÙ? بإÙ?Ù?اÙ?Ù? Ù?سخ اÙ?Ù?سار Ù?Ù?صÙ?Ù? Ù?Ù? Ù?تصÙ?Ø­Ù?."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1773,10 +1782,6 @@ msgid "Connected to the Tor network!"
 msgstr "تÙ? اÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ù?Ù? بتÙ? اÙ?تعرÙ? عÙ?Ù? حاÙ?Ø© بدء اÙ?تشغÙ?Ù?"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "Ù?تÙ?رÙ?ات"
 
@@ -1844,9 +1849,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"تعذÙ?Ù?ر عÙ?Ù? Ú¤Ù?داÙ?Ù?ا تشغÙ?Ù? تÙ?ر. تÙ?حص إعداداتÙ? Ù?Ù?تأÙ?د Ù?Ù? صحة اسÙ? Ù?Ù?Ù?ضع Ù?Ù?Ù? تÙ?ر "
-"اÙ?تÙ?Ù?Ù?Ø°Ù?."
+msgstr "تعذÙ?Ù?ر عÙ?Ù? Ú¤Ù?داÙ?Ù?ا تشغÙ?Ù? تÙ?ر. تÙ?حص إعداداتÙ? Ù?Ù?تأÙ?د Ù?Ù? صحة اسÙ? Ù?Ù?Ù?ضع Ù?Ù?Ù? تÙ?ر اÙ?تÙ?Ù?Ù?Ø°Ù?."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1884,9 +1887,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"تطÙ?ب برÙ?جÙ?Ø© تÙ?ر Ù?Ù? Ú¤Ù?داÙ?Ù?ا إرساÙ? Ù?حتÙ?Ù?ات Ù?عÙ?Ø© اÙ?تصدÙ?Ù? Ù?Ù?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? Ù?تÙ?Ù?Ù? "
-"Ù?Ù? Ø¥Ù?جادÙ?ا."
+msgstr "تطÙ?ب برÙ?جÙ?Ø© تÙ?ر Ù?Ù? Ú¤Ù?داÙ?Ù?ا إرساÙ? Ù?حتÙ?Ù?ات Ù?عÙ?Ø© اÙ?تصدÙ?Ù? Ù?Ù?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? Ù?تÙ?Ù?Ù? Ù?Ù? Ø¥Ù?جادÙ?ا."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1908,9 +1909,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Ù?Ù?داÙ?Ù?ا Ù?Ù? Ù?تÙ?Ù?Ù? Ù?Ù? اÙ?تسجÙ?Ù? Ù?بعض اÙ?أحداث. Ù?د تÙ?Ù?Ù? اÙ?عدÙ?د Ù?Ù? Ù?زاÙ?ا Ù?Ù?داÙ?Ù?ا "
-"غÙ?ر Ù?تÙ?Ù?رة."
+msgstr "Ù?Ù?داÙ?Ù?ا Ù?Ù? Ù?تÙ?Ù?Ù? Ù?Ù? اÙ?تسجÙ?Ù? Ù?بعض اÙ?أحداث. Ù?د تÙ?Ù?Ù? اÙ?عدÙ?د Ù?Ù? Ù?زاÙ?ا Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?تÙ?Ù?رة."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1932,9 +1931,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"إصدار تÙ?ر اÙ?Ù?Ù?صب حاÙ?Ù?اÙ? Ù?دÙ?Ù? Ø£Ù? Ù?اÙ?Ù?صح بÙ? بعد اÙ?Ø¢Ù?. Ù?رجÙ? زÙ?ارة Ù?Ù?Ù?ع تÙ?ر "
-"Ù?تÙ?زÙ?Ù? آخر إصدار."
+msgstr "إصدار تÙ?ر اÙ?Ù?Ù?صب حاÙ?Ù?اÙ? Ù?دÙ?Ù? Ø£Ù? Ù?اÙ?Ù?صح بÙ? بعد اÙ?Ø¢Ù?. Ù?رجÙ? زÙ?ارة Ù?Ù?Ù?ع تÙ?ر Ù?تÙ?زÙ?Ù? آخر إصدار."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2039,10 +2036,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"حاÙ?Ù? Ú¤Ù?داÙ?Ù?ا إعادة ضبط Ù?Ù?Ù?Ø© سر اÙ?تحÙ?Ù? بتÙ?ر Ù?Ù?Ù?Ù?Ù? Ù?Ù? Ù?Ù?Ù? Ù?ادراÙ? عÙ?Ù? إعادة "
-"تشغÙ?Ù? برÙ?اÙ?ج تÙ?ر. Ù?رجÙ? اÙ?تحÙ?Ù? Ù?Ù? Ù?دÙ?ر اÙ?Ù?Ù?اÙ? اÙ?خاص بÙ? Ù?Ù?تأÙ?د Ù?Ù? عدÙ? Ù?جÙ?د "
-"عÙ?Ù?Ù?ات تÙ?ر أخرÙ? جارÙ?Ø©."
+msgstr "حاÙ?Ù? Ú¤Ù?داÙ?Ù?ا إعادة ضبط Ù?Ù?Ù?Ø© سر اÙ?تحÙ?Ù? بتÙ?ر Ù?Ù?Ù?Ù?Ù? Ù?Ù? Ù?Ù?Ù? Ù?ادراÙ? عÙ?Ù? إعادة تشغÙ?Ù? برÙ?اÙ?ج تÙ?ر. Ù?رجÙ? اÙ?تحÙ?Ù? Ù?Ù? Ù?دÙ?ر اÙ?Ù?Ù?اÙ? اÙ?خاص بÙ? Ù?Ù?تأÙ?د Ù?Ù? عدÙ? Ù?جÙ?د عÙ?Ù?Ù?ات تÙ?ر أخرÙ? جارÙ?Ø©."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2096,9 +2090,25 @@ 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."
-msgstr ""
-"Ù?Ù? Ø´Ù?Ø¡ Ù?تÙ? إرساÙ?Ù? عÙ? طرÙ?Ù? Ù?ذا اÙ?اتصاÙ? تÙ?Ù?Ù? Ù?راÙ?بتÙ?Ø? اÙ?رجاء اÙ?تحÙ?Ù? Ù?Ù? إعدادات"
-" اÙ?تطبÙ?Ù? Ù?استخداÙ? برÙ?تÙ?Ù?Ù?Ù?ات Ù?Ø´Ù?رة Ù?Ù?Ø·Ø? Ù?Ø«Ù? SSLØ? Ø¥Ù? Ù?اÙ? Ù?ذا Ù?Ù?Ù?Ù?اÙ?"
+msgstr "Ù?Ù? Ø´Ù?Ø¡ Ù?تÙ? إرساÙ?Ù? عÙ? طرÙ?Ù? Ù?ذا اÙ?اتصاÙ? تÙ?Ù?Ù? Ù?راÙ?بتÙ?Ø? اÙ?رجاء اÙ?تحÙ?Ù? Ù?Ù? إعدادات اÙ?تطبÙ?Ù? Ù?استخداÙ? برÙ?تÙ?Ù?Ù?Ù?ات Ù?Ø´Ù?رة Ù?Ù?Ø·Ø? Ù?Ø«Ù? SSLØ? Ø¥Ù? Ù?اÙ? Ù?ذا Ù?Ù?Ù?Ù?اÙ?"
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Ù?تÙ? تشغÙ?Ù? torrc Ù?Ù? %1 Ø¥Ù?Ù? %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(عÙ?Ù?Ù? تÙ?Ù?ت عÙ?Ù? Ù?ا Ù?بدÙ?)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(عÙ?Ù?Ù? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? عÙ?Ù? Ù?ا Ù?بدÙ?)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Ù?بدÙ? Ø£Ù? أحد براÙ?جÙ? %1 Ù?تصÙ? بطرÙ?Ù?Ø© غÙ?ر Ù?Ø´Ù?رة Ù?Ù?ا Ø¢Ù?Ù?Ø© باÙ?Ù?حطة %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2108,47 +2118,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"جار Ø¥Ù?Ù?اÙ? تحÙ?Ù?Ù?تÙ?.\n"
-"Ù?رجÙ? اÙ?Ù?Ù?ر عÙ?Ù? \"Ø¥Ù?Ù?اÙ?\" Ù?رة أخرÙ? Ù?تÙ?Ù?Ù? تحÙ?Ù?Ù?تÙ? اÙ?Ø¢Ù?."
+msgstr "جار Ø¥Ù?Ù?اÙ? تحÙ?Ù?Ù?تÙ?.\nÙ?رجÙ? اÙ?Ù?Ù?ر عÙ?Ù? \"Ø¥Ù?Ù?اÙ?\" Ù?رة أخرÙ? Ù?تÙ?Ù?Ù? تحÙ?Ù?Ù?تÙ? اÙ?Ø¢Ù?."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ù?تÙ? تشغÙ?Ù? torrc Ù?Ù? %1 Ø¥Ù?Ù? %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادر عÙ?Ù? اÙ?تحدث اÙ?Ù? شبÙ?Ø© تÙ?ر Ù?Ø£Ù?Ù? غÙ?ر Ù?ادر عÙ?Ù? اÙ?دخÙ?Ù? Ù?Ù?ذا اÙ?Ù?Ù?Ù?:  %1\n\nÙ?Ù?ا آخر شرح Ù?Ù?خطأ:\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 "إذا Ù?اÙ? Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادر عÙ?Ù? Ø¥Ù?Ù?اÙ? تÙ?ر, سÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بعرض رساÙ?Ø© خطأ تخبرÙ? عÙ? اÙ?خطأ اÙ?Ø°Ù? حدث. Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضا Ø¥Ù?Ù?اء Ù?ظرة عÙ?Ù? &lt;a href=\"log.html\"&gt;سجÙ? اÙ?احداث&lt;/a&gt; Ù?Ù?عرÙ?Ø© Ù?ا إذا Ù?اÙ? تÙ?ر بإصدار اÙ?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? Ù?ا اÙ?خطأ اÙ?Ø°Ù? حدث."
 
 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?"
-msgstr ""
-"Ø£Ù?ت حاÙ?Ù?اÙ? تشغÙ? تحÙ?Ù?Ù?Ø©. Ø¥Ù?Ù?اÙ? Ù?Ø°Ù? اÙ?تحÙ?Ù?Ù?Ø© سÙ?Ù?اطع Ø£Ù? اتصاÙ?ات Ù?Ù?تÙ?حة Ù?Ù? اÙ?عÙ?Ù?اء.\n"
-"\n"
-"Ù?Ù? تÙ?د Ø¥Ù?Ù?اÙ? اÙ?تحÙ?Ù?Ù?Ø© ببطء Ù?إعطاء اÙ?عÙ?Ù?اء Ù?Ù?تاÙ? Ù?اÙ?Ù?اÙ? Ù?Ù?بحث عÙ? تحÙ?Ù?Ù?Ø© جدÙ?دةØ?"
+msgstr "Ø£Ù?ت حاÙ?Ù?اÙ? تشغÙ? تحÙ?Ù?Ù?Ø©. Ø¥Ù?Ù?اÙ? Ù?Ø°Ù? اÙ?تحÙ?Ù?Ù?Ø© سÙ?Ù?اطع Ø£Ù? اتصاÙ?ات Ù?Ù?تÙ?حة Ù?Ù? اÙ?عÙ?Ù?اء.\n\nÙ?Ù? تÙ?د Ø¥Ù?Ù?اÙ? اÙ?تحÙ?Ù?Ù?Ø© ببطء Ù?إعطاء اÙ?عÙ?Ù?اء Ù?Ù?تاÙ? Ù?اÙ?Ù?اÙ? Ù?Ù?بحث عÙ? تحÙ?Ù?Ù?Ø© جدÙ?دةØ?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Ù?جد Ú¤Ù?داÙ?Ù?ا Ø£Ù? برÙ?جÙ?Ø© تÙ?ر تÙ?Ù?Ù?ت عÙ? اÙ?عÙ?Ù? بشÙ?Ù? Ù?Ù?اجئ.\n"
-"\n"
-"Ù?رجÙ? اÙ?تحÙ?Ù? Ù?Ù? سجÙ? اÙ?رسائÙ? Ù?تحذÙ?رات Ø£Ù? رسائÙ? خطأ حدÙ?ثة."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(عÙ?Ù?Ù? تÙ?Ù?ت عÙ?Ù? Ù?ا Ù?بدÙ?)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(عÙ?Ù?Ù? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? عÙ?Ù? Ù?ا Ù?بدÙ?)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Ù?بدÙ? Ø£Ù? أحد براÙ?جÙ? %1 Ù?تصÙ? بطرÙ?Ù?Ø© غÙ?ر Ù?Ø´Ù?رة Ù?Ù?ا Ø¢Ù?Ù?Ø© باÙ?Ù?حطة %2."
+msgstr "Ù?جد Ú¤Ù?داÙ?Ù?ا Ø£Ù? برÙ?جÙ?Ø© تÙ?ر تÙ?Ù?Ù?ت عÙ? اÙ?عÙ?Ù? بشÙ?Ù? Ù?Ù?اجئ.\n\nÙ?رجÙ? اÙ?تحÙ?Ù? Ù?Ù? سجÙ? اÙ?رسائÙ? Ù?تحذÙ?رات Ø£Ù? رسائÙ? خطأ حدÙ?ثة."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2422,17 +2421,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر عÙ?دÙ?ا Ù?حصÙ? \n"
-"Ø´Ù?Ø¡ Ù?ا بشÙ?Ù? خاطئ جداÙ? Ù?Ù?ا Ù?ستطÙ?ع تÙ?ر اÙ?Ù?تابعة."
+msgstr "اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر عÙ?دÙ?ا Ù?حصÙ? \nØ´Ù?Ø¡ Ù?ا بشÙ?Ù? خاطئ جداÙ? Ù?Ù?ا Ù?ستطÙ?ع تÙ?ر اÙ?Ù?تابعة."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر Ù?Ù?د عÙ?دÙ?ا \n"
-"Ù?حصÙ? Ø´Ù?Ø¡ خطأ Ù?Ù? تÙ?ر."
+msgstr "اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر Ù?Ù?د عÙ?دÙ?ا \nÙ?حصÙ? Ø´Ù?Ø¡ خطأ Ù?Ù? تÙ?ر."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2440,37 +2435,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر بشÙ?Ù? Ù?Ù?Ù?Ù? \n"
-"أثÙ?اء تشغÙ?Ù? تÙ?ر بشÙ?Ù? طبÙ?عÙ? Ù?Ù?ا \n"
-"Ù?عتبرÙ? أخطاءØ? Ù?Ù?Ù?Ù? Ù?Ù?Ù?Ù? \n"
-"Ø£Ù? Ù?Ù?Ù?Ù?Ù?."
+msgstr "اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر بشÙ?Ù? Ù?Ù?Ù?Ù? \nأثÙ?اء تشغÙ?Ù? تÙ?ر بشÙ?Ù? طبÙ?عÙ? Ù?Ù?ا \nÙ?عتبرÙ? أخطاءØ? Ù?Ù?Ù?Ù? Ù?Ù?Ù?Ù? \nØ£Ù? Ù?Ù?Ù?Ù?Ù?."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر بشÙ?ر Ù?تÙ?رر \n"
-"أثÙ?اء تشغÙ?Ù? تÙ?ر بشÙ?Ù? طبÙ?عÙ?."
+msgstr "اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر بشÙ?ر Ù?تÙ?رر \nأثÙ?اء تشغÙ?Ù? تÙ?ر بشÙ?Ù? طبÙ?عÙ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"رسائÙ? Ù?Ø·Ù?Ù?Ø© جداÙ? تÙ?Ù? Ù?Ø·Ù?رÙ? \n"
-"تÙ?ر بشÙ?Ù? رئÙ?سÙ?."
+msgstr "رسائÙ? Ù?Ø·Ù?Ù?Ø© جداÙ? تÙ?Ù? Ù?Ø·Ù?رÙ? \nتÙ?ر بشÙ?Ù? رئÙ?سÙ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Ù?ا Ù?Ù?Ù?Ù? Ù?تابة اÙ?Ù?Ù?Ù? %1\n"
-"\n"
-"%2."
+msgstr "Ù?ا Ù?Ù?Ù?Ù? Ù?تابة اÙ?Ù?Ù?Ù? %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2577,14 +2561,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "جسر عاطÙ?"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Ù?عرÙ? اÙ?جسر اÙ?Ù?حدد عاطÙ?"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Ù?سخ (Ctrl+C)"
 
@@ -2592,9 +2568,7 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Ù?جب Ø£Ù? تحدد Ø¥Ù?ا عÙ?Ù?اÙ? IP Ø£Ù? اسÙ? اÙ?Ù?ضÙ?Ù? Ù?رÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?ضبط تÙ?ر Ù?استخداÙ? Ù?سÙ?Ø· "
-"Ù?Ù?Ù?صÙ?Ù? Ø¥Ù?Ù? اÙ?Ø¥Ù?ترÙ?ت."
+msgstr "Ù?جب Ø£Ù? تحدد Ø¥Ù?ا عÙ?Ù?اÙ? IP Ø£Ù? اسÙ? اÙ?Ù?ضÙ?Ù? Ù?رÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?ضبط تÙ?ر Ù?استخداÙ? Ù?سÙ?Ø· Ù?Ù?Ù?صÙ?Ù? Ø¥Ù?Ù? اÙ?Ø¥Ù?ترÙ?ت."
 
 msgctxt "NetworkPage"
 msgid ""
@@ -2654,9 +2628,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"اختر Ù?تشÙ?ر Ø·Ù?بات اÙ?دÙ?Ù?Ù? Ù? -اختÙ?ارÙ?اÙ?- تستخدÙ? تحÙ?Ù?Ù?ات اÙ?جسÙ?ر Ù?Ù?Ù?صÙ?Ù? Ø¥Ù?Ù? شبÙ?Ø© "
-"تÙ?ر"
+msgstr "اختر Ù?تشÙ?ر Ø·Ù?بات اÙ?دÙ?Ù?Ù? Ù? -اختÙ?ارÙ?اÙ?- تستخدÙ? تحÙ?Ù?Ù?ات اÙ?جسÙ?ر Ù?Ù?Ù?صÙ?Ù? Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2694,9 +2666,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ù?ا تÙ?جد جسÙ?ر جدÙ?دة حاÙ?Ù?اÙ?. Ù?Ù?Ù?Ù?Ù? Ø£Ù? تÙ?تظر Ù?Ù?Ù?Ù?اÙ? Ù?تحاÙ?Ù? Ù?رة أخرÙ?Ø? Ø£Ù? Ø£Ù? تجرب"
-" أسÙ?Ù?باÙ? آخر Ù?Ø¥Ù?جاد جسÙ?ر جدÙ?دة."
+msgstr "Ù?ا تÙ?جد جسÙ?ر جدÙ?دة حاÙ?Ù?اÙ?. Ù?Ù?Ù?Ù?Ù? Ø£Ù? تÙ?تظر Ù?Ù?Ù?Ù?اÙ? Ù?تحاÙ?Ù? Ù?رة أخرÙ?Ø? Ø£Ù? Ø£Ù? تجرب أسÙ?Ù?باÙ? آخر Ù?Ø¥Ù?جاد جسÙ?ر جدÙ?دة."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2723,13 +2693,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Ù?جب Ø£Ù? تحدد Ù?Ù?Ù?Ø°Ù?ا Ù?احدÙ?ا Ù?سÙ?Ø­ Ù?Ù? اÙ?جدار اÙ?Ù?ارÙ? باÙ?اتصاÙ? بÙ? Ø£Ù? Ø£Ù?ثر."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Ù?بÙ?Ù?"
@@ -2886,9 +2856,7 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Ù?جب Ø£Ù? تضبط إعدادات تÙ?ر Ù?Ù?تصرÙ? عÙ?Ù? Ø£Ù?Ù? تحÙ?Ù?Ù?Ø© جسر Ù?Ù?Ù?ستخدÙ?Ù?Ù? اÙ?Ù?حجÙ?بÙ?Ù?Ø? Ù?Ù?Ù?Ù?"
-" Ù?سخة تÙ?ر اÙ?خاصة بÙ? Ù?ا تدعÙ? اÙ?جسÙ?ر."
+msgstr "Ù?جب Ø£Ù? تضبط إعدادات تÙ?ر Ù?Ù?تصرÙ? عÙ?Ù? Ø£Ù?Ù? تحÙ?Ù?Ù?Ø© جسر Ù?Ù?Ù?ستخدÙ?Ù?Ù? اÙ?Ù?حجÙ?بÙ?Ù?Ø? Ù?Ù?Ù?Ù? Ù?سخة تÙ?ر اÙ?خاصة بÙ? Ù?ا تدعÙ? اÙ?جسÙ?ر."
 
 msgctxt "ServerPage"
 msgid ""
@@ -2909,10 +2877,6 @@ msgid "Run as a client only"
 msgstr "تشغÙ?Ù? Ù?عÙ?Ù?Ù? Ù?Ù?Ø·."
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "تÙ?رÙ?ر تدÙ?Ù?ات شبÙ?Ø© تÙ?ر"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Ù?دخÙ? اÙ?تحÙ?Ù?Ù?Ø©:"
 
@@ -2964,9 +2928,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Ù?Ù?صÙ?ات اÙ?Ø¥Ù?ترÙ?ت ذات سرعة اÙ?تÙ?زÙ?Ù? اÙ?Ù?بÙ?رة Ù?سرعة رÙ?ع صغÙ?رةØ? Ù?رجÙ? Ø°Ù?ر سرعة "
-"اÙ?رÙ?ع اÙ?Ù?تاحة Ù?Ù?ا."
+msgstr "Ù?Ù?صÙ?ات اÙ?Ø¥Ù?ترÙ?ت ذات سرعة اÙ?تÙ?زÙ?Ù? اÙ?Ù?بÙ?رة Ù?سرعة رÙ?ع صغÙ?رةØ? Ù?رجÙ? Ø°Ù?ر سرعة اÙ?رÙ?ع اÙ?Ù?تاحة Ù?Ù?ا."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3024,9 +2986,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Ù?جب Ø£Ù? Ù?Ù?Ù?Ù? Ø£Ù?بر Ù?عدÙ? عرض حزÙ?Ø© Ù?ساÙ?Ù?اÙ? Ø£Ù? Ø£Ù?بر Ù?Ù? اÙ?Ù?عدÙ? اÙ?Ù?سطÙ? Ù?عرض اÙ?حزÙ?Ø©Ø?"
-" Ù? Ù?Ù?ا اÙ?Ù?Ù?Ù?تÙ?Ù? Ù?جب Ø£Ù? تÙ?Ù?Ù?ا 20 Ù?.باÙ?ت/ثا عÙ?Ù? اÙ?Ø£Ù?Ù?."
+msgstr "Ù?جب Ø£Ù? Ù?Ù?Ù?Ù? Ø£Ù?بر Ù?عدÙ? عرض حزÙ?Ø© Ù?ساÙ?Ù?اÙ? Ø£Ù? Ø£Ù?بر Ù?Ù? اÙ?Ù?عدÙ? اÙ?Ù?سطÙ? Ù?عرض اÙ?حزÙ?Ø©Ø? Ù? Ù?Ù?ا اÙ?Ù?Ù?Ù?تÙ?Ù? Ù?جب Ø£Ù? تÙ?Ù?Ù?ا 20 Ù?.باÙ?ت/ثا عÙ?Ù? اÙ?Ø£Ù?Ù?."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3087,17 +3047,13 @@ msgstr "عرض Ù?Ù?ضÙ?ع اÙ?Ù?ساعدة Ø­Ù?Ù? سÙ?اسات اÙ?Ù?خرج"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Ù?ا Ù?Ù? Ù?Ù?ارد اÙ?Ø¥Ù?ترÙ?ت اÙ?تÙ? Ù?جب Ø£Ù? Ù?تÙ?Ù?Ù? اÙ?Ù?ستخدÙ?Ù?Ù? Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا Ù?Ù? "
-"تحÙ?Ù?Ù?تÙ?Ø?"
+msgstr "Ù?ا Ù?Ù? Ù?Ù?ارد اÙ?Ø¥Ù?ترÙ?ت اÙ?تÙ? Ù?جب Ø£Ù? Ù?تÙ?Ù?Ù? اÙ?Ù?ستخدÙ?Ù?Ù? Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا Ù?Ù? تحÙ?Ù?Ù?تÙ?Ø?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"تÙ?ر سÙ?ستÙ?ر بحجب بعض تطبÙ?Ù?ات اÙ?برÙ?د اÙ?صادر Ù?تشارÙ? اÙ?Ù?Ù?Ù?ات بشÙ?Ù? تÙ?Ù?ائÙ? Ù?Ù?تخÙ?Ù?Ù?"
-" Ù?Ù? اÙ?سخاÙ? (spam) Ù?إساءات اÙ?استخداÙ? اÙ?أخرÙ?."
+msgstr "تÙ?ر سÙ?ستÙ?ر بحجب بعض تطبÙ?Ù?ات اÙ?برÙ?د اÙ?صادر Ù?تشارÙ? اÙ?Ù?Ù?Ù?ات بشÙ?Ù? تÙ?Ù?ائÙ? Ù?Ù?تخÙ?Ù?Ù? Ù?Ù? اÙ?سخاÙ? (spam) Ù?إساءات اÙ?استخداÙ? اÙ?أخرÙ?."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3128,8 +3084,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"اترÙ? تحÙ?Ù?Ù?تÙ? Ù?اعÙ?Ø© Ù?Ù? Ù?Ù?Ù?Ù? Ù?دÙ? اÙ?عÙ?Ù?اء Ù?رصة Ø£Ù?بر Ù?Ù? اÙ?عثÙ?ر عÙ?Ù?Ù?ا Ù?استخداÙ?Ù?ا."
+msgstr "اترÙ? تحÙ?Ù?Ù?تÙ? Ù?اعÙ?Ø© Ù?Ù? Ù?Ù?Ù?Ù? Ù?دÙ? اÙ?عÙ?Ù?اء Ù?رصة Ø£Ù?بر Ù?Ù? اÙ?عثÙ?ر عÙ?Ù?Ù?ا Ù?استخداÙ?Ù?ا."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3143,8 +3098,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"أعاد تÙ?ر استجابة Ù?Ù?سÙ?Ø© بشÙ?Ù? غÙ?ر Ù?Ù?اسب عÙ?دÙ?ا Ø·Ù?ب Ú¤Ù?داÙ?Ù?ا تارÙ?Ø® استخداÙ? جسرÙ?."
+msgstr "أعاد تÙ?ر استجابة Ù?Ù?سÙ?Ø© بشÙ?Ù? غÙ?ر Ù?Ù?اسب عÙ?دÙ?ا Ø·Ù?ب Ú¤Ù?داÙ?Ù?ا تارÙ?Ø® استخداÙ? جسرÙ?."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3167,6 +3121,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "اÙ?شر عÙ?Ù?اÙ?  اÙ?جسر اÙ?خاص بÙ? تÙ?Ù?ائÙ?ا"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "تÙ?رÙ?ر تدÙ?Ù?ات شبÙ?Ø© تÙ?ر"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "تتابع حرÙ?Ø© اÙ?Ù?رÙ?ر داخÙ? اÙ?شبÙ?Ø© تÙ?ر (غÙ?ر اÙ?خرÙ?ج اÙ?تتابع)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "عÙ?س (mirror) دÙ?Ù?Ù? اÙ?تحÙ?Ù?Ù?ات"
 
@@ -3174,9 +3136,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"عÙ?Ù?اÙ? اÙ?برÙ?د اÙ?Ø°Ù? Ù?Ù?Ù?Ù? اÙ?اتصاÙ? بÙ? عبرÙ? Ù?Ù? حاÙ? Ù?جدت\n"
-"Ù?Ø´Ù?Ù?Ø© Ù?Ù? تحÙ?Ù?Ù?تÙ?. Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضاÙ? تضÙ?Ù?Ù? بصÙ?Ø© PGP Ø£Ù? GPG اÙ?خاصة بÙ?."
+msgstr "عÙ?Ù?اÙ? اÙ?برÙ?د اÙ?Ø°Ù? Ù?Ù?Ù?Ù? اÙ?اتصاÙ? بÙ? عبرÙ? Ù?Ù? حاÙ? Ù?جدت\nÙ?Ø´Ù?Ù?Ø© Ù?Ù? تحÙ?Ù?Ù?تÙ?. Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضاÙ? تضÙ?Ù?Ù? بصÙ?Ø© PGP Ø£Ù? GPG اÙ?خاصة بÙ?."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3186,9 +3146,7 @@ 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 ""
-"Ù?رجÙ? ضبط خدÙ?Ø© اÙ?دÙ?Ù?Ù? Ù?Ù?دخÙ? اÙ?تراضÙ? عÙ?Ù? اÙ?Ø£Ù?Ù? Ù?Ù?Ù? خدÙ?Ø© ترÙ?د Ø­Ù?ظÙ?ا. احذÙ? "
-"اÙ?آخرÙ?Ù?."
+msgstr "Ù?رجÙ? ضبط خدÙ?Ø© اÙ?دÙ?Ù?Ù? Ù?Ù?دخÙ? اÙ?تراضÙ? عÙ?Ù? اÙ?Ø£Ù?Ù? Ù?Ù?Ù? خدÙ?Ø© ترÙ?د Ø­Ù?ظÙ?ا. احذÙ? اÙ?آخرÙ?Ù?."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3283,10 +3241,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"اضغط زر \"ابدأ Tor\" Ù?Ù? Ù?Ù?حة تحÙ?Ù? Vialia Ù?إعادة تشغÙ?Ù? برÙ?اÙ?ج Tor. Ø¥Ù? تÙ? "
-"إغÙ?اÙ? Tor بشÙ?Ù? غÙ?ر Ù?تÙ?Ù?عØ? اÙ?تÙ?Ù? Ø¥Ù?Ù? تبÙ?Ù?ب \"اÙ?Ø®Ù?ارات اÙ?Ù?تÙ?دÙ?Ø©\" Ù?Ù? اÙ?أعÙ?Ù? "
-"Ù?Ù?عرÙ?Ø© تÙ?اصÙ?Ù? عÙ? اÙ?خطأ اÙ?حاصÙ?."
+msgstr "اضغط زر \"ابدأ Tor\" Ù?Ù? Ù?Ù?حة تحÙ?Ù? Vialia Ù?إعادة تشغÙ?Ù? برÙ?اÙ?ج Tor. Ø¥Ù? تÙ? إغÙ?اÙ? Tor بشÙ?Ù? غÙ?ر Ù?تÙ?Ù?عØ? اÙ?تÙ?Ù? Ø¥Ù?Ù? تبÙ?Ù?ب \"اÙ?Ø®Ù?ارات اÙ?Ù?تÙ?دÙ?Ø©\" Ù?Ù? اÙ?أعÙ?Ù? Ù?Ù?عرÙ?Ø© تÙ?اصÙ?Ù? عÙ? اÙ?خطأ اÙ?حاصÙ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3294,10 +3249,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Ø£Ù?ت اÙ?Ø¢Ù? تستخدÙ? اÙ?Ù?سخة \"%1\" Ù?Ù? برÙ?اÙ?ج Tor Ù?Ù?Ù? Ù?سخة Ù?Ù? Ù?عد استخداÙ?Ù?ا "
-"Ù?ستحسÙ?اÙ?. اÙ?رجاء اÙ?تحدÙ?Ø« Ù?آخر Ù?سخة Ù?Ù? اÙ?برÙ?اÙ?ج Ù?Ù?د تÙ?جد Ù?Ù?Ù?ا إصÙ?احات Ø£Ù?Ù?Ù?Ø© "
-"Ù?اÙ?Ø© Ù?إصÙ?احات Ù?ضÙ?اÙ? اÙ?Ù?Ø«Ù?Ù?Ù?Ø© Ù?إصÙ?احات Ù?Ù? اÙ?إداء."
+msgstr "Ø£Ù?ت اÙ?Ø¢Ù? تستخدÙ? اÙ?Ù?سخة \"%1\" Ù?Ù? برÙ?اÙ?ج Tor Ù?Ù?Ù? Ù?سخة Ù?Ù? Ù?عد استخداÙ?Ù?ا Ù?ستحسÙ?اÙ?. اÙ?رجاء اÙ?تحدÙ?Ø« Ù?آخر Ù?سخة Ù?Ù? اÙ?برÙ?اÙ?ج Ù?Ù?د تÙ?جد Ù?Ù?Ù?ا إصÙ?احات Ø£Ù?Ù?Ù?Ø© Ù?اÙ?Ø© Ù?إصÙ?احات Ù?ضÙ?اÙ? اÙ?Ù?Ø«Ù?Ù?Ù?Ø© Ù?إصÙ?احات Ù?Ù? اÙ?إداء."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3305,10 +3257,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Ø£Ù?ت اÙ?Ø¢Ù? عÙ?Ù? إصدار \"%1\" Ù?Ù? اÙ?تÙ?ر, Ù?اÙ?Ø°Ù? Ù?د Ù?ا Ù?عÙ?Ù? Ù?ع اÙ?شبÙ?Ø© اÙ?تÙ?رÙ?Ø© "
-"اÙ?حاÙ?Ù?Ø©. رجاءÙ? Ø·Ù?رÙ? Ø¥Ù?Ù? آخر Ù?سخØ? Ù?اÙ?تÙ? Ù?د تحتÙ?Ù? عÙ?Ù? إصÙ?احات Ù?Ù?Ù?Ø© Ù?Ù? اÙ?Ø£Ù?Ù? "
-"Ù?اÙ?Ù?Ù?ائة."
+msgstr "Ø£Ù?ت اÙ?Ø¢Ù? عÙ?Ù? إصدار \"%1\" Ù?Ù? اÙ?تÙ?ر, Ù?اÙ?Ø°Ù? Ù?د Ù?ا Ù?عÙ?Ù? Ù?ع اÙ?شبÙ?Ø© اÙ?تÙ?رÙ?Ø© اÙ?حاÙ?Ù?Ø©. رجاءÙ? Ø·Ù?رÙ? Ø¥Ù?Ù? آخر Ù?سخØ? Ù?اÙ?تÙ? Ù?د تحتÙ?Ù? عÙ?Ù? إصÙ?احات Ù?Ù?Ù?Ø© Ù?Ù? اÙ?Ø£Ù?Ù? Ù?اÙ?Ù?Ù?ائة."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3322,8 +3271,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Ù?جح اÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر. Ù?Ù?Ù?Ù?Ù? اÙ?Ø¢Ù? ضبط تطبÙ?Ù?اتÙ? Ù?تستخدÙ? اÙ?Ø¥Ù?ترÙ?ت بسرÙ?Ø©."
+msgstr "Ù?جح اÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر. Ù?Ù?Ù?Ù?Ù? اÙ?Ø¢Ù? ضبط تطبÙ?Ù?اتÙ? Ù?تستخدÙ? اÙ?Ø¥Ù?ترÙ?ت بسرÙ?Ø©."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3333,9 +3281,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"أعاÙ? اÙ?برÙ?اÙ?ج Ø®Ù?Ù? داخÙ?Ù?. رجاءÙ? أبÙ?غ Ù?برÙ?جÙ? \"تÙ?ر\" عÙ? اÙ?Ø®Ù?Ù? اÙ?تاÙ?Ù? عÙ?Ù? "
-"bugs.torproject.org: \"%1\""
+msgstr "أعاÙ? اÙ?برÙ?اÙ?ج Ø®Ù?Ù? داخÙ?Ù?. رجاءÙ? أبÙ?غ Ù?برÙ?جÙ? \"تÙ?ر\" عÙ? اÙ?Ø®Ù?Ù? اÙ?تاÙ?Ù? عÙ?Ù? bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3343,10 +3289,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Ù?ظÙ? تÙ?ر Ø£Ù? ساعة حاسبÙ? اÙ?Ø¢Ù?Ù? أخرت %1 ثاÙ?Ù?Ø© عÙ? اÙ?أصÙ? \"%2\". Ù?Ù? Ù?Ù? تÙ?Ù? ساعتÙ? "
-"Ù?ضبÙ?طةØ? Ù?Ù? Ù?ستطÙ?ع تÙ?ر اÙ?عÙ?Ù? بشÙ?Ù? سÙ?Ù?Ù?. رجاءÙ? تأÙ?د Ù?Ù? صحة اÙ?Ù?Ù?ت اÙ?Ø°Ù? Ù?ظÙ?رÙ? "
-"حاسبÙ?."
+msgstr "Ù?ظÙ? تÙ?ر Ø£Ù? ساعة حاسبÙ? اÙ?Ø¢Ù?Ù? أخرت %1 ثاÙ?Ù?Ø© عÙ? اÙ?أصÙ? \"%2\". Ù?Ù? Ù?Ù? تÙ?Ù? ساعتÙ? Ù?ضبÙ?طةØ? Ù?Ù? Ù?ستطÙ?ع تÙ?ر اÙ?عÙ?Ù? بشÙ?Ù? سÙ?Ù?Ù?. رجاءÙ? تأÙ?د Ù?Ù? صحة اÙ?Ù?Ù?ت اÙ?Ø°Ù? Ù?ظÙ?رÙ? حاسبÙ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3354,10 +3297,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Ù?ظÙ? تÙ?ر Ø£Ù? ساعة حاسبÙ? اÙ?Ø¢Ù?Ù? Ù?دÙ?ت %1 ثاÙ?Ù?Ø© عÙ? اÙ?أصÙ? \"%2\". Ù?Ù? Ù?Ù? تÙ?Ù? ساعتÙ? "
-"Ù?ضبÙ?طةØ? Ù?Ù? Ù?ستطÙ?ع تÙ?ر اÙ?عÙ?Ù? بشÙ?Ù? سÙ?Ù?Ù?. رجاءÙ? تأÙ?د Ù?Ù? صحة اÙ?Ù?Ù?ت اÙ?Ø°Ù? Ù?ظÙ?رÙ? "
-"حاسبÙ?."
+msgstr "Ù?ظÙ? تÙ?ر Ø£Ù? ساعة حاسبÙ? اÙ?Ø¢Ù?Ù? Ù?دÙ?ت %1 ثاÙ?Ù?Ø© عÙ? اÙ?أصÙ? \"%2\". Ù?Ù? Ù?Ù? تÙ?Ù? ساعتÙ? Ù?ضبÙ?طةØ? Ù?Ù? Ù?ستطÙ?ع تÙ?ر اÙ?عÙ?Ù? بشÙ?Ù? سÙ?Ù?Ù?. رجاءÙ? تأÙ?د Ù?Ù? صحة اÙ?Ù?Ù?ت اÙ?Ø°Ù? Ù?ظÙ?رÙ? حاسبÙ?."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3369,19 +3309,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"أظÙ? Ø£Ù? أحد اÙ?براÙ?ج اÙ?تÙ? عÙ?Ù? حاسبÙ? حاÙ?Ù? Ø£Ù? Ù?تصÙ? بÙ?ا تشÙ?Ù?ر Ù?Ù? اÙ?Ù?حطة %1. إرساÙ?"
-" Ù?عÙ?Ù?Ù?ات غÙ?ر Ù?Ø´Ù?رة Ù?Ù? Ø®Ù?اÙ? اÙ?شبÙ?Ø© اÙ?تÙ?رÙ?Ø© خطر Ù?Ù?ا Ù?Ù?صح بÙ?. Ù?أجÙ? Ø­Ù?اÙ?تÙ?Ø? أغÙ?Ù?"
-" تÙ?ر اÙ?إتصاÙ? ذاتÙ?ا."
+msgstr "أظÙ? Ø£Ù? أحد اÙ?براÙ?ج اÙ?تÙ? عÙ?Ù? حاسبÙ? حاÙ?Ù? Ø£Ù? Ù?تصÙ? بÙ?ا تشÙ?Ù?ر Ù?Ù? اÙ?Ù?حطة %1. إرساÙ? Ù?عÙ?Ù?Ù?ات غÙ?ر Ù?Ø´Ù?رة Ù?Ù? Ø®Ù?اÙ? اÙ?شبÙ?Ø© اÙ?تÙ?رÙ?Ø© خطر Ù?Ù?ا Ù?Ù?صح بÙ?. Ù?أجÙ? Ø­Ù?اÙ?تÙ?Ø? أغÙ?Ù? تÙ?ر اÙ?إتصاÙ? ذاتÙ?ا."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"أظÙ? Ø£Ù? أحد اÙ?براÙ?ج اÙ?تÙ? عÙ?Ù? حاسبÙ? حاÙ?Ù? Ø£Ù? Ù?تصÙ? بÙ?ا تشÙ?Ù?ر Ù?Ù? اÙ?Ù?حطة %1. إرساÙ?"
-" Ù?عÙ?Ù?Ù?ات غÙ?ر Ù?Ø´Ù?رة Ù?Ù? Ø®Ù?اÙ? اÙ?شبÙ?Ø© اÙ?تÙ?رÙ?Ø© خطر Ù?Ù?ا Ù?Ù?صح بÙ?."
+msgstr "أظÙ? Ø£Ù? أحد اÙ?براÙ?ج اÙ?تÙ? عÙ?Ù? حاسبÙ? حاÙ?Ù? Ø£Ù? Ù?تصÙ? بÙ?ا تشÙ?Ù?ر Ù?Ù? اÙ?Ù?حطة %1. إرساÙ? Ù?عÙ?Ù?Ù?ات غÙ?ر Ù?Ø´Ù?رة Ù?Ù? Ø®Ù?اÙ? اÙ?شبÙ?Ø© اÙ?تÙ?رÙ?Ø© خطر Ù?Ù?ا Ù?Ù?صح بÙ?."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3393,10 +3328,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-" أحد براÙ?جÙ? اتصÙ? بÙ?%1 Ù?Ù? Ø®Ù?اÙ? تÙ?ر باستخداÙ? برÙ?تÙ?Ù?Ù?Ù? Ù?د Ù?سرب بعض اÙ?Ù?عÙ?Ù?Ù?ات عÙ?"
-" اتجاÙ?Ù?. رجاءÙ? تأÙ?د Ù?Ù? ترتÙ?ب براÙ?جÙ? Ù?استخداÙ? اÙ?Ù?Socks4a Ø£Ù? اÙ?Socks5Ù? Ù?ا غÙ?ر "
-"حسÙ? اÙ?اتصاÙ? بÙ?ستضÙ?Ù?Ù? غÙ?ر Ù?Ø­Ù?Ù?Ù?."
+msgstr " أحد براÙ?جÙ? اتصÙ? بÙ?%1 Ù?Ù? Ø®Ù?اÙ? تÙ?ر باستخداÙ? برÙ?تÙ?Ù?Ù?Ù? Ù?د Ù?سرب بعض اÙ?Ù?عÙ?Ù?Ù?ات عÙ? اتجاÙ?Ù?. رجاءÙ? تأÙ?د Ù?Ù? ترتÙ?ب براÙ?جÙ? Ù?استخداÙ? اÙ?Ù?Socks4a Ø£Ù? اÙ?Socks5Ù? Ù?ا غÙ?ر حسÙ? اÙ?اتصاÙ? بÙ?ستضÙ?Ù?Ù? غÙ?ر Ù?Ø­Ù?Ù?Ù?."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3407,9 +3339,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-" حاÙ?Ù? أحد براÙ?جÙ? Ø£Ù? Ù?تصÙ? ببرÙ?ترÙ?Ù?Ù? Ù?ا Ù?Ù?Ù?Ù?Ù? تÙ?ر. رجاءÙ? تأÙ?د Ù?Ù? ترتÙ?ب براÙ?جÙ? "
-"Ù?استخداÙ? اÙ?Ù?Socks4a Ø£Ù? اÙ?Socks5Ù? Ù?ا غÙ?ر حسÙ? اÙ?اتصاÙ? بÙ?ستضÙ?Ù?Ù? غÙ?ر Ù?Ø­Ù?Ù?Ù?."
+msgstr " حاÙ?Ù? أحد براÙ?جÙ? Ø£Ù? Ù?تصÙ? ببرÙ?ترÙ?Ù?Ù? Ù?ا Ù?Ù?Ù?Ù?Ù? تÙ?ر. رجاءÙ? تأÙ?د Ù?Ù? ترتÙ?ب براÙ?جÙ? Ù?استخداÙ? اÙ?Ù?Socks4a Ø£Ù? اÙ?Socks5Ù? Ù?ا غÙ?ر حسÙ? اÙ?اتصاÙ? بÙ?ستضÙ?Ù?Ù? غÙ?ر Ù?Ø­Ù?Ù?Ù?."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3420,9 +3350,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"حاÙ?Ù? أحد براÙ?جÙ? Ø£Ù? Ù?تصÙ? بÙ?%1Ø? Ù?اÙ?Ø°Ù? Ù?ا Ù?عتبرÙ? تÙ?ر Ù?ستضÙ?Ù? Ù?Ù?Ù?Ù?. رجاءÙ? تحÙ?Ù? Ù?Ù?"
-" إعداد برÙ?اÙ?جÙ?."
+msgstr "حاÙ?Ù? أحد براÙ?جÙ? Ø£Ù? Ù?تصÙ? بÙ?%1Ø? Ù?اÙ?Ø°Ù? Ù?ا Ù?عتبرÙ? تÙ?ر Ù?ستضÙ?Ù? Ù?Ù?Ù?Ù?. رجاءÙ? تحÙ?Ù? Ù?Ù? إعداد برÙ?اÙ?جÙ?."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3433,9 +3361,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"حدد تÙ?ر Ø£Ù? عÙ?Ù?اÙ? اÙ?Ø¢Ù? بÙ? اÙ?خاص بÙ?رحÙ?Ù? Ù?Ù? %1%2. Ù?Ù? Ù?Ù? Ù?Ù?Ù? Ù?ذا صحÙ?حاØ? رجاءÙ? "
-"Ù?Ù?ر Ù?Ù? تغÙ?Ù?ر Ø®Ù?ار اÙ?Ù?\"عÙ?Ù?اÙ?\" عÙ?Ù?  Ù?رحÙ?Ù?."
+msgstr "حدد تÙ?ر Ø£Ù? عÙ?Ù?اÙ? اÙ?Ø¢Ù? بÙ? اÙ?خاص بÙ?رحÙ?Ù? Ù?Ù? %1%2. Ù?Ù? Ù?Ù? Ù?Ù?Ù? Ù?ذا صحÙ?حاØ? رجاءÙ? Ù?Ù?ر Ù?Ù? تغÙ?Ù?ر Ø®Ù?ار اÙ?Ù?\"عÙ?Ù?اÙ?\" عÙ?Ù?  Ù?رحÙ?Ù?."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3446,20 +3372,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"اÙ?تÙ?Ù? تÙ?ر Ø£Ù? Ù?Ù?دÙ? اÙ?دÙ? Ø¥Ù? إس اÙ?خاص بÙ? Ù?Ù?دÙ? إجابات Ù?اذبة Ù?Ù?Ù?Ù?اÙ?ع غÙ?ر "
-"اÙ?Ù?Ù?جÙ?دة. بعض Ù?Ù?دÙ?Ù? خدÙ?Ø© اÙ?Ø¥Ù?ترÙ?ت Ù? Ù?Ù?دÙ?Ù? اÙ?دÙ? Ø¥Ù? إس اÙ?آخرÙ?Ù?Ø? Ù?Ø«Ù?ا (Ø£Ù?بÙ? دÙ? "
-"Ø¥Ù? إس)Ø? Ù?Ø´Ù?Ù?رÙ?Ù? بÙ?عÙ? Ù?ذا Ù?Ù?Ù? Ù?عرضÙ?ا صÙ?حات اÙ?إعÙ?اÙ? Ø£Ù? اÙ?بحث اÙ?خاضة بÙ?Ù?. "
+msgstr "اÙ?تÙ?Ù? تÙ?ر Ø£Ù? Ù?Ù?دÙ? اÙ?دÙ? Ø¥Ù? إس اÙ?خاص بÙ? Ù?Ù?دÙ? إجابات Ù?اذبة Ù?Ù?Ù?Ù?اÙ?ع غÙ?ر اÙ?Ù?Ù?جÙ?دة. بعض Ù?Ù?دÙ?Ù? خدÙ?Ø© اÙ?Ø¥Ù?ترÙ?ت Ù? Ù?Ù?دÙ?Ù? اÙ?دÙ? Ø¥Ù? إس اÙ?آخرÙ?Ù?Ø? Ù?Ø«Ù?ا (Ø£Ù?بÙ? دÙ? Ø¥Ù? إس)Ø? Ù?Ø´Ù?Ù?رÙ?Ù? بÙ?عÙ? Ù?ذا Ù?Ù?Ù? Ù?عرضÙ?ا صÙ?حات اÙ?إعÙ?اÙ? Ø£Ù? اÙ?بحث اÙ?خاضة بÙ?Ù?. "
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-" اÙ?تشÙ? تÙ?ر Ø£Ù? Ù?Ù?دÙ? خدÙ?Ø© اÙ?دÙ? Ø¥Ù? إس اÙ?خاص بÙ? Ù?Ù?دÙ? إجابات Ù?اذبة Ù?Ù?Ù?اÙ?ع Ù?Ø´Ù?Ù?رة."
-" بÙ?ا Ø£Ù? اÙ?عÙ?Ù?اء تعتÙ?د عÙ?Ù? Ù?راحÙ? شبÙ?Ø© تÙ?ر Ù?أجÙ? اÙ?حصÙ?Ù? عÙ?Ù? إجابات دÙ? Ø¥Ù? إس "
-"دÙ?Ù?Ù?Ø©Ø? Ù?Ù? Ù?تÙ? استعÙ?اÙ? Ù?رحÙ?Ù? Ù?Ù?خرج. "
+msgstr " اÙ?تشÙ? تÙ?ر Ø£Ù? Ù?Ù?دÙ? خدÙ?Ø© اÙ?دÙ? Ø¥Ù? إس اÙ?خاص بÙ? Ù?Ù?دÙ? إجابات Ù?اذبة Ù?Ù?Ù?اÙ?ع Ù?Ø´Ù?Ù?رة. بÙ?ا Ø£Ù? اÙ?عÙ?Ù?اء تعتÙ?د عÙ?Ù? Ù?راحÙ? شبÙ?Ø© تÙ?ر Ù?أجÙ? اÙ?حصÙ?Ù? عÙ?Ù? إجابات دÙ? Ø¥Ù? إس دÙ?Ù?Ù?Ø©Ø? Ù?Ù? Ù?تÙ? استعÙ?اÙ? Ù?رحÙ?Ù? Ù?Ù?خرج. "
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3470,9 +3390,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Ù?حاÙ?Ù? تÙ?ر Ø£Ù? Ù?حدد إذا Ù?اÙ? Ù?Ù? اÙ?Ù?Ù?Ù?Ù? اÙ?اتصاÙ? بخادÙ?Ù? اÙ?Ù?رحÙ? Ù?Ù? Ù?بÙ? شبÙ?Ø© تÙ?ر "
-"باستخداÙ? اÙ?اتصاÙ? بÙ?Ù?سÙ? عÙ?Ù? %1:%2. Ù?Ù?Ù?Ù? Ø£Ù? Ù?أخد Ù?ذا اÙ?اختبار Ø£Ù?ثر Ù?Ù? دÙ?Ù?Ù?Ø©. "
+msgstr "Ù?حاÙ?Ù? تÙ?ر Ø£Ù? Ù?حدد إذا Ù?اÙ? Ù?Ù? اÙ?Ù?Ù?Ù?Ù? اÙ?اتصاÙ? بخادÙ?Ù? اÙ?Ù?رحÙ? Ù?Ù? Ù?بÙ? شبÙ?Ø© تÙ?ر باستخداÙ? اÙ?اتصاÙ? بÙ?Ù?سÙ? عÙ?Ù? %1:%2. Ù?Ù?Ù?Ù? Ø£Ù? Ù?أخد Ù?ذا اÙ?اختبار Ø£Ù?ثر Ù?Ù? دÙ?Ù?Ù?Ø©. "
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3492,11 +3410,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Ù?Ù?Ù?Ø° اÙ?Ù?خدÙ? اÙ?خاص بÙ? Ù?Ù?ترحÙ?Ù? غÙ?ر Ù?ابÙ?Ø© Ù?Ù?Ù?صÙ?Ù? Ù?Ù? Ù?بÙ? عÙ?Ù?اء آخرÙ?Ù? . Ù?Ù?Ù?Ù? Ø£Ù? "
-"Ù?حدث Ù?ذا إذا Ù?Ù?ت Ø®Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? Ø£Ù? جدار اÙ?Ø­Ù?اÙ?Ø© اÙ?Ø°Ù? Ù?تطÙ?ب Ù?Ù?Ù? Ø¥Ù?شاء Ù?Ù?Ù?اء"
-" اÙ?شحÙ?.إذا Ù?اÙ?%1:%2 Ù?Ù?ست عÙ?Ù?اÙ? اÙ?Ø¥Ù?ترÙ?ت اÙ?خاص بÙ? Ù?اÙ?دÙ?Ù?Ù? اÙ?Ù?Ù?Ù?Ø° اÙ?صحÙ?Ø­Ø? "
-"اÙ?رجاء اÙ?تحÙ?Ù? Ù?Ù? تÙ?Ù?Ù?Ù? اÙ?Ù?بدÙ?ات Ù?دÙ?Ù?."
+msgstr "Ù?Ù?Ù?Ø° اÙ?Ù?خدÙ? اÙ?خاص بÙ? Ù?Ù?ترحÙ?Ù? غÙ?ر Ù?ابÙ?Ø© Ù?Ù?Ù?صÙ?Ù? Ù?Ù? Ù?بÙ? عÙ?Ù?اء آخرÙ?Ù? . Ù?Ù?Ù?Ù? Ø£Ù? Ù?حدث Ù?ذا إذا Ù?Ù?ت Ø®Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? Ø£Ù? جدار اÙ?Ø­Ù?اÙ?Ø© اÙ?Ø°Ù? Ù?تطÙ?ب Ù?Ù?Ù? Ø¥Ù?شاء Ù?Ù?Ù?اء اÙ?شحÙ?.إذا Ù?اÙ?%1:%2 Ù?Ù?ست عÙ?Ù?اÙ? اÙ?Ø¥Ù?ترÙ?ت اÙ?خاص بÙ? Ù?اÙ?دÙ?Ù?Ù? اÙ?Ù?Ù?Ù?Ø° اÙ?صحÙ?Ø­Ø? اÙ?رجاء اÙ?تحÙ?Ù? Ù?Ù? تÙ?Ù?Ù?Ù? اÙ?Ù?بدÙ?ات Ù?دÙ?Ù?."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3507,9 +3421,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"تÙ?ر Ù?حاÙ?Ù? تحدÙ?د Ù?ا إذا Ù?اÙ? Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù? اÙ?خاص بÙ? اÙ?Ù?بدÙ? Ù?ابÙ? Ù?Ù?Ù?صÙ?Ù? Ù?Ù? شبÙ?Ø© "
-"تÙ?ر باÙ?اتصاÙ? بحد ذاتÙ? Ù?Ù?%1:%2. Ù?ذا اÙ?اختبار Ù?Ù?Ù?Ù? Ø£Ù? Ù?ستغرÙ? عدة دÙ?ائÙ?."
+msgstr "تÙ?ر Ù?حاÙ?Ù? تحدÙ?د Ù?ا إذا Ù?اÙ? Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù? اÙ?خاص بÙ? اÙ?Ù?بدÙ? Ù?ابÙ? Ù?Ù?Ù?صÙ?Ù? Ù?Ù? شبÙ?Ø© تÙ?ر باÙ?اتصاÙ? بحد ذاتÙ? Ù?Ù?%1:%2. Ù?ذا اÙ?اختبار Ù?Ù?Ù?Ù? Ø£Ù? Ù?ستغرÙ? عدة دÙ?ائÙ?."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3529,11 +3441,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù? اÙ?خاص بÙ? Ù?Ù?تبÙ?Ù? غÙ?ر Ù?ابÙ? Ù?Ù?Ù?صÙ?Ù? بعÙ?Ù?اء آخرÙ?Ù? . Ù?Ù?Ù?Ù? Ø£Ù? Ù?حدث Ù?ذا "
-"إذا Ù?Ù?ت Ø®Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? Ø£Ù? جدار اÙ?Ø­Ù?اÙ?Ø© اÙ?Ø°Ù? Ù?تطÙ?ب Ù?Ù?Ù? Ø¥Ù?شا Ù?Ù?Ù?Ø° Ù?رجع .إذا "
-"Ù?اÙ?%1:%2 Ù?Ù?ستعÙ?Ù?اÙ? اÙ?Ø¥Ù?ترÙ?ت اÙ?خاص بÙ? Ù?اÙ?دÙ?Ù?Ù? اÙ?Ù?Ù?Ù?Ø° اÙ?صحÙ?Ø­Ø? اÙ?رجاء اÙ?تحÙ?Ù? Ù?Ù?"
-" تÙ?Ù?Ù?Ù? اÙ?Ù?بدÙ?ات Ù?دÙ?Ù?."
+msgstr "Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù? اÙ?خاص بÙ? Ù?Ù?تبÙ?Ù? غÙ?ر Ù?ابÙ? Ù?Ù?Ù?صÙ?Ù? بعÙ?Ù?اء آخرÙ?Ù? . Ù?Ù?Ù?Ù? Ø£Ù? Ù?حدث Ù?ذا إذا Ù?Ù?ت Ø®Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? Ø£Ù? جدار اÙ?Ø­Ù?اÙ?Ø© اÙ?Ø°Ù? Ù?تطÙ?ب Ù?Ù?Ù? Ø¥Ù?شا Ù?Ù?Ù?Ø° Ù?رجع .إذا Ù?اÙ?%1:%2 Ù?Ù?ستعÙ?Ù?اÙ? اÙ?Ø¥Ù?ترÙ?ت اÙ?خاص بÙ? Ù?اÙ?دÙ?Ù?Ù? اÙ?Ù?Ù?Ù?Ø° اÙ?صحÙ?Ø­Ø? اÙ?رجاء اÙ?تحÙ?Ù? Ù?Ù? تÙ?Ù?Ù?Ù? اÙ?Ù?بدÙ?ات Ù?دÙ?Ù?."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3543,9 +3451,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Ù?شخص اÙ?Ù?بدÙ? اÙ?خاص بÙ?Ø? اÙ?Ø°Ù? Ù?Ù?Ù?Ù? اÙ?عÙ?Ù?اء Ù?Ù? اÙ?اتصاÙ? باÙ?Ù?بدÙ?  اÙ?خاص بÙ? Ø? رÙ?ضÙ? "
-"Ù?Ù?Ù?Ù? اÙ?دÙ?Ù?Ù? Ù?Ù?%1:%2. Ù?اÙ?سبب:%3"
+msgstr "Ù?شخص اÙ?Ù?بدÙ? اÙ?خاص بÙ?Ø? اÙ?Ø°Ù? Ù?Ù?Ù?Ù? اÙ?عÙ?Ù?اء Ù?Ù? اÙ?اتصاÙ? باÙ?Ù?بدÙ?  اÙ?خاص بÙ? Ø? رÙ?ضÙ? Ù?Ù?Ù?Ù? اÙ?دÙ?Ù?Ù? Ù?Ù?%1:%2. Ù?اÙ?سبب:%3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3557,11 +3463,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"اÙ?Ù?بدÙ? اÙ?خاص بÙ? اÙ?Ø¢Ù? عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت Ù?Ù?تاح Ù?عÙ?Ù?اء تÙ?ر Ù?Ù?ستخدÙ?Ù?Ù?. Ù?جب Ø£Ù? تشاÙ?د "
-"زÙ?ادة Ù?Ù? حرÙ?Ø© Ù?رÙ?ر شبÙ?Ø© اÙ?اتصاÙ? اÙ?تÙ? أبدتÙ? Bandwidth Graph  Ù?Ù? غضÙ?Ù? ساعات "
-"Ù?Ù?Ù?Ù?Ø© Ù?Ù?ا عÙ?Ù? اÙ?Ù?زÙ?د Ù?Ù? اÙ?عÙ?Ù?اء عÙ? اÙ?Ù?بدÙ? اÙ?خاص بÙ?. Ø´Ù?را Ù?Ù? عÙ?Ù? اÙ?Ù?ساÙ?Ù?Ø© Ù?Ù? "
-"شبÙ?Ø© تÙ?ر!"
+msgstr "اÙ?Ù?بدÙ? اÙ?خاص بÙ? اÙ?Ø¢Ù? عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت Ù?Ù?تاح Ù?عÙ?Ù?اء تÙ?ر Ù?Ù?ستخدÙ?Ù?Ù?. Ù?جب Ø£Ù? تشاÙ?د زÙ?ادة Ù?Ù? حرÙ?Ø© Ù?رÙ?ر شبÙ?Ø© اÙ?اتصاÙ? اÙ?تÙ? أبدتÙ? Bandwidth Graph  Ù?Ù? غضÙ?Ù? ساعات Ù?Ù?Ù?Ù?Ø© Ù?Ù?ا عÙ?Ù? اÙ?Ù?زÙ?د Ù?Ù? اÙ?عÙ?Ù?اء عÙ? اÙ?Ù?بدÙ? اÙ?خاص بÙ?. Ø´Ù?را Ù?Ù? عÙ?Ù? اÙ?Ù?ساÙ?Ù?Ø© Ù?Ù? شبÙ?Ø© تÙ?ر!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3623,9 +3525,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"احÙ?ظ اÙ?إعدادات. Ø¥Ù? Ù?Ù? Ù?Ù?Ù? Ù?ذا اÙ?Ø®Ù?ار Ù?Ù?عÙ?Ù?Ù?اØ? ستطبÙ? اÙ?إعدادات عÙ?Ù? تÙ?ر Ù?Ø°Ù? "
-"اÙ?Ù?رة Ù?Ù?Ø·."
+msgstr "احÙ?ظ اÙ?إعدادات. Ø¥Ù? Ù?Ù? Ù?Ù?Ù? Ù?ذا اÙ?Ø®Ù?ار Ù?Ù?عÙ?Ù?Ù?اØ? ستطبÙ? اÙ?إعدادات عÙ?Ù? تÙ?ر Ù?Ø°Ù? اÙ?Ù?رة Ù?Ù?Ø·."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3739,17 +3639,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? Ù?جÙ?د تحدÙ?ثات Ù?Ù?برÙ?اÙ?ج Ù?Ø£Ù?Ù? Ù?Ù? Ù?تÙ?Ù?Ù? Ù?Ù? Ø¥Ù?جاد "
-"'%1'."
+msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? Ù?جÙ?د تحدÙ?ثات Ù?Ù?برÙ?اÙ?ج Ù?Ø£Ù?Ù? Ù?Ù? Ù?تÙ?Ù?Ù? Ù?Ù? Ø¥Ù?جاد '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? Ù?جÙ?د تحدÙ?ثات Ù?Ù?برÙ?اÙ?ج Ù?Ø£Ù? عÙ?Ù?Ù?Ø© تحدÙ?Ø« تÙ?ر "
-"أغÙ?Ù?ت بشÙ?Ù? غÙ?ر Ù?تÙ?Ù?ع."
+msgstr "Ù?Ù? Ù?تÙ?Ù?Ù? Ú¤Ù?داÙ?Ù?ا Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? Ù?جÙ?د تحدÙ?ثات Ù?Ù?برÙ?اÙ?ج Ù?Ø£Ù? عÙ?Ù?Ù?Ø© تحدÙ?Ø« تÙ?ر أغÙ?Ù?ت بشÙ?Ù? غÙ?ر Ù?تÙ?Ù?ع."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3924,10 +3820,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"إحتÙ?اÙ? Ù?جÙ?د Ù?سخة أخرÙ? Ù?Ù? Ú¤Ù?داÙ?Ù?ا تعÙ?Ù? Ù?سبÙ?اÙ?. إذا Ù?اÙ? Ù?عÙ?اÙ? Ù?اتÙ?جد Ù?سخة أخرÙ? تعÙ?Ù?Ø? Ù?Ù?Ù?Ù? إختÙ?ار اÙ?Ù?تابعة عÙ?Ù? Ø£Ù? حاÙ?.\n"
-"\n"
-"Ù?Ù? ترÙ?د Ù?Ù?اصÙ?Ø© بدء Ú¤Ù?داÙ?Ù?اØ?"
+msgstr "إحتÙ?اÙ? Ù?جÙ?د Ù?سخة أخرÙ? Ù?Ù? Ú¤Ù?داÙ?Ù?ا تعÙ?Ù? Ù?سبÙ?اÙ?. إذا Ù?اÙ? Ù?عÙ?اÙ? Ù?اتÙ?جد Ù?سخة أخرÙ? تعÙ?Ù?Ø? Ù?Ù?Ù?Ù? إختÙ?ار اÙ?Ù?تابعة عÙ?Ù? Ø£Ù? حاÙ?.\n\nÙ?Ù? ترÙ?د Ù?Ù?اصÙ?Ø© بدء Ú¤Ù?داÙ?Ù?اØ?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3960,5 +3853,3 @@ msgstr "%1 ساعات"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 دÙ?ائÙ?"
-
-
diff --git a/src/vidalia/i18n/po/arn/qt_arn.po b/src/vidalia/i18n/po/arn/qt_arn.po
index a92ebb7..6370310 100644
--- a/src/vidalia/i18n/po/arn/qt_arn.po
+++ b/src/vidalia/i18n/po/arn/qt_arn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/arn/vidalia_arn.po b/src/vidalia/i18n/po/arn/vidalia_arn.po
index 49acc44..f9a6900 100644
--- a/src/vidalia/i18n/po/arn/vidalia_arn.po
+++ b/src/vidalia/i18n/po/arn/vidalia_arn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ast/qt_ast.po b/src/vidalia/i18n/po/ast/qt_ast.po
index a5d7b07..09651ed 100644
--- a/src/vidalia/i18n/po/ast/qt_ast.po
+++ b/src/vidalia/i18n/po/ast/qt_ast.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ast/vidalia_ast.po b/src/vidalia/i18n/po/ast/vidalia_ast.po
index 1ce565f..9499eec 100644
--- a/src/vidalia/i18n/po/ast/vidalia_ast.po
+++ b/src/vidalia/i18n/po/ast/vidalia_ast.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/az/qt_az.po b/src/vidalia/i18n/po/az/qt_az.po
index 919fbbd..4ad26a2 100644
--- a/src/vidalia/i18n/po/az/qt_az.po
+++ b/src/vidalia/i18n/po/az/qt_az.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/az/vidalia_az.po b/src/vidalia/i18n/po/az/vidalia_az.po
index 7f2db5c..3f3d016 100644
--- a/src/vidalia/i18n/po/az/vidalia_az.po
+++ b/src/vidalia/i18n/po/az/vidalia_az.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/be/qt_be.po b/src/vidalia/i18n/po/be/qt_be.po
index 5df13a3..77153ab 100644
--- a/src/vidalia/i18n/po/be/qt_be.po
+++ b/src/vidalia/i18n/po/be/qt_be.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/be/vidalia_be.po b/src/vidalia/i18n/po/be/vidalia_be.po
index 22b0f4e..bc08489 100644
--- a/src/vidalia/i18n/po/be/vidalia_be.po
+++ b/src/vidalia/i18n/po/be/vidalia_be.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bg/qt_bg.po b/src/vidalia/i18n/po/bg/qt_bg.po
index e87f075..2590852 100644
--- a/src/vidalia/i18n/po/bg/qt_bg.po
+++ b/src/vidalia/i18n/po/bg/qt_bg.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bg/vidalia_bg.po b/src/vidalia/i18n/po/bg/vidalia_bg.po
index ffcd9b8..28d1b0a 100644
--- a/src/vidalia/i18n/po/bg/vidalia_bg.po
+++ b/src/vidalia/i18n/po/bg/vidalia_bg.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-12-28 16:26+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: raymen <svilen79@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -44,9 +44,7 @@ msgstr "'%1' не е валиден IP адÑ?еÑ?."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Ð?ие избÑ?аÑ?Ñ?е Ñ?доÑ?Ñ?овеÑ?Ñ?ване Ñ?Ñ?ез \"Ð?аÑ?ола\", но не Ñ?Ñ?е Ñ?поменали изÑ?иÑ?но "
-"нÑ?каква паÑ?ола."
+msgstr "Ð?ие избÑ?аÑ?Ñ?е Ñ?доÑ?Ñ?овеÑ?Ñ?ване Ñ?Ñ?ез \"Ð?аÑ?ола\", но не Ñ?Ñ?е Ñ?поменали изÑ?иÑ?но нÑ?каква паÑ?ола."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -138,8 +136,7 @@ msgstr "СÑ?Ñ?Ñ?анеÑ?е данни за ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а в Ñ?лед
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Ð?збеÑ?еÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?а, използвана за Ñ?Ñ?Ñ?Ñ?анение на данни за ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а. "
+msgstr "Ð?збеÑ?еÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?а, използвана за Ñ?Ñ?Ñ?Ñ?анение на данни за ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а. "
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -163,8 +160,7 @@ msgstr "Ð?каÑ?ай наÑ?Ñ?оÑ?Ñ?иÑ?е конÑ?игÑ?Ñ?аÑ?ионни дан
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-"Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ñ?ова Ñ?е Ñ?едакÑ?иÑ?а заÑ?едениÑ? в моменÑ?а конÑ?игÑ?Ñ?аÑ?ионен torrc Ñ?айл"
+msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ñ?ова Ñ?е Ñ?едакÑ?иÑ?а заÑ?едениÑ? в моменÑ?а конÑ?игÑ?Ñ?аÑ?ионен torrc Ñ?айл"
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
@@ -174,19 +170,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"УпоменаÑ?оÑ?о мÑ?Ñ?Ñ?о на ТоÑ? конÑ?игÑ?Ñ?аÑ?ионниÑ? Ñ?айл Ñ?Ñ?дÑ?Ñ?жа Ñ?имволи, коиÑ?о не "
-"могаÑ? да бÑ?даÑ? пÑ?едÑ?Ñ?авени в моменÑ?а, Ñ?Ñ?ез 8-биÑ?овоÑ?о Ñ?имволно Ñ?азкодиÑ?ане "
-"на Ñ?иÑ?Ñ?емаÑ?а Ð?и."
+msgstr "УпоменаÑ?оÑ?о мÑ?Ñ?Ñ?о на ТоÑ? конÑ?игÑ?Ñ?аÑ?ионниÑ? Ñ?айл Ñ?Ñ?дÑ?Ñ?жа Ñ?имволи, коиÑ?о не могаÑ? да бÑ?даÑ? пÑ?едÑ?Ñ?авени в моменÑ?а, Ñ?Ñ?ез 8-биÑ?овоÑ?о Ñ?имволно Ñ?азкодиÑ?ане на Ñ?иÑ?Ñ?емаÑ?а Ð?и."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"УпоменаÑ?оÑ?о мÑ?Ñ?Ñ?о на ТоÑ? диÑ?екÑ?оÑ?иÑ?Ñ?а за данни Ñ?Ñ?дÑ?Ñ?жа Ñ?имволи, коиÑ?о не "
-"могаÑ? да бÑ?даÑ? пÑ?едÑ?Ñ?авени в моменÑ?а, Ñ?Ñ?ез 8-биÑ?овоÑ?о Ñ?имволно Ñ?азкодиÑ?ане "
-"на Ñ?иÑ?Ñ?емаÑ?а Ð?и. "
+msgstr "УпоменаÑ?оÑ?о мÑ?Ñ?Ñ?о на ТоÑ? диÑ?екÑ?оÑ?иÑ?Ñ?а за данни Ñ?Ñ?дÑ?Ñ?жа Ñ?имволи, коиÑ?о не могаÑ? да бÑ?даÑ? пÑ?едÑ?Ñ?авени в моменÑ?а, Ñ?Ñ?ез 8-биÑ?овоÑ?о Ñ?имволно Ñ?азкодиÑ?ане на Ñ?иÑ?Ñ?емаÑ?а Ð?и. "
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -194,9 +184,7 @@ msgstr "Ð?нимание"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-"Ð?ие пÑ?омениÑ?Ñ?е пÑ?Ñ?Ñ? на конÑ?игÑ?Ñ?аÑ?ионниÑ? torrc Ñ?айл, желаеÑ?е ли да "
-"Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аÑ?е ТоÑ??"
+msgstr "Ð?ие пÑ?омениÑ?Ñ?е пÑ?Ñ?Ñ? на конÑ?игÑ?Ñ?аÑ?ионниÑ? torrc Ñ?айл, желаеÑ?е ли да Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аÑ?е ТоÑ??"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
@@ -212,13 +200,17 @@ 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"
-"Ще Ð?и Ñ?е наложи да ги пÑ?емаÑ?неÑ?е Ñ?амоÑ?Ñ?оÑ?Ñ?елно."
+msgstr "Ð?идалиÑ? не можа да пÑ?емаÑ?не ТоÑ? Ñ?Ñ?лÑ?гиÑ?е.\n\nЩе Ð?и Ñ?е наложи да ги пÑ?емаÑ?неÑ?е Ñ?амоÑ?Ñ?оÑ?Ñ?елно."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -240,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Ð?идалиÑ? не Ñ?Ñ?пÑ? да заÑ?еди избÑ?аниÑ?Ñ? езиков пакеÑ?."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ð?Ñ?:"
@@ -334,8 +343,7 @@ msgstr "# Ð?лиенÑ?и"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"Ð?лиенÑ?и оÑ? Ñ?ледниÑ?е Ñ?Ñ?Ñ?ани Ñ?а Ñ?е вÑ?зползвали оÑ? Ñ?воеÑ?о пÑ?епÑ?едаване оÑ? %1"
+msgstr "Ð?лиенÑ?и оÑ? Ñ?ледниÑ?е Ñ?Ñ?Ñ?ани Ñ?а Ñ?е вÑ?зползвали оÑ? Ñ?воеÑ?о пÑ?епÑ?едаване оÑ? %1"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -461,9 +469,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Ð?идалиÑ? Ñ?е Ñ?вÑ?Ñ?за Ñ? акÑ?ивен ТоÑ? пÑ?оÑ?еÑ? койÑ?о изиÑ?ква паÑ?ола.\n"
-"Ð?олÑ?, вÑ?ведеÑ?е Ð?аÑ?аÑ?а конÑ?Ñ?олна паÑ?ола:"
+msgstr "Ð?идалиÑ? Ñ?е Ñ?вÑ?Ñ?за Ñ? акÑ?ивен ТоÑ? пÑ?оÑ?еÑ? койÑ?о изиÑ?ква паÑ?ола.\nÐ?олÑ?, вÑ?ведеÑ?е Ð?аÑ?аÑ?а конÑ?Ñ?олна паÑ?ола:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1301,9 +1307,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Ð?Ñ?маÑ?е вÑ?зможноÑ?Ñ? да Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аме Ð?идалиÑ? авÑ?омаÑ?иÑ?но. Ð?олÑ?, Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?айÑ?е "
-"Ð?идалиÑ? Ñ?амоÑ?Ñ?оÑ?Ñ?елно."
+msgstr "Ð?Ñ?маÑ?е вÑ?зможноÑ?Ñ? да Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аме Ð?идалиÑ? авÑ?омаÑ?иÑ?но. Ð?олÑ?, Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?айÑ?е Ð?идалиÑ? Ñ?амоÑ?Ñ?оÑ?Ñ?елно."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1313,29 +1317,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"СÑ?здаден бе доклад за пÑ?еÑ?Ñ?Ñ?пÑ?но поÑ?ажение, койÑ?о може да изпÑ?аÑ?иÑ?е на "
-"Ñ?азвойÑ?иÑ?иÑ?е на Ð?идалиÑ?, за да им помогнеÑ?е да иденÑ?иÑ?иÑ?иÑ?аÑ? и попÑ?авÑ?Ñ? "
-"пÑ?облема. Ð?Ñ?иложениÑ?Ñ? доклад не Ñ?Ñ?дÑ?Ñ?жа никаква Ð?аÑ?а пеÑ?Ñ?онална "
-"иденÑ?иÑ?иÑ?иÑ?аÑ?а инÑ?оÑ?маÑ?иÑ?. "
+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 ""
-"Ñ? опиÑ?ание на какво Ñ?Ñ?е пÑ?авили пÑ?еди пÑ?огÑ?амаÑ?а да пÑ?еÑ?Ñ?Ñ?пи поÑ?ажение, "
-"заедно Ñ?Ñ?Ñ? Ñ?ледниÑ?е Ñ?айлове, Ñ?Ñ?оÑ?веÑ?Ñ?Ñ?вÑ?ваÑ?и на  доклада за пÑ?еÑ?Ñ?Ñ?пÑ?но "
-"поÑ?ажение:"
+msgstr "Ñ? опиÑ?ание на какво Ñ?Ñ?е пÑ?авили пÑ?еди пÑ?огÑ?амаÑ?а да пÑ?еÑ?Ñ?Ñ?пи поÑ?ажение, заедно Ñ?Ñ?Ñ? Ñ?ледниÑ?е Ñ?айлове, Ñ?Ñ?оÑ?веÑ?Ñ?Ñ?вÑ?ваÑ?и на  доклада за пÑ?еÑ?Ñ?Ñ?пÑ?но поÑ?ажение:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1554,10 +1549,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Ð?идалиÑ? може да оÑ?воÑ?и избÑ?анаÑ?а вÑ?Ñ?зка в бÑ?аÑ?зÑ?Ñ?а Ð?и по подÑ?азбиÑ?ане. Ð?ко "
-"бÑ?аÑ?зÑ?Ñ?а Ð?и не е конÑ?игÑ?Ñ?иÑ?ан в моменÑ?а да използва ТоÑ?, Ñ?о Ñ?огава заÑ?вкаÑ?а "
-"нÑ?ма да бÑ?де анонимна."
+msgstr "Ð?идалиÑ? може да оÑ?воÑ?и избÑ?анаÑ?а вÑ?Ñ?зка в бÑ?аÑ?зÑ?Ñ?а Ð?и по подÑ?азбиÑ?ане. Ð?ко бÑ?аÑ?зÑ?Ñ?а Ð?и не е конÑ?игÑ?Ñ?иÑ?ан в моменÑ?а да използва ТоÑ?, Ñ?о Ñ?огава заÑ?вкаÑ?а нÑ?ма да бÑ?де анонимна."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1571,9 +1563,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Ð?идалиÑ? не можа да оÑ?воÑ?и избÑ?анаÑ?а вÑ?Ñ?зка вÑ?в Ð?аÑ?иÑ?Ñ? Ñ?еб бÑ?аÑ?зÑ?Ñ?. Ð?ие "
-"можеÑ?е вÑ?е пак да копиÑ?аÑ?е URL адÑ?еÑ?а и да го поÑ?Ñ?авиÑ?е вÑ?в Ð?аÑ?иÑ? бÑ?аÑ?зÑ?Ñ?."
+msgstr "Ð?идалиÑ? не можа да оÑ?воÑ?и избÑ?анаÑ?а вÑ?Ñ?зка вÑ?в Ð?аÑ?иÑ?Ñ? Ñ?еб бÑ?аÑ?зÑ?Ñ?. Ð?ие можеÑ?е вÑ?е пак да копиÑ?аÑ?е URL адÑ?еÑ?а и да го поÑ?Ñ?авиÑ?е вÑ?в Ð?аÑ?иÑ? бÑ?аÑ?зÑ?Ñ?."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1784,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "СвÑ?Ñ?зан Ñ? ТоÑ? мÑ?ежаÑ?а!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ð?еÑ?азпознаÑ? наÑ?ален Ñ?Ñ?аÑ?Ñ?Ñ?"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "Ñ?азноÑ?оден"
 
@@ -1855,9 +1841,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Ð?идалиа не Ñ?Ñ?пÑ? да Ñ?Ñ?аÑ?Ñ?иÑ?а ТоÑ?. Ð?Ñ?овеÑ?еÑ?е опÑ?ииÑ?е Ñ?и за да пÑ?овеÑ?иÑ?е дали е"
-" зададено пÑ?авилно меÑ?Ñ?оположениеÑ?о на ТоÑ?."
+msgstr "Ð?идалиа не Ñ?Ñ?пÑ? да Ñ?Ñ?аÑ?Ñ?иÑ?а ТоÑ?. Ð?Ñ?овеÑ?еÑ?е опÑ?ииÑ?е Ñ?и за да пÑ?овеÑ?иÑ?е дали е зададено пÑ?авилно меÑ?Ñ?оположениеÑ?о на ТоÑ?."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1895,14 +1879,11 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?Ñ?Ñ? изиÑ?ква Ð?идалиÑ? да изпÑ?аÑ?и Ñ?Ñ?дÑ?Ñ?жаниеÑ?о на биÑ?квиÑ?каÑ?а за "
-"авÑ?енÑ?иÑ?ноÑ?Ñ?, но Ð?идалиÑ? не можа да оÑ?кÑ?ие Ñ?акава."
+msgstr "ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?Ñ?Ñ? изиÑ?ква Ð?идалиÑ? да изпÑ?аÑ?и Ñ?Ñ?дÑ?Ñ?жаниеÑ?о на биÑ?квиÑ?каÑ?а за авÑ?енÑ?иÑ?ноÑ?Ñ?, но Ð?идалиÑ? не можа да оÑ?кÑ?ие Ñ?акава."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"Ð?иÑ?Ñ?е ли желали да поÑ?Ñ?Ñ?Ñ?иÑ?е Ñ?амоÑ?Ñ?оÑ?Ñ?елно Ñ?айла  'control_auth_cookie' ?"
+msgstr "Ð?иÑ?Ñ?е ли желали да поÑ?Ñ?Ñ?Ñ?иÑ?е Ñ?амоÑ?Ñ?оÑ?Ñ?елно Ñ?айла  'control_auth_cookie' ?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
@@ -1920,9 +1901,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Ð?идалиÑ? не можа да Ñ?егиÑ?Ñ?Ñ?иÑ?а за нÑ?кои Ñ?Ñ?биÑ?иÑ?. Ð?ного оÑ? опÑ?ийÑ?е на Ð?идалиÑ? "
-"може да не Ñ?а доÑ?Ñ?Ñ?пни."
+msgstr "Ð?идалиÑ? не можа да Ñ?егиÑ?Ñ?Ñ?иÑ?а за нÑ?кои Ñ?Ñ?биÑ?иÑ?. Ð?ного оÑ? опÑ?ийÑ?е на Ð?идалиÑ? може да не Ñ?а доÑ?Ñ?Ñ?пни."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1930,9 +1909,7 @@ msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?овеÑ?ка на авÑ?енÑ?иÑ?ноÑ?Ñ?Ñ?а"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Ð?идалиÑ? Ñ?е пÑ?овали пÑ?и опиÑ?а да пÑ?овеÑ?и авÑ?енÑ?иÑ?ноÑ?Ñ?Ñ?а кÑ?м ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а. "
-"(%1)"
+msgstr "Ð?идалиÑ? Ñ?е пÑ?овали пÑ?и опиÑ?а да пÑ?овеÑ?и авÑ?енÑ?иÑ?ноÑ?Ñ?Ñ?а кÑ?м ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
@@ -1946,9 +1923,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Ð?онаÑ?Ñ?оÑ?Ñ?ем инÑ?Ñ?алиÑ?анаÑ?а ТоÑ? веÑ?Ñ?иÑ? не е акÑ?Ñ?ална или не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва. "
-"Ð?олÑ?, поÑ?еÑ?еÑ?е Ñ?Ñ?Ñ?аниÑ?аÑ?а на ТоÑ? за да Ñ?валиÑ?е най-поÑ?леднаÑ?а веÑ?Ñ?иÑ?."
+msgstr "Ð?онаÑ?Ñ?оÑ?Ñ?ем инÑ?Ñ?алиÑ?анаÑ?а ТоÑ? веÑ?Ñ?иÑ? не е акÑ?Ñ?ална или не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва. Ð?олÑ?, поÑ?еÑ?еÑ?е Ñ?Ñ?Ñ?аниÑ?аÑ?а на ТоÑ? за да Ñ?валиÑ?е най-поÑ?леднаÑ?а веÑ?Ñ?иÑ?."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2053,24 +2028,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Ð?идалиÑ? опиÑ?а да нÑ?лиÑ?а конÑ?Ñ?олнаÑ?а паÑ?ола на ТоÑ?, но не Ñ?Ñ?пÑ? да Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?а "
-"ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а. Ð?олÑ?, пÑ?овеÑ?еÑ?е в Ð?иÑ?пеÑ?еÑ? на задаÑ?иÑ?е за да Ñ?е подÑ?игÑ?Ñ?иÑ?е, "
-"Ñ?е нÑ?ма дÑ?Ñ?ги акÑ?ивни ТоÑ? пÑ?оÑ?еÑ?и. "
+msgstr "Ð?идалиÑ? опиÑ?а да нÑ?лиÑ?а конÑ?Ñ?олнаÑ?а паÑ?ола на ТоÑ?, но не Ñ?Ñ?пÑ? да Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?а ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а. Ð?олÑ?, пÑ?овеÑ?еÑ?е в Ð?иÑ?пеÑ?еÑ? на задаÑ?иÑ?е за да Ñ?е подÑ?игÑ?Ñ?иÑ?е, Ñ?е нÑ?ма дÑ?Ñ?ги акÑ?ивни ТоÑ? пÑ?оÑ?еÑ?и. "
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Ð?онаÑ?Ñ?оÑ?Ñ?ем инÑ?Ñ?алиÑ?анаÑ?а веÑ?Ñ?иÑ? на ТоÑ? е оÑ?Ñ?аÑ?Ñ?ла или не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва "
-"повеÑ?е."
+msgstr "Ð?онаÑ?Ñ?оÑ?Ñ?ем инÑ?Ñ?алиÑ?анаÑ?а веÑ?Ñ?иÑ? на ТоÑ? е оÑ?Ñ?аÑ?Ñ?ла или не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва повеÑ?е."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Ð?иÑ?Ñ?е ли желали да пÑ?овеÑ?иÑ?е за налиÑ?ие на по-нов инÑ?Ñ?алаÑ?ионен пакеÑ??"
+msgstr "Ð?иÑ?Ñ?е ли желали да пÑ?овеÑ?иÑ?е за налиÑ?ие на по-нов инÑ?Ñ?алаÑ?ионен пакеÑ??"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2080,9 +2049,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"ТоÑ? авÑ?омаÑ?иÑ?но заÑ?воÑ?и вÑ?Ñ?зкаÑ?а, Ñ? оглед на Ñ?ова да пÑ?едпази Ð?аÑ?аÑ?а "
-"анонимноÑ?Ñ?."
+msgstr "ТоÑ? авÑ?омаÑ?иÑ?но заÑ?воÑ?и вÑ?Ñ?зкаÑ?а, Ñ? оглед на Ñ?ова да пÑ?едпази Ð?аÑ?аÑ?а анонимноÑ?Ñ?."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2096,9 +2063,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Ð?а Ñ?ози моменÑ? нÑ?ма нови Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?ни пакеÑ?и оÑ? ТоÑ? за инÑ?Ñ?алиÑ?ане на "
-"компÑ?Ñ?Ñ?Ñ?а Ð?и."
+msgstr "Ð?а Ñ?ози моменÑ? нÑ?ма нови Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?ни пакеÑ?и оÑ? ТоÑ? за инÑ?Ñ?алиÑ?ане на компÑ?Ñ?Ñ?Ñ?а Ð?и."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2117,10 +2082,25 @@ 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."
-msgstr ""
-"Ð?аквоÑ?о и да е изпÑ?аÑ?ено по Ñ?ази вÑ?Ñ?зка може да бÑ?де Ñ?ледено. Ð?олÑ?, пÑ?овеÑ?и "
-"наÑ?Ñ?Ñ?ойкиÑ?е на пÑ?огÑ?амаÑ?а и ползвай ако е вÑ?зможно Ñ?амо кÑ?ипÑ?иÑ?ани "
-"пÑ?оÑ?околи, каÑ?о SSH."
+msgstr "Ð?аквоÑ?о и да е изпÑ?аÑ?ено по Ñ?ази вÑ?Ñ?зка може да бÑ?де Ñ?ледено. Ð?олÑ?, пÑ?овеÑ?и наÑ?Ñ?Ñ?ойкиÑ?е на пÑ?огÑ?амаÑ?а и ползвай ако е вÑ?зможно Ñ?амо кÑ?ипÑ?иÑ?ани пÑ?оÑ?околи, каÑ?о SSH."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Ð?аÑ?ално Ñ?Ñ?аÑ?Ñ?иÑ?ане на torrc оÑ? %1 до %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(веÑ?оÑ?Ñ?но ТелнеÑ?)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(веÑ?оÑ?Ñ?но Ð?-мейл поÑ?Ñ?ебиÑ?ел)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Ð?дно оÑ? ваÑ?иÑ?е пÑ?иложениÑ? %1 изглежда извÑ?Ñ?Ñ?ва поÑ?енÑ?иално некÑ?ипÑ?иÑ?ани и неÑ?игÑ?Ñ?ни вÑ?Ñ?зки Ñ? поÑ?Ñ? %2"
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2130,49 +2110,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Ð?Ñ?епÑ?едаванеÑ?о Ð?и Ñ?е изклÑ?Ñ?ва.\n"
-"Ð?аÑ?иÑ?неÑ?е 'СÑ?оп' оÑ?ново за да Ñ?пÑ?еÑ?е пÑ?епÑ?едаванеÑ?о Ñ?ега."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ð?аÑ?ално Ñ?Ñ?аÑ?Ñ?иÑ?ане на torrc оÑ? %1 до %2"
+msgstr "Ð?Ñ?епÑ?едаванеÑ?о Ð?и Ñ?е изклÑ?Ñ?ва.\nÐ?аÑ?иÑ?неÑ?е 'СÑ?оп' оÑ?ново за да Ñ?пÑ?еÑ?е пÑ?епÑ?едаванеÑ?о Ñ?ега."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ""
-"Ð?Ñ?епÑ?едаванеÑ?о е акÑ?ивно. Ð?Ñ?екÑ?Ñ?ванеÑ?о на пÑ?епÑ?едаванеÑ?о Ñ?е пÑ?еÑ?еÑ?е оÑ?воÑ?ениÑ?е вÑ?Ñ?зки оÑ? клиенÑ?и.\n"
-"\n"
-"Ð?иÑ?Ñ?е ли желали да Ñ?е изклÑ?Ñ?иÑ?е елеганÑ?но, каÑ?о им дадеÑ?е вÑ?еме да намеÑ?Ñ?Ñ? ново пÑ?епÑ?едаване?"
 
 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 ""
-"Ð?идалиÑ? заÑ?еÑ?е, Ñ?е ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а излезе неоÑ?аквано.\n"
-"\n"
-"Ð?олÑ?, пÑ?овеÑ?еÑ?е Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данниÑ?е за Ñ?коÑ?оÑ?ни пÑ?едÑ?пÑ?едиÑ?елни Ñ?Ñ?обÑ?ениÑ? или Ñ?Ñ?обÑ?ениÑ? за гÑ?еÑ?ки."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(веÑ?оÑ?Ñ?но ТелнеÑ?)"
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(веÑ?оÑ?Ñ?но Ð?-мейл поÑ?Ñ?ебиÑ?ел)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Ð?Ñ?епÑ?едаванеÑ?о е акÑ?ивно. Ð?Ñ?екÑ?Ñ?ванеÑ?о на пÑ?епÑ?едаванеÑ?о Ñ?е пÑ?еÑ?еÑ?е оÑ?воÑ?ениÑ?е вÑ?Ñ?зки оÑ? клиенÑ?и.\n\nÐ?иÑ?Ñ?е ли желали да Ñ?е изклÑ?Ñ?иÑ?е елеганÑ?но, каÑ?о им дадеÑ?е вÑ?еме да намеÑ?Ñ?Ñ? ново пÑ?епÑ?едаване?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Ð?дно оÑ? ваÑ?иÑ?е пÑ?иложениÑ? %1 изглежда извÑ?Ñ?Ñ?ва поÑ?енÑ?иално некÑ?ипÑ?иÑ?ани и "
-"неÑ?игÑ?Ñ?ни вÑ?Ñ?зки Ñ? поÑ?Ñ? %2"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Ð?идалиÑ? заÑ?еÑ?е, Ñ?е ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а излезе неоÑ?аквано.\n\nÐ?олÑ?, пÑ?овеÑ?еÑ?е Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данниÑ?е за Ñ?коÑ?оÑ?ни пÑ?едÑ?пÑ?едиÑ?елни Ñ?Ñ?обÑ?ениÑ? или Ñ?Ñ?обÑ?ениÑ? за гÑ?еÑ?ки."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2196,9 +2163,7 @@ msgstr "Ð?еобÑ?одимо е имеÑ?о на Ñ?айла за Ñ?Ñ?обÑ?ени
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"ТÑ?Ñ?бва да вÑ?ведеÑ?е име на Ñ?айла за да може да Ñ?Ñ?Ñ?Ñ?аниÑ?е Ñ?Ñ?обÑ?ениÑ? Ñ? данни "
-"вÑ?в Ñ?айл."
+msgstr "ТÑ?Ñ?бва да вÑ?ведеÑ?е име на Ñ?айла за да може да Ñ?Ñ?Ñ?Ñ?аниÑ?е Ñ?Ñ?обÑ?ениÑ? Ñ? данни вÑ?в Ñ?айл."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2410,8 +2375,7 @@ msgstr "Ð?Ñ?Ñ?оÑ?иÑ? на Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данни"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr ""
-"Ð?Ñ?ой Ñ?Ñ?обÑ?ениÑ?, коиÑ?о да бÑ?даÑ? показани в пÑ?озоÑ?еÑ?а Ñ?Ñ?Ñ?  Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данни"
+msgstr "Ð?Ñ?ой Ñ?Ñ?обÑ?ениÑ?, коиÑ?о да бÑ?даÑ? показани в пÑ?озоÑ?еÑ?а Ñ?Ñ?Ñ?  Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данни"
 
 msgctxt "MessageLog"
 msgid "messages"
@@ -2423,9 +2387,7 @@ msgstr "РазлиÑ?Ñ?ване"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Ð?кÑ?ивиÑ?ай авÑ?омаÑ?иÑ?но Ñ?Ñ?Ñ?Ñ?анÑ?ване на вÑ?иÑ?ки нови Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данни вÑ?в "
-"Ñ?айл"
+msgstr "Ð?кÑ?ивиÑ?ай авÑ?омаÑ?иÑ?но Ñ?Ñ?Ñ?Ñ?анÑ?ване на вÑ?иÑ?ки нови Ñ?Ñ?обÑ?ениÑ?Ñ?а Ñ? данни вÑ?в Ñ?айл"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2451,17 +2413,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"СÑ?обÑ?ениÑ?, поÑ?вÑ?ваÑ?и Ñ?е когаÑ?о неÑ?о \n"
-"много Ñ?е обÑ?Ñ?ка и ТоÑ? не може да пÑ?одÑ?лжи."
+msgstr "СÑ?обÑ?ениÑ?, поÑ?вÑ?ваÑ?и Ñ?е когаÑ?о неÑ?о \nмного Ñ?е обÑ?Ñ?ка и ТоÑ? не може да пÑ?одÑ?лжи."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"СÑ?обÑ?ениÑ?, поÑ?вÑ?ваÑ?и Ñ?е когаÑ?о неÑ?о \n"
-"много Ñ?е обÑ?Ñ?ка Ñ? ТоÑ?."
+msgstr "СÑ?обÑ?ениÑ?, поÑ?вÑ?ваÑ?и Ñ?е когаÑ?о неÑ?о \nмного Ñ?е обÑ?Ñ?ка Ñ? ТоÑ?."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2469,36 +2427,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"СÑ?обÑ?ениÑ? поÑ?вÑ?ваÑ?и Ñ?е Ñ?Ñ?дко\n"
-"по вÑ?еме на ноÑ?малнаÑ?а Ñ?абоÑ?а на ТоÑ? и \n"
-"не Ñ?а Ñ?Ñ?иÑ?ани за гÑ?еÑ?ки, но може да Ñ?е пÑ?овеÑ?Ñ?Ñ?."
+msgstr "СÑ?обÑ?ениÑ? поÑ?вÑ?ваÑ?и Ñ?е Ñ?Ñ?дко\nпо вÑ?еме на ноÑ?малнаÑ?а Ñ?абоÑ?а на ТоÑ? и \nне Ñ?а Ñ?Ñ?иÑ?ани за гÑ?еÑ?ки, но може да Ñ?е пÑ?овеÑ?Ñ?Ñ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"СÑ?обÑ?ениÑ? поÑ?вÑ?ваÑ?и Ñ?е Ñ?еÑ?Ñ?о\n"
-"по вÑ?еме на ноÑ?малнаÑ?а Ñ?абоÑ?а на ТоÑ?."
+msgstr "СÑ?обÑ?ениÑ? поÑ?вÑ?ваÑ?и Ñ?е Ñ?еÑ?Ñ?о\nпо вÑ?еме на ноÑ?малнаÑ?а Ñ?абоÑ?а на ТоÑ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Ð?ногоÑ?ловни Ñ?Ñ?обÑ?ениÑ?, пÑ?еди вÑ?иÑ?ко оÑ?\n"
-"инÑ?еÑ?еÑ? за ТоÑ? Ñ?азÑ?абоÑ?Ñ?иÑ?иÑ?е."
+msgstr "Ð?ногоÑ?ловни Ñ?Ñ?обÑ?ениÑ?, пÑ?еди вÑ?иÑ?ко оÑ?\nинÑ?еÑ?еÑ? за ТоÑ? Ñ?азÑ?абоÑ?Ñ?иÑ?иÑ?е."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Ð?е може да запиÑ?е Ñ?айл %1\n"
-"\n"
-"%2."
+msgstr "Ð?е може да запиÑ?е Ñ?айл %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2605,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ð?едейÑ?Ñ?виÑ?елен моÑ?Ñ?"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Ð?пÑ?еделениÑ? моÑ?Ñ?ов иденÑ?иÑ?икаÑ?оÑ? е недейÑ?Ñ?виÑ?елен."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Ð?опиÑ?ай (Ctrl+C)"
 
@@ -2620,17 +2560,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"ТÑ?Ñ?бва да опÑ?еделиÑ?е IP адÑ?еÑ? или Ñ?оÑ?Ñ? име и номеÑ? на поÑ?Ñ?а, за да наÑ?Ñ?Ñ?оиÑ?е"
-" ТоÑ? да използва пÑ?окÑ?и доÑ?Ñ?Ñ?п до инÑ?еÑ?неÑ?."
+msgstr "ТÑ?Ñ?бва да опÑ?еделиÑ?е IP адÑ?еÑ? или Ñ?оÑ?Ñ? име и номеÑ? на поÑ?Ñ?а, за да наÑ?Ñ?Ñ?оиÑ?е ТоÑ? да използва пÑ?окÑ?и доÑ?Ñ?Ñ?п до инÑ?еÑ?неÑ?."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"ТÑ?Ñ?бва да опÑ?еделиÑ?е един или повеÑ?е поÑ?Ñ?ове, до коиÑ?о заÑ?иÑ?наÑ?а Ð?и Ñ?Ñ?ена "
-"позволÑ?ва да Ñ?е Ñ?вÑ?Ñ?жеÑ?е."
+msgstr "ТÑ?Ñ?бва да опÑ?еделиÑ?е един или повеÑ?е поÑ?Ñ?ове, до коиÑ?о заÑ?иÑ?наÑ?а Ð?и Ñ?Ñ?ена позволÑ?ва да Ñ?е Ñ?вÑ?Ñ?жеÑ?е."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2662,9 +2598,7 @@ msgstr "Ð?оÑ?Ñ?:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Ð?збеÑ?и Ñ?амо за да Ñ?е Ñ?вÑ?Ñ?же Ñ? пÑ?епÑ?аÑ?аниÑ? използваÑ?и позволени поÑ?Ñ?ове оÑ? "
-"заÑ?иÑ?наÑ?а Ñ?Ñ?ена"
+msgstr "Ð?збеÑ?и Ñ?амо за да Ñ?е Ñ?вÑ?Ñ?же Ñ? пÑ?епÑ?аÑ?аниÑ? използваÑ?и позволени поÑ?Ñ?ове оÑ? заÑ?иÑ?наÑ?а Ñ?Ñ?ена"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2686,9 +2620,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Ð?збеÑ?и за да кÑ?ипÑ?иÑ?а заÑ?вки за доÑ?Ñ?Ñ?п до диÑ?екÑ?оÑ?иÑ?Ñ?а и по избоÑ? използвай "
-"моÑ?Ñ?ово пÑ?епÑ?аÑ?ане за доÑ?Ñ?Ñ?п до ТоÑ? мÑ?ежаÑ?а"
+msgstr "Ð?збеÑ?и за да кÑ?ипÑ?иÑ?а заÑ?вки за доÑ?Ñ?Ñ?п до диÑ?екÑ?оÑ?иÑ?Ñ?а и по избоÑ? използвай моÑ?Ñ?ово пÑ?епÑ?аÑ?ане за доÑ?Ñ?Ñ?п до ТоÑ? мÑ?ежаÑ?а"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2726,14 +2658,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ð? моменÑ?а нÑ?ма нови моÑ?Ñ?ове на Ñ?азположение. Ð?ожеÑ?е или да изÑ?акаÑ?е за малко"
-" и да опиÑ?аÑ?е оÑ?ново или да опиÑ?аÑ?е дÑ?Ñ?г меÑ?од за намиÑ?ане на нови моÑ?Ñ?ове."
+msgstr "Ð? моменÑ?а нÑ?ма нови моÑ?Ñ?ове на Ñ?азположение. Ð?ожеÑ?е или да изÑ?акаÑ?е за малко и да опиÑ?аÑ?е оÑ?ново или да опиÑ?аÑ?е дÑ?Ñ?г меÑ?од за намиÑ?ане на нови моÑ?Ñ?ове."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Ð?аÑ?иÑ?неÑ?е Ð?омоÑ? за да видиÑ?е дÑ?Ñ?ги меÑ?оди за намиÑ?ане на нови моÑ?Ñ?ове."
+msgstr "Ð?аÑ?иÑ?неÑ?е Ð?омоÑ? за да видиÑ?е дÑ?Ñ?ги меÑ?оди за намиÑ?ане на нови моÑ?Ñ?ове."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2756,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "пÑ?иеми"
@@ -2919,17 +2848,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Ð?ие наÑ?Ñ?Ñ?оиÑ?Ñ?е ТоÑ? да дейÑ?Ñ?ва каÑ?о моÑ?Ñ?ов пÑ?епÑ?аÑ?аÑ?, но ТоÑ? веÑ?Ñ?иÑ?Ñ?а Ð?и не "
-"подÑ?Ñ?жа моÑ?Ñ?ове."
+msgstr "Ð?ие наÑ?Ñ?Ñ?оиÑ?Ñ?е ТоÑ? да дейÑ?Ñ?ва каÑ?о моÑ?Ñ?ов пÑ?епÑ?аÑ?аÑ?, но ТоÑ? веÑ?Ñ?иÑ?Ñ?а Ð?и не подÑ?Ñ?жа моÑ?Ñ?ове."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Ð?олÑ?, обновеÑ?е Ð?аÑ?иÑ? ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ? или наÑ?Ñ?Ñ?ойÑ?е ТоÑ? да дейÑ?Ñ?ва каÑ?о ноÑ?мален"
-" ТоÑ? пÑ?епÑ?аÑ?аÑ?."
+msgstr "Ð?олÑ?, обновеÑ?е Ð?аÑ?иÑ? ТоÑ? Ñ?оÑ?Ñ?Ñ?еÑ?Ñ? или наÑ?Ñ?Ñ?ойÑ?е ТоÑ? да дейÑ?Ñ?ва каÑ?о ноÑ?мален ТоÑ? пÑ?епÑ?аÑ?аÑ?."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2944,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Ð?ейÑ?Ñ?вай Ñ?амо каÑ?о поÑ?Ñ?ебиÑ?ел"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Ð?Ñ?едавай Ñ?Ñ?аÑ?ик за ТоÑ? мÑ?ежаÑ?а"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Ð?оÑ?Ñ? за пÑ?епÑ?аÑ?ане"
 
@@ -2985,9 +2906,7 @@ msgstr "Ð?ме на пÑ?епÑ?аÑ?анеÑ?о"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Ð?оÑ?Ñ?ове на коиÑ?о поÑ?Ñ?ебиÑ?ели и дÑ?Ñ?ги пÑ?епÑ?аÑ?аниÑ? могаÑ? да оÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ? диалог "
-"Ñ?Ñ?Ñ? Ñ?воеÑ?о пÑ?епÑ?аÑ?ане"
+msgstr "Ð?оÑ?Ñ?ове на коиÑ?о поÑ?Ñ?ебиÑ?ели и дÑ?Ñ?ги пÑ?епÑ?аÑ?аниÑ? могаÑ? да оÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ? диалог Ñ?Ñ?Ñ? Ñ?воеÑ?о пÑ?епÑ?аÑ?ане"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -3001,9 +2920,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Ð?а инÑ?еÑ?неÑ? вÑ?Ñ?зки Ñ? бÑ?Ñ?за Ñ?коÑ?оÑ?Ñ? на Ñ?валÑ?не, но бавно каÑ?ване, молÑ? "
-"впиÑ?еÑ?е Ñ?Ñ?к Ñ?коÑ?оÑ?Ñ?Ñ?а Ñ?и на каÑ?ване."
+msgstr "Ð?а инÑ?еÑ?неÑ? вÑ?Ñ?зки Ñ? бÑ?Ñ?за Ñ?коÑ?оÑ?Ñ? на Ñ?валÑ?не, но бавно каÑ?ване, молÑ? впиÑ?еÑ?е Ñ?Ñ?к Ñ?коÑ?оÑ?Ñ?Ñ?а Ñ?и на каÑ?ване."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3061,10 +2978,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Ð?аÑ?аÑ?а макÑ?имална Ñ?Ñ?епен на пÑ?опÑ?Ñ?каÑ?елна Ñ?поÑ?обноÑ?Ñ? Ñ?Ñ?Ñ?бва да е по-голÑ?ма "
-"или Ñ?авна на Ñ?Ñ?еднаÑ?а пÑ?опÑ?Ñ?каÑ?елна Ñ?поÑ?обноÑ?Ñ?. Ð?веÑ?е Ñ?Ñ?ойноÑ?Ñ?и Ñ?Ñ?Ñ?бва да Ñ?а"
-" поне 20 KB/s."
+msgstr "Ð?аÑ?аÑ?а макÑ?имална Ñ?Ñ?епен на пÑ?опÑ?Ñ?каÑ?елна Ñ?поÑ?обноÑ?Ñ? Ñ?Ñ?Ñ?бва да е по-голÑ?ма или Ñ?авна на Ñ?Ñ?еднаÑ?а пÑ?опÑ?Ñ?каÑ?елна Ñ?поÑ?обноÑ?Ñ?. Ð?веÑ?е Ñ?Ñ?ойноÑ?Ñ?и Ñ?Ñ?Ñ?бва да Ñ?а поне 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3125,17 +3039,13 @@ msgstr "Ð?окажи помÑ? за изÑ?одни полиÑ?ики"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Ð?о какви инÑ?еÑ?неÑ? Ñ?еÑ?Ñ?Ñ?Ñ?и могаÑ? поÑ?Ñ?ебиÑ?елиÑ?е да имаÑ? доÑ?Ñ?Ñ?п пÑ?ез Ð?аÑ?еÑ?о "
-"пÑ?епÑ?аÑ?ане?"
+msgstr "Ð?о какви инÑ?еÑ?неÑ? Ñ?еÑ?Ñ?Ñ?Ñ?и могаÑ? поÑ?Ñ?ебиÑ?елиÑ?е да имаÑ? доÑ?Ñ?Ñ?п пÑ?ез Ð?аÑ?еÑ?о пÑ?епÑ?аÑ?ане?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"ТоÑ? вÑ?пÑ?еки вÑ?иÑ?ко Ñ?е блокиÑ?а нÑ?кои изÑ?одÑ?Ñ?и пиÑ?ма и пÑ?огÑ?ами за Ñ?поделÑ?не "
-"на Ñ?айлове по подÑ?азбиÑ?ане, за да намали Ñ?пам или дÑ?Ñ?га злоÑ?поÑ?Ñ?еба."
+msgstr "ТоÑ? вÑ?пÑ?еки вÑ?иÑ?ко Ñ?е блокиÑ?а нÑ?кои изÑ?одÑ?Ñ?и пиÑ?ма и пÑ?огÑ?ами за Ñ?поделÑ?не на Ñ?айлове по подÑ?азбиÑ?ане, за да намали Ñ?пам или дÑ?Ñ?га злоÑ?поÑ?Ñ?еба."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3148,9 +3058,7 @@ msgstr "Ð?озволи на дÑ?Ñ?ги доÑ?Ñ?Ñ?п до Ñ?воÑ? моÑ?Ñ? да
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Това е иденÑ?иÑ?ноÑ?Ñ?Ñ?а на Ñ?воÑ? пÑ?епÑ?едаваÑ? моÑ?Ñ?, койÑ?о може да дадеÑ?е на дÑ?Ñ?ги"
-" Ñ?оÑ?а"
+msgstr "Това е иденÑ?иÑ?ноÑ?Ñ?Ñ?а на Ñ?воÑ? пÑ?епÑ?едаваÑ? моÑ?Ñ?, койÑ?о може да дадеÑ?е на дÑ?Ñ?ги Ñ?оÑ?а"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3168,9 +3076,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Ð?е Ñ?пиÑ?ай Ñ?воеÑ?о пÑ?епÑ?едаване за да може поÑ?Ñ?ебиÑ?елиÑ?е да имаÑ? по-голÑ?м Ñ?анÑ?"
-" да го намеÑ?Ñ?Ñ? и използваÑ?."
+msgstr "Ð?е Ñ?пиÑ?ай Ñ?воеÑ?о пÑ?епÑ?едаване за да може поÑ?Ñ?ебиÑ?елиÑ?е да имаÑ? по-голÑ?м Ñ?анÑ? да го намеÑ?Ñ?Ñ? и използваÑ?."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3184,9 +3090,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"ТоÑ? вÑ?Ñ?на непÑ?авилно Ñ?оÑ?маÑ?иÑ?ан оÑ?говоÑ?, Ñ?лед каÑ?о Ð?идалиÑ? изиÑ?ка иÑ?Ñ?оÑ?иÑ?Ñ?а "
-"на Ñ?поÑ?Ñ?ебаÑ?а на моÑ?Ñ?а."
+msgstr "ТоÑ? вÑ?Ñ?на непÑ?авилно Ñ?оÑ?маÑ?иÑ?ан оÑ?говоÑ?, Ñ?лед каÑ?о Ð?идалиÑ? изиÑ?ка иÑ?Ñ?оÑ?иÑ?Ñ?а на Ñ?поÑ?Ñ?ебаÑ?а на моÑ?Ñ?а."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3209,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Ð?вÑ?омаÑ?иÑ?но Ñ?азпÑ?еделÑ?не на моÑ?Ñ? моÑ?Ñ?ов адÑ?еÑ?"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Ð?Ñ?Ñ?ажение на пÑ?епÑ?аÑ?аÑ?аÑ?а диÑ?екÑ?оÑ?иÑ?"
 
@@ -3216,9 +3128,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Ð?-мейл адÑ?еÑ? на койÑ?о може да бÑ?деÑ? доÑ?Ñ?игнаÑ? ако има пÑ?облем Ñ? Ñ?воеÑ?о "
-"пÑ?епÑ?аÑ?ане. Ð?ожеÑ? Ñ?Ñ?Ñ?о Ñ?ака да вклÑ?Ñ?иÑ?  Ñ?воÑ? PGP или GPG оÑ?пеÑ?аÑ?Ñ?к."
+msgstr "Ð?-мейл адÑ?еÑ? на койÑ?о може да бÑ?деÑ? доÑ?Ñ?игнаÑ? ако има пÑ?облем Ñ? Ñ?воеÑ?о пÑ?епÑ?аÑ?ане. Ð?ожеÑ? Ñ?Ñ?Ñ?о Ñ?ака да вклÑ?Ñ?иÑ?  Ñ?воÑ? PGP или GPG оÑ?пеÑ?аÑ?Ñ?к."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3228,9 +3138,7 @@ 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 ""
-"Ð?олÑ?, конÑ?Ñ?гиÑ?иÑ?айÑ?е най-малко диÑ?екÑ?оÑ?иÑ? на Ñ?Ñ?лÑ?гиÑ?е и виÑ?Ñ?Ñ?ален поÑ?Ñ? за "
-"вÑ?Ñ?ка Ñ?Ñ?лÑ?га, коÑ?Ñ?о иÑ?каÑ?е да Ñ?Ñ?Ñ?Ñ?аниÑ?е. Ð?Ñ?Ñ?Ñ?Ñ?анеÑ?е дÑ?Ñ?гиÑ?е."
+msgstr "Ð?олÑ?, конÑ?Ñ?гиÑ?иÑ?айÑ?е най-малко диÑ?екÑ?оÑ?иÑ? на Ñ?Ñ?лÑ?гиÑ?е и виÑ?Ñ?Ñ?ален поÑ?Ñ? за вÑ?Ñ?ка Ñ?Ñ?лÑ?га, коÑ?Ñ?о иÑ?каÑ?е да Ñ?Ñ?Ñ?Ñ?аниÑ?е. Ð?Ñ?Ñ?Ñ?Ñ?анеÑ?е дÑ?Ñ?гиÑ?е."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3298,9 +3206,7 @@ msgstr "Ð?опиÑ?ай адÑ?еÑ?а на лÑ?кÑ?еÑ?о оÑ? избÑ?анаÑ?а
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Разгледай локалнаÑ?а Ñ?иÑ?Ñ?ема оÑ? Ñ?айлове и избеÑ?и диÑ?екÑ?оÑ?иÑ? за избÑ?аниÑ?е "
-"Ñ?Ñ?лÑ?ги"
+msgstr "Разгледай локалнаÑ?а Ñ?иÑ?Ñ?ема оÑ? Ñ?айлове и избеÑ?и диÑ?екÑ?оÑ?иÑ? за избÑ?аниÑ?е Ñ?Ñ?лÑ?ги"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3327,10 +3233,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Ð?аÑ?иÑ?ни \"СÑ?аÑ?Ñ?иÑ?ане на ТоÑ?\" в конÑ?Ñ?олниÑ? панел на Ð?идалиÑ? за да Ñ?е "
-"Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?а ТоÑ? пÑ?огÑ?амаÑ?а. Ð?ко ТоÑ? излезне неоÑ?аквано, избеÑ?и по-гоÑ?е Ñ?аздел"
-" \"Ð?апÑ?еднал\" за подÑ?обноÑ?Ñ?и за неоÑ?аквани гÑ?еÑ?ки."
+msgstr "Ð?аÑ?иÑ?ни \"СÑ?аÑ?Ñ?иÑ?ане на ТоÑ?\" в конÑ?Ñ?олниÑ? панел на Ð?идалиÑ? за да Ñ?е Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?а ТоÑ? пÑ?огÑ?амаÑ?а. Ð?ко ТоÑ? излезне неоÑ?аквано, избеÑ?и по-гоÑ?е Ñ?аздел \"Ð?апÑ?еднал\" за подÑ?обноÑ?Ñ?и за неоÑ?аквани гÑ?еÑ?ки."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3338,10 +3241,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Ð? моменÑ?а ползваÑ?е веÑ?Ñ?иÑ? \"%1\" на ТоÑ? пÑ?огÑ?амаÑ?а, коÑ?Ñ?о не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва "
-"повеÑ?е. Ð?олÑ?, обновеÑ?е до най-Ñ?Ñ?вÑ?еменнаÑ?а веÑ?Ñ?иÑ? на Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а, коÑ?Ñ?о може "
-"да Ñ?Ñ?дÑ?Ñ?жа важни попÑ?авки в Ñ?игÑ?Ñ?ноÑ?Ñ?Ñ?а, надежноÑ?Ñ?Ñ?а и пÑ?оизводиÑ?елноÑ?Ñ?Ñ?а."
+msgstr "Ð? моменÑ?а ползваÑ?е веÑ?Ñ?иÑ? \"%1\" на ТоÑ? пÑ?огÑ?амаÑ?а, коÑ?Ñ?о не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва повеÑ?е. Ð?олÑ?, обновеÑ?е до най-Ñ?Ñ?вÑ?еменнаÑ?а веÑ?Ñ?иÑ? на Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а, коÑ?Ñ?о може да Ñ?Ñ?дÑ?Ñ?жа важни попÑ?авки в Ñ?игÑ?Ñ?ноÑ?Ñ?Ñ?а, надежноÑ?Ñ?Ñ?а и пÑ?оизводиÑ?елноÑ?Ñ?Ñ?а."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3349,11 +3249,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Ð? моменÑ?а ползваÑ?е веÑ?Ñ?иÑ? \"%1\" на ТоÑ? пÑ?огÑ?амаÑ?а, коÑ?Ñ?о може да не Ñ?абоÑ?и "
-"повеÑ?е Ñ? наÑ?Ñ?оÑ?Ñ?аÑ?а ТоÑ? мÑ?ежа. Ð?олÑ?, обновеÑ?е до най-Ñ?Ñ?вÑ?еменнаÑ?а веÑ?Ñ?иÑ? на "
-"Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а, коÑ?Ñ?о може да Ñ?Ñ?дÑ?Ñ?жа важни попÑ?авки в Ñ?игÑ?Ñ?ноÑ?Ñ?Ñ?а, надежноÑ?Ñ?Ñ?а и"
-" пÑ?оизводиÑ?елноÑ?Ñ?Ñ?а."
+msgstr "Ð? моменÑ?а ползваÑ?е веÑ?Ñ?иÑ? \"%1\" на ТоÑ? пÑ?огÑ?амаÑ?а, коÑ?Ñ?о може да не Ñ?абоÑ?и повеÑ?е Ñ? наÑ?Ñ?оÑ?Ñ?аÑ?а ТоÑ? мÑ?ежа. Ð?олÑ?, обновеÑ?е до най-Ñ?Ñ?вÑ?еменнаÑ?а веÑ?Ñ?иÑ? на Ñ?оÑ?Ñ?Ñ?еÑ?Ñ?а, коÑ?Ñ?о може да Ñ?Ñ?дÑ?Ñ?жа важни попÑ?авки в Ñ?игÑ?Ñ?ноÑ?Ñ?Ñ?а, надежноÑ?Ñ?Ñ?а и пÑ?оизводиÑ?елноÑ?Ñ?Ñ?а."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3367,9 +3263,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"УÑ?пеÑ?но оÑ?Ñ?Ñ?еÑ?Ñ?виÑ?ме вÑ?Ñ?зка Ñ? ТоÑ? мÑ?ежаÑ?а. Сега можеÑ?е да наÑ?Ñ?Ñ?оиÑ?е Ð?аÑ?иÑ?е "
-"пÑ?огÑ?ами да използваÑ? Ð?нÑ?еÑ?неÑ? анонимно."
+msgstr "УÑ?пеÑ?но оÑ?Ñ?Ñ?еÑ?Ñ?виÑ?ме вÑ?Ñ?зка Ñ? ТоÑ? мÑ?ежаÑ?а. Сега можеÑ?е да наÑ?Ñ?Ñ?оиÑ?е Ð?аÑ?иÑ?е пÑ?огÑ?ами да използваÑ? Ð?нÑ?еÑ?неÑ? анонимно."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3379,10 +3273,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Ð?Ñ?огÑ?амаÑ?а ТоÑ? Ñ?е наÑ?Ñ?кна на неоÑ?акван вÑ?Ñ?Ñ?еÑ?ен Ñ?еÑ?ниÑ?еÑ?ки деÑ?екÑ?. Ð?олÑ?, "
-"докладвайÑ?е Ñ?ледноÑ?о Ñ?Ñ?обÑ?ение за гÑ?еÑ?ка на Ñ?азÑ?абоÑ?Ñ?иÑ?иÑ?е на ТоÑ?, на "
-"bugs.torproject.org: \"%1\""
+msgstr "Ð?Ñ?огÑ?амаÑ?а ТоÑ? Ñ?е наÑ?Ñ?кна на неоÑ?акван вÑ?Ñ?Ñ?еÑ?ен Ñ?еÑ?ниÑ?еÑ?ки деÑ?екÑ?. Ð?олÑ?, докладвайÑ?е Ñ?ледноÑ?о Ñ?Ñ?обÑ?ение за гÑ?еÑ?ка на Ñ?азÑ?абоÑ?Ñ?иÑ?иÑ?е на ТоÑ?, на bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3390,10 +3281,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е Ð?аÑ?иÑ? копÑ?Ñ?Ñ?Ñ?ен Ñ?аÑ?овник може би е наглаÑ?ен на %1 Ñ?екÑ?нди  "
-"назад, в Ñ?Ñ?авнение Ñ? изÑ?оÑ?ника \"%2\". Ð?ко Ñ?аÑ?овникÑ?Ñ? не е веÑ?ен, ТоÑ? нама "
-"да може да Ñ?абоÑ?и. Ð?олÑ?, пÑ?овеÑ?еÑ?е дали компÑ?Ñ?Ñ?Ñ?а Ð?и показва Ñ?оÑ?ноÑ?о вÑ?еме."
+msgstr "ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е Ð?аÑ?иÑ? копÑ?Ñ?Ñ?Ñ?ен Ñ?аÑ?овник може би е наглаÑ?ен на %1 Ñ?екÑ?нди  назад, в Ñ?Ñ?авнение Ñ? изÑ?оÑ?ника \"%2\". Ð?ко Ñ?аÑ?овникÑ?Ñ? не е веÑ?ен, ТоÑ? нама да може да Ñ?абоÑ?и. Ð?олÑ?, пÑ?овеÑ?еÑ?е дали компÑ?Ñ?Ñ?Ñ?а Ð?и показва Ñ?оÑ?ноÑ?о вÑ?еме."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3401,10 +3289,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е Ð?аÑ?иÑ? копÑ?Ñ?Ñ?Ñ?ен Ñ?аÑ?овник може би е наглаÑ?ен на %1 Ñ?екÑ?нди  "
-"напÑ?ед, в Ñ?Ñ?авнение Ñ? изÑ?оÑ?ника \"%2\". Ð?ко Ñ?аÑ?овникÑ?Ñ? не е веÑ?ен, ТоÑ? нама "
-"да може да Ñ?абоÑ?и. Ð?олÑ?, пÑ?овеÑ?еÑ?е дали компÑ?Ñ?Ñ?Ñ?а Ð?и показва Ñ?оÑ?ноÑ?о вÑ?еме."
+msgstr "ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е Ð?аÑ?иÑ? копÑ?Ñ?Ñ?Ñ?ен Ñ?аÑ?овник може би е наглаÑ?ен на %1 Ñ?екÑ?нди  напÑ?ед, в Ñ?Ñ?авнение Ñ? изÑ?оÑ?ника \"%2\". Ð?ко Ñ?аÑ?овникÑ?Ñ? не е веÑ?ен, ТоÑ? нама да може да Ñ?абоÑ?и. Ð?олÑ?, пÑ?овеÑ?еÑ?е дали компÑ?Ñ?Ñ?Ñ?а Ð?и показва Ñ?оÑ?ноÑ?о вÑ?еме."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3416,21 +3301,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? може да е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви "
-"некÑ?ипÑ?иÑ?ана вÑ?Ñ?зка пÑ?ез ТоÑ?  до поÑ?Ñ? %1. Ð?зпÑ?аÑ?ане на некÑ?ипÑ?иÑ?ана "
-"инÑ?оÑ?маÑ?иÑ? пÑ?ез ТоÑ? мÑ?ежаÑ?а е опаÑ?но и не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва. С оглед на Ð?аÑ?аÑ?а "
-"безопаÑ?ноÑ?Ñ?, ТоÑ? авÑ?омаÑ?иÑ?но заÑ?воÑ?и Ñ?ази вÑ?Ñ?зка."
+msgstr "Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? може да е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви некÑ?ипÑ?иÑ?ана вÑ?Ñ?зка пÑ?ез ТоÑ?  до поÑ?Ñ? %1. Ð?зпÑ?аÑ?ане на некÑ?ипÑ?иÑ?ана инÑ?оÑ?маÑ?иÑ? пÑ?ез ТоÑ? мÑ?ежаÑ?а е опаÑ?но и не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва. С оглед на Ð?аÑ?аÑ?а безопаÑ?ноÑ?Ñ?, ТоÑ? авÑ?омаÑ?иÑ?но заÑ?воÑ?и Ñ?ази вÑ?Ñ?зка."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? може да е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви "
-"некÑ?ипÑ?иÑ?ана вÑ?Ñ?зка пÑ?ез ТоÑ?  до поÑ?Ñ? %1. Ð?зпÑ?аÑ?ане на некÑ?ипÑ?иÑ?ана "
-"инÑ?оÑ?маÑ?иÑ? пÑ?ез ТоÑ? мÑ?ежаÑ?а е опаÑ?но и не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва."
+msgstr "Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? може да е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви некÑ?ипÑ?иÑ?ана вÑ?Ñ?зка пÑ?ез ТоÑ?  до поÑ?Ñ? %1. Ð?зпÑ?аÑ?ане на некÑ?ипÑ?иÑ?ана инÑ?оÑ?маÑ?иÑ? пÑ?ез ТоÑ? мÑ?ежаÑ?а е опаÑ?но и не Ñ?е пÑ?епоÑ?Ñ?Ñ?ва."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3442,11 +3320,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? е оÑ?Ñ?Ñ?еÑ?Ñ?вила вÑ?Ñ?зка пÑ?ез ТоÑ?  до поÑ?Ñ? "
-"%1 използвайки пÑ?оÑ?окол, койÑ?о може да изпÑ?Ñ?ка инÑ?оÑ?маÑ?иÑ? за Ð?аÑ?аÑ?а "
-"деÑ?Ñ?инаÑ?иÑ?. Ð?олÑ?, Ñ?веÑ?еÑ?е Ñ?е, Ñ?е Ñ?Ñ?е наÑ?Ñ?Ñ?оили пÑ?огÑ?амиÑ?е Ñ?и да ползваÑ? Ñ?амо"
-" SOCKS4a или SOCKS5 Ñ?Ñ?Ñ? оÑ?далеÑ?ен анализ на Ñ?оÑ?Ñ? имеÑ?о."
+msgstr "Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? е оÑ?Ñ?Ñ?еÑ?Ñ?вила вÑ?Ñ?зка пÑ?ез ТоÑ?  до поÑ?Ñ? %1 използвайки пÑ?оÑ?окол, койÑ?о може да изпÑ?Ñ?ка инÑ?оÑ?маÑ?иÑ? за Ð?аÑ?аÑ?а деÑ?Ñ?инаÑ?иÑ?. Ð?олÑ?, Ñ?веÑ?еÑ?е Ñ?е, Ñ?е Ñ?Ñ?е наÑ?Ñ?Ñ?оили пÑ?огÑ?амиÑ?е Ñ?и да ползваÑ? Ñ?амо SOCKS4a или SOCKS5 Ñ?Ñ?Ñ? оÑ?далеÑ?ен анализ на Ñ?оÑ?Ñ? имеÑ?о."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3457,11 +3331,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви вÑ?Ñ?зка пÑ?ез ТоÑ? "
-"използвайки пÑ?оÑ?окол, койÑ?о ТоÑ? не Ñ?азбиÑ?а. Ð?олÑ?, Ñ?веÑ?еÑ?е Ñ?е, Ñ?е Ñ?Ñ?е "
-"наÑ?Ñ?Ñ?оили пÑ?огÑ?амиÑ?е Ñ?и да ползваÑ? Ñ?амо SOCKS4a или SOCKS5 Ñ?Ñ?Ñ? оÑ?далеÑ?ен "
-"анализ на Ñ?оÑ?Ñ? имеÑ?о."
+msgstr "Ð?дна оÑ? пÑ?огÑ?амиÑ?е на Ð?аÑ?иÑ? компÑ?Ñ?Ñ?Ñ? е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви вÑ?Ñ?зка пÑ?ез ТоÑ? използвайки пÑ?оÑ?окол, койÑ?о ТоÑ? не Ñ?азбиÑ?а. Ð?олÑ?, Ñ?веÑ?еÑ?е Ñ?е, Ñ?е Ñ?Ñ?е наÑ?Ñ?Ñ?оили пÑ?огÑ?амиÑ?е Ñ?и да ползваÑ? Ñ?амо SOCKS4a или SOCKS5 Ñ?Ñ?Ñ? оÑ?далеÑ?ен анализ на Ñ?оÑ?Ñ? имеÑ?о."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3472,10 +3342,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Ð?дна оÑ? пÑ?огÑ?амиÑ?е, коиÑ?о ползваÑ?е Ñ?е е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви вÑ?Ñ?зка пÑ?ез ТоÑ?"
-" до поÑ?Ñ? \"%1\", койÑ?о ТоÑ? не Ñ?азпознава каÑ?о валидно Ñ?оÑ?Ñ? име. Ð?олÑ?, "
-"пÑ?овеÑ?еÑ?е наÑ?Ñ?Ñ?ойкиÑ?е на пÑ?огÑ?амиÑ?е Ñ?и."
+msgstr "Ð?дна оÑ? пÑ?огÑ?амиÑ?е, коиÑ?о ползваÑ?е Ñ?е е опиÑ?ала да оÑ?Ñ?Ñ?еÑ?Ñ?ви вÑ?Ñ?зка пÑ?ез ТоÑ? до поÑ?Ñ? \"%1\", койÑ?о ТоÑ? не Ñ?азпознава каÑ?о валидно Ñ?оÑ?Ñ? име. Ð?олÑ?, пÑ?овеÑ?еÑ?е наÑ?Ñ?Ñ?ойкиÑ?е на пÑ?огÑ?амиÑ?е Ñ?и."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3486,10 +3353,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е в моменÑ?а пÑ?епÑ?аÑ?аÑ?иÑ? пÑ?блиÑ?ен IP адÑ?еÑ? е %1%2. Ð?ко не е "
-"пÑ?авилен, молÑ?, вземеÑ?е под внимание наÑ?Ñ?Ñ?ойкаÑ?а на \"Ð?дÑ?еÑ?\" опÑ?иÑ?Ñ?а в "
-"конÑ?игÑ?Ñ?аÑ?иÑ?Ñ?а на пÑ?епÑ?аÑ?анеÑ?о."
+msgstr "ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е в моменÑ?а пÑ?епÑ?аÑ?аÑ?иÑ? пÑ?блиÑ?ен IP адÑ?еÑ? е %1%2. Ð?ко не е пÑ?авилен, молÑ?, вземеÑ?е под внимание наÑ?Ñ?Ñ?ойкаÑ?а на \"Ð?дÑ?еÑ?\" опÑ?иÑ?Ñ?а в конÑ?игÑ?Ñ?аÑ?иÑ?Ñ?а на пÑ?епÑ?аÑ?анеÑ?о."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3500,22 +3364,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е DNS доÑ?Ñ?авÑ?ика подава лÑ?жливи оÑ?говоÑ?и за домейни коиÑ?о не "
-"Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?ваÑ?. Ð?звеÑ?Ñ?но е, Ñ?е нÑ?кои доÑ?Ñ?авÑ?иÑ?и на инÑ?еÑ?неÑ? Ñ?Ñ?лÑ?ги и дÑ?Ñ?ги "
-"доÑ?Ñ?авÑ?иÑ?и на Ñ?Ñ?лÑ?ги за домейн имена, каÑ?о OpenDNS пÑ?авÑ?Ñ? Ñ?ова за да "
-"показваÑ? Ñ?воиÑ?е Ñ?обÑ?Ñ?вени Ñ?екламни Ñ?Ñ?Ñ?аниÑ?и или Ñ?Ñ?Ñ?Ñ?аÑ?ки."
+msgstr "ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е DNS доÑ?Ñ?авÑ?ика подава лÑ?жливи оÑ?говоÑ?и за домейни коиÑ?о не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?ваÑ?. Ð?звеÑ?Ñ?но е, Ñ?е нÑ?кои доÑ?Ñ?авÑ?иÑ?и на инÑ?еÑ?неÑ? Ñ?Ñ?лÑ?ги и дÑ?Ñ?ги доÑ?Ñ?авÑ?иÑ?и на Ñ?Ñ?лÑ?ги за домейн имена, каÑ?о OpenDNS пÑ?авÑ?Ñ? Ñ?ова за да показваÑ? Ñ?воиÑ?е Ñ?обÑ?Ñ?вени Ñ?екламни Ñ?Ñ?Ñ?аниÑ?и или Ñ?Ñ?Ñ?Ñ?аÑ?ки."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е Ñ?воÑ? DNS доÑ?Ñ?авÑ?ика подава лÑ?жливи оÑ?говоÑ?и за добÑ?е "
-"извеÑ?Ñ?ни домейни. ТÑ?й каÑ?о поÑ?Ñ?ебиÑ?елиÑ?е Ñ?азÑ?иÑ?аÑ? на ТоÑ? мÑ?жовиÑ?е "
-"пÑ?епÑ?аÑ?аниÑ? да пÑ?едоÑ?Ñ?авÑ?Ñ? Ñ?оÑ?ни DNS оÑ?говоÑ?и,Ñ?воеÑ?о пÑ?епÑ?аÑ?ане нÑ?ма да бÑ?де"
-" наÑ?Ñ?Ñ?оено каÑ?о изÑ?одÑ?Ñ?о пÑ?епÑ?аÑ?ане."
+msgstr "ТоÑ? Ñ?Ñ?Ñ?анови, Ñ?е Ñ?воÑ? DNS доÑ?Ñ?авÑ?ика подава лÑ?жливи оÑ?говоÑ?и за добÑ?е извеÑ?Ñ?ни домейни. ТÑ?й каÑ?о поÑ?Ñ?ебиÑ?елиÑ?е Ñ?азÑ?иÑ?аÑ? на ТоÑ? мÑ?жовиÑ?е пÑ?епÑ?аÑ?аниÑ? да пÑ?едоÑ?Ñ?авÑ?Ñ? Ñ?оÑ?ни DNS оÑ?говоÑ?и,Ñ?воеÑ?о пÑ?епÑ?аÑ?ане нÑ?ма да бÑ?де наÑ?Ñ?Ñ?оено каÑ?о изÑ?одÑ?Ñ?о пÑ?епÑ?аÑ?ане."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3526,10 +3382,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"ТоÑ? Ñ?е опиÑ?ва да опÑ?едели дали поÑ?Ñ?а кÑ?м Ñ?Ñ?Ñ?вÑ?Ñ?а за пÑ?епÑ?аÑ?ане е доÑ?Ñ?Ñ?пен оÑ?"
-" ТоÑ? мÑ?ежаÑ?а Ñ?Ñ?ез Ñ?вÑ?Ñ?зване кÑ?м Ñ?ебе Ñ?и в %1:%2. Този Ñ?еÑ?Ñ? може да оÑ?неме "
-"нÑ?колко минÑ?Ñ?и."
+msgstr "ТоÑ? Ñ?е опиÑ?ва да опÑ?едели дали поÑ?Ñ?а кÑ?м Ñ?Ñ?Ñ?вÑ?Ñ?а за пÑ?епÑ?аÑ?ане е доÑ?Ñ?Ñ?пен оÑ? ТоÑ? мÑ?ежаÑ?а Ñ?Ñ?ез Ñ?вÑ?Ñ?зване кÑ?м Ñ?ебе Ñ?и в %1:%2. Този Ñ?еÑ?Ñ? може да оÑ?неме нÑ?колко минÑ?Ñ?и."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3549,12 +3402,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Ð?аÑ?иÑ? поÑ?Ñ? кÑ?м Ñ?Ñ?Ñ?ваÑ?а за пÑ?епÑ?аÑ?ане не е доÑ?Ñ?Ñ?пен оÑ? дÑ?Ñ?ги поÑ?Ñ?ебиÑ?ели на "
-"ТоÑ?! Ð?Ñ?зможна пÑ?иÑ?ина за Ñ?ова е ако Ñ?е намиÑ?аÑ?е зад Ñ?Ñ?Ñ?еÑ? или заÑ?иÑ?на Ñ?Ñ?ена,"
-" коÑ?Ñ?о изиÑ?ква да наÑ?Ñ?Ñ?оиÑ?е пÑ?енаÑ?оÑ?ване на поÑ?Ñ?ове. Ð?ко %1:%2 не е ваÑ?иÑ? "
-"пÑ?авилен  IP адÑ?еÑ? и поÑ?Ñ? на Ñ?Ñ?Ñ?вÑ?Ñ?а, молÑ?, пÑ?овеÑ?еÑ?е наÑ?Ñ?Ñ?ойкиÑ?е на "
-"пÑ?епÑ?аÑ?анеÑ?о."
+msgstr "Ð?аÑ?иÑ? поÑ?Ñ? кÑ?м Ñ?Ñ?Ñ?ваÑ?а за пÑ?епÑ?аÑ?ане не е доÑ?Ñ?Ñ?пен оÑ? дÑ?Ñ?ги поÑ?Ñ?ебиÑ?ели на ТоÑ?! Ð?Ñ?зможна пÑ?иÑ?ина за Ñ?ова е ако Ñ?е намиÑ?аÑ?е зад Ñ?Ñ?Ñ?еÑ? или заÑ?иÑ?на Ñ?Ñ?ена, коÑ?Ñ?о изиÑ?ква да наÑ?Ñ?Ñ?оиÑ?е пÑ?енаÑ?оÑ?ване на поÑ?Ñ?ове. Ð?ко %1:%2 не е ваÑ?иÑ? пÑ?авилен  IP адÑ?еÑ? и поÑ?Ñ? на Ñ?Ñ?Ñ?вÑ?Ñ?а, молÑ?, пÑ?овеÑ?еÑ?е наÑ?Ñ?Ñ?ойкиÑ?е на пÑ?епÑ?аÑ?анеÑ?о."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3565,10 +3413,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"ТоÑ? Ñ?е опиÑ?ва да опÑ?едели дали поÑ?Ñ?а кÑ?м диÑ?екÑ?оÑ?иÑ?Ñ?а за пÑ?епÑ?аÑ?ане е "
-"доÑ?Ñ?Ñ?пен оÑ? ТоÑ? мÑ?ежаÑ?а Ñ?Ñ?ез Ñ?вÑ?Ñ?зване кÑ?м Ñ?ебе Ñ?и в %1:%2. Този Ñ?еÑ?Ñ? може "
-"да оÑ?неме нÑ?колко минÑ?Ñ?и."
+msgstr "ТоÑ? Ñ?е опиÑ?ва да опÑ?едели дали поÑ?Ñ?а кÑ?м диÑ?екÑ?оÑ?иÑ?Ñ?а за пÑ?епÑ?аÑ?ане е доÑ?Ñ?Ñ?пен оÑ? ТоÑ? мÑ?ежаÑ?а Ñ?Ñ?ез Ñ?вÑ?Ñ?зване кÑ?м Ñ?ебе Ñ?и в %1:%2. Този Ñ?еÑ?Ñ? може да оÑ?неме нÑ?колко минÑ?Ñ?и."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3588,12 +3433,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Ð?аÑ?иÑ?Ñ? поÑ?Ñ? на пÑ?епÑ?аÑ?аÑ?аÑ?а диÑ?екÑ?оÑ?иÑ? не е доÑ?Ñ?Ñ?пен оÑ? дÑ?Ñ?ги поÑ?Ñ?ебиÑ?ели на"
-" ТоÑ?. Това може да Ñ?е полÑ?Ñ?и ако Ñ?е намиÑ?аÑ?е зад Ñ?Ñ?Ñ?еÑ? или ако заÑ?иÑ?наÑ?а "
-"Ñ?Ñ?ена изиÑ?ква да Ñ?е наÑ?Ñ?Ñ?ои пÑ?еÑ?вÑ?Ñ?лÑ?не на поÑ?Ñ?ове. Ð?ко %1:%2 не е Ð?аÑ?иÑ?Ñ? "
-"пÑ?авилен IP адÑ?еÑ? и поÑ?Ñ? на диÑ?екÑ?оÑ?иÑ?, молÑ? пÑ?овеÑ?еÑ?е наÑ?Ñ?Ñ?ойкиÑ?е на "
-"пÑ?епÑ?аÑ?анеÑ?о Ñ?и."
+msgstr "Ð?аÑ?иÑ?Ñ? поÑ?Ñ? на пÑ?епÑ?аÑ?аÑ?аÑ?а диÑ?екÑ?оÑ?иÑ? не е доÑ?Ñ?Ñ?пен оÑ? дÑ?Ñ?ги поÑ?Ñ?ебиÑ?ели на ТоÑ?. Това може да Ñ?е полÑ?Ñ?и ако Ñ?е намиÑ?аÑ?е зад Ñ?Ñ?Ñ?еÑ? или ако заÑ?иÑ?наÑ?а Ñ?Ñ?ена изиÑ?ква да Ñ?е наÑ?Ñ?Ñ?ои пÑ?еÑ?вÑ?Ñ?лÑ?не на поÑ?Ñ?ове. Ð?ко %1:%2 не е Ð?аÑ?иÑ?Ñ? пÑ?авилен IP адÑ?еÑ? и поÑ?Ñ? на диÑ?екÑ?оÑ?иÑ?, молÑ? пÑ?овеÑ?еÑ?е наÑ?Ñ?Ñ?ойкиÑ?е на пÑ?епÑ?аÑ?анеÑ?о Ñ?и."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3603,10 +3443,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"ТвоÑ? Ñ?еÑ?Ñ?ожник на пÑ?епÑ?аÑ?аниÑ?, койÑ?о опÑ?лномоÑ?Ñ?ва поÑ?Ñ?ебиÑ?ели да Ñ?е Ñ?вÑ?Ñ?жаÑ? "
-"кÑ?м Ñ?воеÑ?о пÑ?епÑ?аÑ?ане, беÑ?е оÑ?Ñ?вÑ?Ñ?лен оÑ? Ñ?Ñ?Ñ?вÑ?Ñ?а в диÑ?екÑ?оÑ?иÑ?Ñ?а на %1:%2. "
-"Ð?аденаÑ?а пÑ?иÑ?ина бе: %3"
+msgstr "ТвоÑ? Ñ?еÑ?Ñ?ожник на пÑ?епÑ?аÑ?аниÑ?, койÑ?о опÑ?лномоÑ?Ñ?ва поÑ?Ñ?ебиÑ?ели да Ñ?е Ñ?вÑ?Ñ?жаÑ? кÑ?м Ñ?воеÑ?о пÑ?епÑ?аÑ?ане, беÑ?е оÑ?Ñ?вÑ?Ñ?лен оÑ? Ñ?Ñ?Ñ?вÑ?Ñ?а в диÑ?екÑ?оÑ?иÑ?Ñ?а на %1:%2. Ð?аденаÑ?а пÑ?иÑ?ина бе: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3618,12 +3455,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"ТвоеÑ?о пÑ?епÑ?аÑ?ане Ñ?ега е онлайн и на Ñ?азположение за ползване на "
-"поÑ?Ñ?ебиÑ?елиÑ?е на ТоÑ?. Ð?и Ñ?ледвало да видиÑ? завиÑ?ение на мÑ?ежовиÑ? Ñ?Ñ?аÑ?ик, "
-"изобÑ?азен на гÑ?аÑ?аÑ?а за поÑ?Ñ?еблениеÑ?о в Ñ?амкиÑ?е на нÑ?колко Ñ?аÑ?а, докаÑ?о "
-"повеÑ?е поÑ?Ñ?ебиÑ?ели наÑ?Ñ?аваÑ? за Ñ?воеÑ?о пÑ?епÑ?аÑ?ане. Ð?лагодаÑ?Ñ? за пÑ?иноÑ?а кÑ?м "
-"ТоÑ? мÑ?ежаÑ?а! "
+msgstr "ТвоеÑ?о пÑ?епÑ?аÑ?ане Ñ?ега е онлайн и на Ñ?азположение за ползване на поÑ?Ñ?ебиÑ?елиÑ?е на ТоÑ?. Ð?и Ñ?ледвало да видиÑ? завиÑ?ение на мÑ?ежовиÑ? Ñ?Ñ?аÑ?ик, изобÑ?азен на гÑ?аÑ?аÑ?а за поÑ?Ñ?еблениеÑ?о в Ñ?амкиÑ?е на нÑ?колко Ñ?аÑ?а, докаÑ?о повеÑ?е поÑ?Ñ?ебиÑ?ели наÑ?Ñ?аваÑ? за Ñ?воеÑ?о пÑ?епÑ?аÑ?ане. Ð?лагодаÑ?Ñ? за пÑ?иноÑ?а кÑ?м ТоÑ? мÑ?ежаÑ?а! "
 
 msgctxt "Stream"
 msgid "New"
@@ -3685,9 +3517,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"СÑ?Ñ?Ñ?ани наÑ?Ñ?Ñ?ойкиÑ?е. Ð?ко не е оÑ?белÑ?зано Ñ?е пÑ?иложи наÑ?Ñ?Ñ?ойки Ñ?амо за "
-"наÑ?Ñ?оÑ?Ñ?иÑ? ТоÑ? Ñ?лÑ?Ñ?ай."
+msgstr "СÑ?Ñ?Ñ?ани наÑ?Ñ?Ñ?ойкиÑ?е. Ð?ко не е оÑ?белÑ?зано Ñ?е пÑ?иложи наÑ?Ñ?Ñ?ойки Ñ?амо за наÑ?Ñ?оÑ?Ñ?иÑ? ТоÑ? Ñ?лÑ?Ñ?ай."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3727,9 +3557,7 @@ msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?вÑ?Ñ?званеÑ?о Ñ? ТоÑ?"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"СелекÑ?иÑ?аноÑ?о е пÑ?азно. Ð?олÑ?, избеÑ?и нÑ?какÑ?в Ñ?екÑ?Ñ? или оÑ?бележи \"Ð?Ñ?иложи "
-"вÑ?иÑ?ко\""
+msgstr "СелекÑ?иÑ?аноÑ?о е пÑ?азно. Ð?олÑ?, избеÑ?и нÑ?какÑ?в Ñ?екÑ?Ñ? или оÑ?бележи \"Ð?Ñ?иложи вÑ?иÑ?ко\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3803,17 +3631,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Ð?идалиÑ? не Ñ?Ñ?пÑ? да пÑ?овеÑ?и за налиÑ?ни пÑ?огÑ?амни обновлениÑ?, заÑ?оÑ?о не оÑ?кÑ?и "
-"'%1'."
+msgstr "Ð?идалиÑ? не Ñ?Ñ?пÑ? да пÑ?овеÑ?и за налиÑ?ни пÑ?огÑ?амни обновлениÑ?, заÑ?оÑ?о не оÑ?кÑ?и '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Ð?идалиÑ? не Ñ?Ñ?пÑ? да пÑ?овеÑ?и за налиÑ?ни пÑ?огÑ?амни обновлениÑ?, заÑ?оÑ?о ТоÑ?-"
-"пÑ?оÑ?еÑ?Ñ?Ñ? на обновление бе пÑ?екÑ?Ñ?наÑ? неоÑ?аквано."
+msgstr "Ð?идалиÑ? не Ñ?Ñ?пÑ? да пÑ?овеÑ?и за налиÑ?ни пÑ?огÑ?амни обновлениÑ?, заÑ?оÑ?о ТоÑ?-пÑ?оÑ?еÑ?Ñ?Ñ? на обновление бе пÑ?екÑ?Ñ?наÑ? неоÑ?аквано."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3941,9 +3765,7 @@ msgstr "Ð?аÑ?Ñ?Ñ?ойва диÑ?екÑ?оÑ?иÑ?Ñ?а, коÑ?Ñ?о Ð?идалиÑ? 
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
-"Ð?аÑ?Ñ?Ñ?ойка на имеÑ?о и меÑ?Ñ?оположениеÑ?о на Ñ?айла Ñ? иденÑ?иÑ?иÑ?иÑ?аниÑ?е пÑ?оÑ?еÑ?и на"
-" Ð?идалиÑ?."
+msgstr "Ð?аÑ?Ñ?Ñ?ойка на имеÑ?о и меÑ?Ñ?оположениеÑ?о на Ñ?айла Ñ? иденÑ?иÑ?иÑ?иÑ?аниÑ?е пÑ?оÑ?еÑ?и на Ð?идалиÑ?."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
@@ -3979,8 +3801,7 @@ msgstr "Ð?едейÑ?Ñ?виÑ?елно Ñ?Ñ?Ñ?ановÑ?ване на езиков
 
 msgctxt "Vidalia"
 msgid "Invalid GUI style specified:"
-msgstr ""
-"Ð?едейÑ?Ñ?виÑ?елно Ñ?Ñ?Ñ?ановÑ?ване на Ñ?Ñ?ила, на гÑ?аÑ?иÑ?наÑ?а поÑ?Ñ?ебиÑ?елÑ?ка Ñ?Ñ?еда:"
+msgstr "Ð?едейÑ?Ñ?виÑ?елно Ñ?Ñ?Ñ?ановÑ?ване на Ñ?Ñ?ила, на гÑ?аÑ?иÑ?наÑ?а поÑ?Ñ?ебиÑ?елÑ?ка Ñ?Ñ?еда:"
 
 msgctxt "Vidalia"
 msgid "Invalid log level specified:"
@@ -3991,10 +3812,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Ð?о вÑ?Ñ?ка веÑ?оÑ?Ñ?ноÑ?Ñ? дÑ?Ñ?г пÑ?оÑ?еÑ? на Ð?идалиÑ? веÑ?е е в Ñ?од. Ð?ко наиÑ?Ñ?ина нÑ?ма дÑ?Ñ?г Ñ?абоÑ?еÑ? пÑ?оÑ?еÑ?, може да избеÑ?еÑ?е да пÑ?одÑ?лжиÑ?е.\n"
-"\n"
-"Ð?Ñ?каÑ?е ли да пÑ?одÑ?лжиÑ?е Ñ?Ñ?аÑ?Ñ?иÑ?анеÑ?о на Ð?идалиÑ??"
+msgstr "Ð?о вÑ?Ñ?ка веÑ?оÑ?Ñ?ноÑ?Ñ? дÑ?Ñ?г пÑ?оÑ?еÑ? на Ð?идалиÑ? веÑ?е е в Ñ?од. Ð?ко наиÑ?Ñ?ина нÑ?ма дÑ?Ñ?г Ñ?абоÑ?еÑ? пÑ?оÑ?еÑ?, може да избеÑ?еÑ?е да пÑ?одÑ?лжиÑ?е.\n\nÐ?Ñ?каÑ?е ли да пÑ?одÑ?лжиÑ?е Ñ?Ñ?аÑ?Ñ?иÑ?анеÑ?о на Ð?идалиÑ??"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4027,5 +3845,3 @@ msgstr "%1 Ñ?аÑ?ове"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 минÑ?Ñ?и"
-
-
diff --git a/src/vidalia/i18n/po/bn/qt_bn.po b/src/vidalia/i18n/po/bn/qt_bn.po
index 8b90f23..fb0dc79 100644
--- a/src/vidalia/i18n/po/bn/qt_bn.po
+++ b/src/vidalia/i18n/po/bn/qt_bn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bn/vidalia_bn.po b/src/vidalia/i18n/po/bn/vidalia_bn.po
index 22b0f4e..d60b5c7 100644
--- a/src/vidalia/i18n/po/bn/vidalia_bn.po
+++ b/src/vidalia/i18n/po/bn/vidalia_bn.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po b/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po
index e7479c1..df79d52 100644
--- a/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po
+++ b/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
index 2330eea..444c242 100644
--- a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
+++ b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/bo/qt_bo.po b/src/vidalia/i18n/po/bo/qt_bo.po
index 4311227..6a5f7f4 100644
--- a/src/vidalia/i18n/po/bo/qt_bo.po
+++ b/src/vidalia/i18n/po/bo/qt_bo.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bo/vidalia_bo.po b/src/vidalia/i18n/po/bo/vidalia_bo.po
index cd31a6d..fd72189 100755
--- a/src/vidalia/i18n/po/bo/vidalia_bo.po
+++ b/src/vidalia/i18n/po/bo/vidalia_bo.po
@@ -1,2682 +1,3816 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-11-24 15:59+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:16
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr ""
 
-#: aboutdialog.ui:53
 msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-#: aboutdialog.ui:88
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-#: aboutdialog.ui:69
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-#: aboutdialog.cpp:53
-msgctxt "AboutDialog"
-msgid "Unavailable"
-msgstr ""
-
-#: aboutdialog.cpp:57
-msgctxt "AboutDialog"
-msgid "Not Running"
-msgstr ""
-
-#: aboutdialog.ui:81
-msgctxt "AboutDialog"
-msgid "0.2.0"
-msgstr ""
-
-#: aboutdialog.ui:106
-msgctxt "AboutDialog"
-msgid "0.2.0.31-alpha-dev (r123456)"
+msgid "License"
 msgstr ""
 
-#: aboutdialog.ui:131
 msgctxt "AboutDialog"
-msgid "4.4.2"
+msgid "Vidalia 0.2.0"
 msgstr ""
 
-#: aboutdialog.ui:107
 msgctxt "AboutDialog"
-msgid "License"
+msgid "Tor 0.2.0.32"
 msgstr ""
 
-#: aboutdialog.ui:163
 msgctxt "AboutDialog"
-msgid "version"
+msgid "Qt 4.4.2"
 msgstr ""
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
-#: advancedpage.cpp:120
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr ""
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr ""
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr ""
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr ""
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr ""
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr ""
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:289
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service."
-""
-"You may need to remove it manually."
-msgstr ""
-
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr ""
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
 msgstr ""
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr ""
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr ""
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
 msgstr ""
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ""
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr ""
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
 msgstr ""
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
 msgstr ""
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
 msgstr ""
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
 msgstr ""
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
 msgstr ""
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
-#: appearancepage.ui:22
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
 
-#: appearancepage.ui:37
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
 msgstr ""
 
-#: appearancepage.ui:75
 msgctxt "AppearancePage"
 msgid "Style"
 msgstr ""
 
-#: appearancepage.ui:103
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
 msgstr ""
 
-#: appearancepage.cpp:67
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
-#: bwgraph.cpp:166
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
 
-#: bwgraph.cpp:232
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
 msgstr ""
 
-#: bwgraph.ui:40
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
 msgstr ""
 
-#: bwgraph.ui:16
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
 msgstr ""
 
-#: bwgraph.ui:63
 msgctxt "BandwidthGraph"
 msgid "Reset"
 msgstr ""
 
-#: bwgraph.ui:151
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
 msgstr ""
 
-#: bwgraph.ui:170
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
 msgstr ""
 
-#: bwgraph.ui:183
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
 msgstr ""
 
-#: bwgraph.ui:234
 msgctxt "BandwidthGraph"
 msgid "Style"
 msgstr ""
 
-#: bwgraph.ui:284
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
 msgstr ""
 
-#: bwgraph.ui:368
 msgctxt "BandwidthGraph"
 msgid "100"
 msgstr ""
 
-#: bwgraph.ui:383
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
 msgstr ""
 
-#: bwgraph.ui:443
 msgctxt "BandwidthGraph"
 msgid "Save"
 msgstr ""
 
-#: bwgraph.ui:450
 msgctxt "BandwidthGraph"
 msgid "Cancel"
 msgstr ""
 
-#: circuit.cpp:112
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
 msgctxt "Circuit"
 msgid "New"
 msgstr ""
 
-#: circuit.cpp:113
 msgctxt "Circuit"
 msgid "Open"
 msgstr ""
 
-#: circuit.cpp:114
 msgctxt "Circuit"
 msgid "Building"
 msgstr ""
 
-#: circuit.cpp:115
 msgctxt "Circuit"
 msgid "Failed"
 msgstr ""
 
-#: circuit.cpp:116
 msgctxt "Circuit"
 msgid "Closed"
 msgstr ""
 
-#: circuit.cpp:117
 msgctxt "Circuit"
 msgid "Unknown"
 msgstr ""
 
-#: circuititem.cpp:39
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Connection"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Status"
 msgstr ""
 
-#: circuitlistwidget.cpp:87
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
 msgstr ""
 
-#: circuitlistwidget.cpp:89
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
 msgstr ""
 
-#: circuitlistwidget.cpp:110
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
 msgstr ""
 
-#: configdialog.cpp:77
 msgctxt "ConfigDialog"
 msgid "General"
 msgstr ""
 
-#: configdialog.cpp:81
 msgctxt "ConfigDialog"
 msgid "Network"
 msgstr ""
 
-#: configdialog.cpp:85
 msgctxt "ConfigDialog"
 msgid "Sharing"
 msgstr ""
 
-#: configdialog.cpp:89
 msgctxt "ConfigDialog"
 msgid "Services"
 msgstr ""
 
-#: configdialog.cpp:93
 msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
-#: configdialog.cpp:97
 msgctxt "ConfigDialog"
 msgid "Advanced"
 msgstr ""
 
-#: configdialog.cpp:111
 msgctxt "ConfigDialog"
 msgid "Help"
 msgstr ""
 
-#: configdialog.cpp:196
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
 msgstr ""
 
-#: configdialog.cpp:198
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
 msgstr ""
 
-#: configdialog.cpp:225
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
 msgstr ""
 
-#: configdialog.cpp:227
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
 msgstr ""
 
-#: configdialog.ui:16
 msgctxt "ConfigDialog"
 msgid "Settings"
 msgstr ""
 
-#: controlconnection.cpp:134
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
 msgstr ""
 
-#: controlconnection.cpp:331
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgid "Remember my password"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
 msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
-#: controlsocket.cpp:70
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlsocket.cpp:80
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
 msgstr ""
 
-#: controlsocket.cpp:117
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
 msgstr ""
 
-#: controlsocket.cpp:156
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
 msgstr ""
 
-#: generalpage.cpp:62
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "CountryInfo"
+msgid "Afghanistan"
 msgstr ""
 
-#: generalpage.cpp:75
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgctxt "CountryInfo"
+msgid "Andorra"
 msgstr ""
 
-#: generalpage.cpp:85
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgctxt "CountryInfo"
+msgid "Angola"
 msgstr ""
 
-#: generalpage.cpp:98
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
 msgstr ""
 
-#: generalpage.cpp:106
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
+msgctxt "CountryInfo"
+msgid "Argentina"
 msgstr ""
 
-#: generalpage.ui:28
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
+msgctxt "CountryInfo"
+msgid "Armenia"
 msgstr ""
 
-#: generalpage.ui:121
-msgctxt "GeneralPage"
-msgid "Browse"
+msgctxt "CountryInfo"
+msgid "Australia"
 msgstr ""
 
-#: generalpage.ui:57
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
 msgstr ""
 
-#: generalpage.ui:51
-msgctxt "GeneralPage"
-msgid "Tor"
+msgctxt "CountryInfo"
+msgid "Bahamas"
 msgstr ""
 
-#: generalpage.ui:93
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
+msgctxt "CountryInfo"
+msgid "Bangladesh"
 msgstr ""
 
-#: generalpage.ui:99
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
+msgctxt "CountryInfo"
+msgid "Barbados"
 msgstr ""
 
-#: generalpage.ui:135
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
+msgctxt "CountryInfo"
+msgid "Belarus"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv: "
+msgctxt "CountryInfo"
+msgid "Belgium"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "CountryInfo"
+msgid "Belize"
 msgstr ""
 
-#: graphframe.cpp:247
-msgctxt "GraphFrame"
-msgid "Sent: "
+msgctxt "CountryInfo"
+msgid "Bhutan"
 msgstr ""
 
-#: graphframe.cpp:259
-msgctxt "GraphFrame"
-msgid "%1 KB"
+msgctxt "CountryInfo"
+msgid "Bolivia"
 msgstr ""
 
-#: graphframe.cpp:262
-msgctxt "GraphFrame"
-msgid "%1 MB"
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
 msgstr ""
 
-#: graphframe.cpp:265
-msgctxt "GraphFrame"
-msgid "%1 GB"
+msgctxt "CountryInfo"
+msgid "Botswana"
 msgstr ""
 
-#: helpbrowser.cpp:135
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents: "
+msgctxt "CountryInfo"
+msgid "Brazil"
 msgstr ""
 
-#: helpbrowser.cpp:147
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
 msgstr ""
 
-#: helpbrowser.cpp:396
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
+msgctxt "CountryInfo"
+msgid "Bulgaria"
 msgstr ""
 
-#: helpbrowser.cpp:398
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
 msgstr ""
 
-#: helpbrowser.cpp:400
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
+msgctxt "CountryInfo"
+msgid "Burundi"
 msgstr ""
 
-#: helpbrowser.cpp:445
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
+msgctxt "CountryInfo"
+msgid "Cambodia"
 msgstr ""
 
-#: helpbrowser.ui:33
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cameroon"
 msgstr ""
 
-#: helpbrowser.ui:484
-msgctxt "HelpBrowser"
-msgid "Back"
+msgctxt "CountryInfo"
+msgid "Canada"
 msgstr ""
 
-#: helpbrowser.ui:487
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
+msgctxt "CountryInfo"
+msgid "Cape Verde"
 msgstr ""
 
-#: helpbrowser.ui:490
-msgctxt "HelpBrowser"
-msgid "Backspace"
+msgctxt "CountryInfo"
+msgid "Central African Republic"
 msgstr ""
 
-#: helpbrowser.ui:498
-msgctxt "HelpBrowser"
-msgid "Forward"
+msgctxt "CountryInfo"
+msgid "Chad"
 msgstr ""
 
-#: helpbrowser.ui:501
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
+msgctxt "CountryInfo"
+msgid "Chile"
 msgstr ""
 
-#: helpbrowser.ui:504
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
+msgctxt "CountryInfo"
+msgid "China"
 msgstr ""
 
-#: helpbrowser.ui:512
-msgctxt "HelpBrowser"
-msgid "Home"
+msgctxt "CountryInfo"
+msgid "Colombia"
 msgstr ""
 
-#: helpbrowser.ui:515
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
+msgctxt "CountryInfo"
+msgid "Comoros"
 msgstr ""
 
-#: helpbrowser.ui:518
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
-#: helpbrowser.ui:535
-msgctxt "HelpBrowser"
-msgid "Find"
+msgctxt "CountryInfo"
+msgid "Congo"
 msgstr ""
 
-#: helpbrowser.ui:538
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgctxt "CountryInfo"
+msgid "Costa Rica"
 msgstr ""
 
-#: helpbrowser.ui:541
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
+msgctxt "CountryInfo"
+msgid "Cote d�Ivoire"
 msgstr ""
 
-#: helpbrowser.ui:549
-msgctxt "HelpBrowser"
-msgid "Close"
+msgctxt "CountryInfo"
+msgid "Croatia"
 msgstr ""
 
-#: helpbrowser.ui:552
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cuba"
 msgstr ""
 
-#: helpbrowser.ui:555
-msgctxt "HelpBrowser"
-msgid "Esc"
+msgctxt "CountryInfo"
+msgid "Cyprus"
 msgstr ""
 
-#: helpbrowser.ui:152
-msgctxt "HelpBrowser"
-msgid "Find:"
+msgctxt "CountryInfo"
+msgid "Czech Republic"
 msgstr ""
 
-#: helpbrowser.ui:174
-msgctxt "HelpBrowser"
-msgid "Find Previous"
+msgctxt "CountryInfo"
+msgid "Denmark"
 msgstr ""
 
-#: helpbrowser.ui:187
-msgctxt "HelpBrowser"
-msgid "Find Next"
+msgctxt "CountryInfo"
+msgid "Djibouti"
 msgstr ""
 
-#: helpbrowser.ui:221
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
+msgctxt "CountryInfo"
+msgid "Dominica"
 msgstr ""
 
-#: helpbrowser.ui:231
-msgctxt "HelpBrowser"
-msgid "Whole words only"
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
 msgstr ""
 
-#: helpbrowser.ui:305
-msgctxt "HelpBrowser"
-msgid "Help Topics"
+msgctxt "CountryInfo"
+msgid "Ecuador"
 msgstr ""
 
-#: helpbrowser.ui:260
-msgctxt "HelpBrowser"
-msgid "Contents"
+msgctxt "CountryInfo"
+msgid "Egypt"
 msgstr ""
 
-#: helpbrowser.ui:350
-msgctxt "HelpBrowser"
-msgid "Search"
+msgctxt "CountryInfo"
+msgid "El Salvador"
 msgstr ""
 
-#: helpbrowser.ui:362
-msgctxt "HelpBrowser"
-msgid "Searching for:"
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
 msgstr ""
 
-#: helpbrowser.ui:405
-msgctxt "HelpBrowser"
-msgid "Found Documents"
+msgctxt "CountryInfo"
+msgid "Eritrea"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file: "
+msgctxt "CountryInfo"
+msgid "Estonia"
 msgstr ""
 
-#: helptextbrowser.cpp:72
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
+msgctxt "CountryInfo"
+msgid "France"
 msgstr ""
 
-#: helptextbrowser.cpp:76
-msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgctxt "CountryInfo"
+msgid "Gabon"
 msgstr ""
 
-#: helptextbrowser.cpp:78
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
+msgctxt "CountryInfo"
+msgid "Gambia"
 msgstr ""
 
-#: helptextbrowser.cpp:88
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
+msgctxt "CountryInfo"
+msgid "Georgia"
 msgstr ""
 
-#: helptextbrowser.cpp:90
-msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgctxt "CountryInfo"
+msgid "Germany"
 msgstr ""
 
-#: licensedialog.ui:13
-msgctxt "LicenseDialog"
-msgid "License Information"
+msgctxt "CountryInfo"
+msgid "Ghana"
 msgstr ""
 
-#: licensedialog.ui:43
-msgctxt "LicenseDialog"
-msgid "License"
+msgctxt "CountryInfo"
+msgid "Grenada"
 msgstr ""
 
-#: licensedialog.ui:76
-msgctxt "LicenseDialog"
-msgid "Credits"
+msgctxt "CountryInfo"
+msgid "Guatemala"
 msgstr ""
 
-#: logevent.cpp:57
-msgctxt "LogEvent"
-msgid "Debug"
+msgctxt "CountryInfo"
+msgid "Guinea"
 msgstr ""
 
-#: logevent.cpp:58
-msgctxt "LogEvent"
-msgid "Info"
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
 msgstr ""
 
-#: logevent.cpp:59
-msgctxt "LogEvent"
-msgid "Notice"
+msgctxt "CountryInfo"
+msgid "Guyana"
 msgstr ""
 
-#: logevent.cpp:60
-msgctxt "LogEvent"
-msgid "Warning"
+msgctxt "CountryInfo"
+msgid "Hong Kong"
 msgstr ""
 
-#: logevent.cpp:61
-msgctxt "LogEvent"
-msgid "Error"
+msgctxt "CountryInfo"
+msgid "Haiti"
 msgstr ""
 
-#: logevent.cpp:62
-msgctxt "LogEvent"
-msgid "Unknown"
+msgctxt "CountryInfo"
+msgid "Honduras"
 msgstr ""
 
-#: mainwindow.ui:233
-msgctxt "MainWindow"
-msgid "Start Tor"
+msgctxt "CountryInfo"
+msgid "Israel"
 msgstr ""
 
-#: mainwindow.ui:443
-msgctxt "MainWindow"
-msgid "Exit"
+msgctxt "CountryInfo"
+msgid "Italy"
 msgstr ""
 
-#: mainwindow.ui:304
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
+msgctxt "CountryInfo"
+msgid "Jamaica"
 msgstr ""
 
-#: mainwindow.ui:317
-msgctxt "MainWindow"
-msgid "Message Log"
+msgctxt "CountryInfo"
+msgid "Japan"
 msgstr ""
 
-#: mainwindow.cpp:348
-msgctxt "MainWindow"
-msgid "Network Map"
+msgctxt "CountryInfo"
+msgid "Jordan"
 msgstr ""
 
-#: mainwindow.cpp:354
-msgctxt "MainWindow"
-msgid "Control Panel"
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
 msgstr ""
 
-#: mainwindow.ui:380
-msgctxt "MainWindow"
-msgid "Settings"
+msgctxt "CountryInfo"
+msgid "Kenya"
 msgstr ""
 
-#: mainwindow.ui:430
-msgctxt "MainWindow"
-msgid "About"
+msgctxt "CountryInfo"
+msgid "Kiribati"
 msgstr ""
 
-#: mainwindow.ui:367
-msgctxt "MainWindow"
-msgid "Help"
+msgctxt "CountryInfo"
+msgid "Kuwait"
 msgstr ""
 
-#: mainwindow.cpp:1391
-msgctxt "MainWindow"
-msgid "New Identity"
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
 msgstr ""
 
-#: mainwindow.cpp:437
-msgctxt "MainWindow"
-msgid "Ctrl+T"
+msgctxt "CountryInfo"
+msgid "Laos"
 msgstr ""
 
-#: mainwindow.cpp:438
-msgctxt "MainWindow"
-msgid "Ctrl+B"
+msgctxt "CountryInfo"
+msgid "Latvia"
 msgstr ""
 
-#: mainwindow.cpp:439
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:440
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:441
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:442
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:443
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:463
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
-#: mainwindow.cpp:468
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:476
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:527
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:528
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:540
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:541
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:562
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:563
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:579
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:583
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:586
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:589
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:592
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:595
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:598
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1132
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:605
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1297
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:612
 msgctxt "MainWindow"
 msgid "Unrecognized startup status"
 msgstr ""
 
-#: mainwindow.cpp:619
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:622
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:625
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:628
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:631
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:634
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:637
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:640
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:643
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:645
-msgctxt "MainWindow"
-msgid " failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:686
-msgctxt "MainWindow"
-msgid "Your relay is shutting down."
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-#: mainwindow.cpp:688
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:693
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:695
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:711
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:859
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:862
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:896
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:906
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:938
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:943
-msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
-""
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-
-#: mainwindow.cpp:965
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:966
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:997
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1001
-msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly."
-""
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-#: mainwindow.cpp:1055
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1075
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1078
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1080
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1087
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1089
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1141
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1143
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1222
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1224
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1226
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1330
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1394
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
-#: mainwindow.cpp:1409
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1458
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1459
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
-msgid "View log message history"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+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."
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1213
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
-#: messagelog.cpp:126
-msgctxt "MessageLog"
-msgid "Messages that appear when something has "
-"gone very wrong and Tor cannot proceed."
+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?"
 msgstr ""
 
-#: messagelog.cpp:128
-msgctxt "MessageLog"
-msgid "Messages that only appear when "
-"something has gone wrong with Tor."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:132
-msgctxt "MessageLog"
-msgid "Messages that appear infrequently "
-"during normal Tor operation and are "
-"not considered errors, but you may "
-"care about."
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr ""
 
-#: messagelog.cpp:310
-msgctxt "MessageLog"
-msgid "Cannot write file %1"
-""
-"%2."
-msgstr ""
-
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
 msgstr ""
 
-#: messagelog.ui:371
 msgctxt "MessageLog"
-msgid "Browse"
+msgid ""
+"Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
+msgid ""
+"Messages that only appear when \n"
+"something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
+msgid ""
+"Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Cannot write file %1\n"
+"\n"
+"%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: networkpage.cpp:193
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid "Invalid Bridge"
 msgstr ""
 
-#: networkpage.cpp:194
 msgctxt "NetworkPage"
 msgid "The specified bridge identifier is not valid."
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgid "Add a Bridge:"
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Remove the selected bridges from the list"
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Copy the selected bridges to the clipboard"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Find Bridges Now"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:139
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:143
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:144
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:148
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:150
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:156
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:100
 msgctxt "RouterDescriptorView"
-msgid "%1 days "
+msgid "Copy"
 msgstr ""
 
-#: routerdescriptorview.cpp:103
-msgctxt "RouterDescriptorView"
-msgid "%1 hours "
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
-msgctxt "RouterDescriptorView"
-msgid "%1 mins "
+msgctxt "RouterInfoDialog"
+msgid "Online"
 msgstr ""
 
-#: routerdescriptorview.cpp:109
-msgctxt "RouterDescriptorView"
-msgid "%1 secs"
+msgctxt "RouterInfoDialog"
+msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:48
-msgctxt "RouterDescriptorView"
-msgid "Copy"
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:140
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:143
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
-#: serverpage.cpp:199
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:263
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:25
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:32
 msgctxt "ServerPage"
 msgid "Relay traffic for the Tor network"
 msgstr ""
 
-#: serverpage.ui:39
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
-msgstr ""
-
-#: serverpage.ui:91
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:110
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:113
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory "
-msgstr ""
-
-#: serverpage.ui:139
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:154
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:164
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:204
-msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-
-#: serverpage.ui:234
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:267
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:279
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:337
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:370
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:380
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:76
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:435
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:466
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:471
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:476
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:481
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:486
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:491
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:456
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
 msgstr ""
 
-#: serverpage.ui:502
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
 msgstr ""
 
-#: serverpage.ui:591
 msgctxt "ServerPage"
-msgid "Average Rate"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:708
 msgctxt "ServerPage"
-msgid "KB/s"
+msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:666
 msgctxt "ServerPage"
-msgid "Maximum Rate"
+msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:695
 msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
+msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:737
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:400
 msgctxt "ServerPage"
-msgid "Bandwidth Limits"
+msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:802
 msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:805
 msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:815
 msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
+msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:818
 msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
+msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:828
 msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:831
 msgctxt "ServerPage"
-msgid "Misc Other Services"
+msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.ui:841
 msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.ui:844
 msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.ui:854
 msgctxt "ServerPage"
-msgid "Port 443"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
-#: serverpage.ui:857
 msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Bridge History"
 msgstr ""
 
-#: serverpage.ui:867
 msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:870
 msgctxt "ServerPage"
-msgid "Websites"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:896
 msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:969
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:979
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
 msgstr ""
 
-#: serverpage.ui:1015
 msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Automatically distribute my bridge address"
 msgstr ""
 
-#: serverpage.ui:1039
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid "Mirror the Relay Directory"
 msgstr ""
 
-#: serverpage.ui:1061
 msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:116
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:123
 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."
+msgid ""
+"Please configure at least a service directory and a virtual port for each "
+"service you want to save. Remove the other ones."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:452
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:458
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:547
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:578
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:598
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:384
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr ""
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:143
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:161
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:103
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: vmessagebox.cpp:77
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr ""
+
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr ""
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:75
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:89
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: main.cpp:95
-msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
-""
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-#: vidalia.cpp:169
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:171
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:173
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:175
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:177
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:180
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:183
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:186
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:190
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:238
 msgctxt "Vidalia"
-msgid "Invalid language code specified: "
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:245
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified: "
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
 msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/br/qt_br.po b/src/vidalia/i18n/po/br/qt_br.po
index 68f542b..aa64469 100644
--- a/src/vidalia/i18n/po/br/qt_br.po
+++ b/src/vidalia/i18n/po/br/qt_br.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/br/vidalia_br.po b/src/vidalia/i18n/po/br/vidalia_br.po
index 22b0f4e..6e6ff60 100644
--- a/src/vidalia/i18n/po/br/vidalia_br.po
+++ b/src/vidalia/i18n/po/br/vidalia_br.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bs/qt_bs.po b/src/vidalia/i18n/po/bs/qt_bs.po
index 910b85a..119546d 100644
--- a/src/vidalia/i18n/po/bs/qt_bs.po
+++ b/src/vidalia/i18n/po/bs/qt_bs.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bs/vidalia_bs.po b/src/vidalia/i18n/po/bs/vidalia_bs.po
index 22b0f4e..54e3e62 100644
--- a/src/vidalia/i18n/po/bs/vidalia_bs.po
+++ b/src/vidalia/i18n/po/bs/vidalia_bs.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ca/qt_ca.po b/src/vidalia/i18n/po/ca/qt_ca.po
index ec991de..8acc58e 100644
--- a/src/vidalia/i18n/po/ca/qt_ca.po
+++ b/src/vidalia/i18n/po/ca/qt_ca.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # Gerard Farràs Ballabriga <>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-01-11 18:49+0000\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
 "Last-Translator: Gerard Farràs Ballabriga <>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 ja existeix.\n"
-"Voleu reemplaçar-lo?"
+msgstr "%1 ja existeix.\nVoleu reemplaçar-lo?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Fitxer no trobat.\n"
-"Si us plau, verifiqueu que heu introduït el nom correcte."
+msgstr "%1\nFitxer no trobat.\nSi us plau, verifiqueu que heu introduït el nom correcte."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,20 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"\n"
-"Directori no trobat.\n"
-"Si us plau, verifiqueu que s'ha proporcionat un nom de directori correcte."
+msgstr "%1\n\nDirectori no trobat.\nSi us plau, verifiqueu que s'ha proporcionat un nom de directori correcte."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' està protegit per escriptura.\n"
-"El desitgeu suprimir igualment?"
+msgstr "'%1' està protegit per escriptura.\nEl desitgeu suprimir igualment?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -383,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>No es pot utilitzar el nom \"%1\".</b><p>Intenteu utilitzar un altre nom,"
-" amb menys caracters o sense marques de puntuació."
+msgstr "<b>No es pot utilitzar el nom \"%1\".</b><p>Intenteu utilitzar un altre nom, amb menys caracters o sense marques de puntuació."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -446,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/ca/vidalia_ca.po b/src/vidalia/i18n/po/ca/vidalia_ca.po
index 9d32a7a..8d013ac 100755
--- a/src/vidalia/i18n/po/ca/vidalia_ca.po
+++ b/src/vidalia/i18n/po/ca/vidalia_ca.po
@@ -1,13 +1,14 @@
 # 
 # Translators:
 # Gerard Farràs Ballabriga <>, 2012.
+# Josep Sànchez <papapep@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-11 18:40+0000\n"
-"Last-Translator: Gerard Farràs Ballabriga <>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
+"Last-Translator: Josep Sànchez <papapep@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,9 +44,7 @@ msgstr "%1 no és una adreça ip vàlida."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Heu seleccionat autenticació amb 'Contrasenya', però no n'heu especificat "
-"cap."
+msgstr "Heu seleccionat autenticació amb 'Contrasenya', però no n'heu especificat cap."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -137,9 +136,7 @@ msgstr "Emmagatzema les dades per al programari Tor en la carpeta següent"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Seleccioneu el directori utilitzat per a emmagatzemar la informació del "
-"programari Tor"
+msgstr "Seleccioneu el directori utilitzat per a emmagatzemar la informació del programari Tor"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -203,13 +200,17 @@ 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 ha estat incapaç de suprimir el servei del Tor.\n"
-"\n"
-"Haureu de suprimirlo manualment."
+msgstr "Vidalia ha estat incapaç de suprimir el servei del Tor.\n\nHaureu de suprimirlo manualment."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -229,8 +230,24 @@ msgstr "Escolliu l'estil per a la interfície de Vidalia"
 
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia ha estat incapaç de carregar el fitxer de llengua especificat."
+
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
 msgstr ""
-"Vidalia ha estat incapaç de carregar el fitxer de llengua especificat."
 
 msgctxt "BandwidthGraph"
 msgid "Since:"
@@ -326,8 +343,7 @@ msgstr "# Clients"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"Clients des dels països següents que han utilitzat el vostre relay des de %1"
+msgstr "Clients des dels països següents que han utilitzat el vostre relay des de %1"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -453,9 +469,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia s'ha connectat amb un procés de Tor que requereix contrasenya. Si us"
-" plau, inseriu la contrasenya de control:"
+msgstr "Vidalia s'ha connectat amb un procés de Tor que requereix contrasenya. Si us plau, inseriu la contrasenya de control:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -915,7 +929,7 @@ msgstr "Paquistan"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
@@ -1293,9 +1307,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Hem estat incapaços de reiniciar Vidalia de manera automàtica. Si us plau, "
-"reinicieu Vidalia manualment."
+msgstr "Hem estat incapaços de reiniciar Vidalia de manera automàtica. Si us plau, reinicieu Vidalia manualment."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1537,10 +1549,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia pot obrir l'enllaç que heu seleccionat en el seu navegador per "
-"defecte. Si el vostre navegador no està actualment configurat per a "
-"utilitzar el Tor, llavors la petició no podrà ser anònima"
+msgstr "Vidalia pot obrir l'enllaç que heu seleccionat en el seu navegador per defecte. Si el vostre navegador no està actualment configurat per a utilitzar el Tor, llavors la petició no podrà ser anònima"
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1554,10 +1563,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ha estat incapaç d'obrir l'enllaç que heu seleccionat en el seu "
-"navegador Web. De totes maneres, encara podeu copiar la URL i enganxar-la en"
-" el vostre navegador web."
+msgstr "Vidalia ha estat incapaç d'obrir l'enllaç que heu seleccionat en el seu navegador Web. De totes maneres, encara podeu copiar la URL i enganxar-la en el vostre navegador web."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1725,8 +1731,7 @@ msgstr "Error mentre s'iniciava el servidor intermediari"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-"Vidalia ha estat incapaç d'iniciar el servidor intermediari configurat"
+msgstr "Vidalia ha estat incapaç d'iniciar el servidor intermediari configurat"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
@@ -1750,11 +1755,11 @@ msgstr "S'estan carregant les autoritats de certificació"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr ""
+msgstr "S'està demanant informació del relé"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr ""
+msgstr "S'està carregant informació del relé"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
@@ -1769,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connectats a la xarxa Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "miscel·lània"
 
@@ -1790,7 +1791,7 @@ msgstr "connexió refusada"
 
 msgctxt "MainWindow"
 msgid "connection timeout"
-msgstr ""
+msgstr "S'ha excedit el temps d'espera de connexió"
 
 msgctxt "MainWindow"
 msgid "read/write error"
@@ -1840,10 +1841,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia ha estat incapaç d'arrancar el Tor. Reviseu les vostres preferències"
-" per a assegurar-vos que el nom és correcte i la ubicació de l'executable "
-"del Tor està especificada."
+msgstr "Vidalia ha estat incapaç d'arrancar el Tor. Reviseu les vostres preferències per a assegurar-vos que el nom és correcte i la ubicació de l'executable del Tor està especificada."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1881,9 +1879,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"El programari Tor requereix Vidalia per a trametre els continguts d'una "
-"galeta d'autenticació, però Vidalia ha estat incapaç de trobar-ne cap."
+msgstr "El programari Tor requereix Vidalia per a trametre els continguts d'una galeta d'autenticació, però Vidalia ha estat incapaç de trobar-ne cap."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1905,9 +1901,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia ha estat incapaç d'entregistrar diversos esdeveniments. Moltes de "
-"les característiques de Vidalia podrien no estar disponibles."
+msgstr "Vidalia ha estat incapaç d'entregistrar diversos esdeveniments. Moltes de les característiques de Vidalia podrien no estar disponibles."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1919,8 +1913,7 @@ msgstr "Vidalia ha estat incapaç d'autenticar-se amb el programari Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Si us plau, reviseu el paràmetre amb el port de control d'autenticació."
+msgstr "Si us plau, reviseu el paràmetre amb el port de control d'autenticació."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1930,9 +1923,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"La versió actual del Tor està desactualitzada i ja no està recomanada. Si us"
-" plau, visiteu el lloc web del Tor per a descarregar la darrera versió."
+msgstr "La versió actual del Tor està desactualitzada i ja no està recomanada. Si us plau, visiteu el lloc web del Tor per a descarregar la darrera versió."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1942,9 +1933,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Totes les connexions següents apareixeran diferents que les seves antigues "
-"connexions."
+msgstr "Totes les connexions següents apareixeran diferents que les seves antigues connexions."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1956,9 +1945,7 @@ msgstr "Reenviament de ports fallit"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia ha estat incapaç de configurar automàticament el reenviament de "
-"ports."
+msgstr "Vidalia ha estat incapaç de configurar automàticament el reenviament de ports."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
@@ -2041,24 +2028,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia ha intentat reinicialitzar la contrasenya de control del Tor, però "
-"no ha etat capaç de reinicialitzar el programari Tor. Si us plau, reviseu el"
-" Gestor de Tasques per a assegurar-vos que no hi ha d'altres processos Tor "
-"executant-se."
+msgstr "Vidalia ha intentat reinicialitzar la contrasenya de control del Tor, però no ha etat capaç de reinicialitzar el programari Tor. Si us plau, reviseu el Gestor de Tasques per a assegurar-vos que no hi ha d'altres processos Tor executant-se."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"La versió instal·lada del Tor està desactualitzada i ja no està recomanada."
+msgstr "La versió instal·lada del Tor està desactualitzada i ja no està recomanada."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Desitgeu revisar si un paquet més nou està disponible per a ser instal·lat?"
+msgstr "Desitgeu revisar si un paquet més nou està disponible per a ser instal·lat?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2068,9 +2049,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"El Tor ha tancat de manera automàtica la seva connexió per tal d'assegurar "
-"la seva anonimitat."
+msgstr "El Tor ha tancat de manera automàtica la seva connexió per tal d'assegurar la seva anonimitat."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2084,9 +2063,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"No hi ha nous paquets de programari del Tor disponibles pel seu ordinador en"
-" aquest moment."
+msgstr "No hi ha nous paquets de programari del Tor disponibles pel seu ordinador en aquest moment."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2094,8 +2071,7 @@ msgstr "Instal·lació fallida"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
-"Vidalia ha estat incapaç d'instal·lar les actualitzacions de programari."
+msgstr "Vidalia ha estat incapaç d'instal·lar les actualitzacions de programari."
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
@@ -2106,10 +2082,25 @@ 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."
+msgstr "Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, reviseu la configuració de la vostra aplicació i utilitzeu només protocols xifrats, com SSL."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, "
-"reviseu la configuració de la vostra aplicació i utilitzeu només protocols "
-"xifrats, com SSL."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2119,10 +2110,21 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
+msgstr "El vostre relé s'està tancant.\nFeu clic un altre cop a \"Atura\" per a aturar el relé."
+
+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 "Bootstrapping torrc from %1 to %2"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2137,24 +2139,7 @@ msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia ha detectat que el programari Tor ha abortat inesperadament.\n"
-"\n"
-"Si us plau, reviseu el fitxer de registre per a avisos recents o missatges d'error."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Vidalia ha detectat que el programari Tor ha abortat inesperadament.\n\nSi us plau, reviseu el fitxer de registre per a avisos recents o missatges d'error."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2170,23 +2155,23 @@ msgstr "Error mentre s'obrir el fitxer de registre"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
-msgstr ""
+msgstr "Vidalia no ha pogut el fitxer de registre especificat."
 
 msgctxt "MessageLog"
 msgid "Log Filename Required"
-msgstr ""
+msgstr "Cal especificar un nom de fitxer de registre"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
+msgstr "Heu d'introduir un nom de fitxer per a poder-hi desar els missatges de registre."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
-msgstr ""
+msgstr "Trieu un fitxer de registre"
 
 msgctxt "MessageLog"
 msgid "Save Log Messages"
-msgstr ""
+msgstr "Desa els missatges de registre"
 
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
@@ -2198,7 +2183,7 @@ msgstr "Vidalia"
 
 msgctxt "MessageLog"
 msgid "Find in Message Log"
-msgstr ""
+msgstr "Cerca al registre de missatges"
 
 msgctxt "MessageLog"
 msgid "Find:"
@@ -2210,15 +2195,15 @@ msgstr "No ha estat trobat"
 
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
-msgstr ""
+msgstr "S'han trobat 0 coincidències per la cerca"
 
 msgctxt "MessageLog"
 msgid "Message Log"
-msgstr ""
+msgstr "Registre de missatges"
 
 msgctxt "MessageLog"
 msgid "Message Filters..."
-msgstr ""
+msgstr "Filtres de missatges..."
 
 msgctxt "MessageLog"
 msgid "Set message filters"
@@ -2238,7 +2223,7 @@ msgstr "Neteja"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
+msgstr "Esborreu tots els missatges del registre de missatges (Ctrl+E)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
@@ -2290,7 +2275,7 @@ msgstr "Preferències"
 
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
-msgstr ""
+msgstr "Ajusteu els paràmetres del registre"
 
 msgctxt "MessageLog"
 msgid "Ctrl+T"
@@ -2302,111 +2287,111 @@ msgstr "Ajuda"
 
 msgctxt "MessageLog"
 msgid "Show the help browser"
-msgstr ""
+msgstr "Mostra el navegador de l'ajuda"
 
 msgctxt "MessageLog"
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 msgctxt "MessageLog"
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 msgctxt "MessageLog"
 msgid "Close the Message Log"
-msgstr ""
+msgstr "Tanca el registre de missatges"
 
 msgctxt "MessageLog"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "MessageLog"
 msgid "Find"
-msgstr ""
+msgstr "Cerca"
 
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
+msgstr "Cerca tots els missatges que continguin el text (Ctrl+F)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ctrl+F"
 
 msgctxt "MessageLog"
 msgid "Time"
-msgstr ""
+msgstr "Temps"
 
 msgctxt "MessageLog"
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 msgctxt "MessageLog"
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
-msgstr ""
+msgstr "Desa els paràmetres actuals del registre de missatges"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
-msgstr ""
+msgstr "Desa els paràmetres"
 
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
-msgstr ""
+msgstr "Desfès els canvis fets als paràmetres"
 
 msgctxt "MessageLog"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 msgctxt "MessageLog"
 msgid "Message Filter"
-msgstr ""
+msgstr "Filtre de missatges"
 
 msgctxt "MessageLog"
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 msgctxt "MessageLog"
 msgid "Warning"
-msgstr ""
+msgstr "Advertència"
 
 msgctxt "MessageLog"
 msgid "Notice"
-msgstr ""
+msgstr "Avís"
 
 msgctxt "MessageLog"
 msgid "Info"
-msgstr ""
+msgstr "Informació"
 
 msgctxt "MessageLog"
 msgid "Debug"
-msgstr ""
+msgstr "Depura"
 
 msgctxt "MessageLog"
 msgid "Message Log History"
-msgstr ""
+msgstr "Històric del registre de missatges"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr ""
+msgstr "Nombre de missatges a mostrar a la finestra del registre de missatges"
 
 msgctxt "MessageLog"
 msgid "messages"
-msgstr ""
+msgstr "missatges"
 
 msgctxt "MessageLog"
 msgid "Browse"
-msgstr ""
+msgstr "Navega"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
+msgstr "Habilita el desament automàtic a un fitxer dels missatges de registre "
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
-msgstr ""
+msgstr "Desa automàticament a fitxer els nous missatges de registre"
 
 msgctxt "MessageLog"
 msgid "Basic"
@@ -2422,7 +2407,7 @@ msgstr "Avançat"
 
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
-msgstr ""
+msgstr "Desa sempre els missatges de registre nous"
 
 msgctxt "MessageLog"
 msgid ""
@@ -2448,9 +2433,7 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Missatges que apareixen sovient\n"
-"durant l'operació normal del Tor"
+msgstr "Missatges que apareixen sovient\ndurant l'operació normal del Tor"
 
 msgctxt "MessageLog"
 msgid ""
@@ -2463,10 +2446,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"No és possible escriure el fitxer %1\n"
-"\n"
-"%2."
+msgstr "No és possible escriure el fitxer %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2573,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Pont invàlid"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identificador especificat de pont no és vàlid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copia (Ctrl+C)"
 
@@ -2588,18 +2560,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Heu d'especificar tant una adreça IP o domini com un número de port per a "
-"configurar el Tor per tal que pugui utilitzar un servidor intermediari per a"
-" accedir a Internet."
+msgstr "Heu d'especificar tant una adreça IP o domini com un número de port per a configurar el Tor per tal que pugui utilitzar un servidor intermediari per a accedir a Internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Heu d'especificar un o més ports del vostre tallafocs per tal que us permeti"
-" connectar-vos."
+msgstr "Heu d'especificar un o més ports del vostre tallafocs per tal que us permeti connectar-vos."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2607,9 +2574,7 @@ msgstr "%1' no és un número de port vàlid."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Reviseu si la vostra xarxa local requereix un servidor intermediari per a "
-"accedir a Internet"
+msgstr "Reviseu si la vostra xarxa local requereix un servidor intermediari per a accedir a Internet"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2693,9 +2658,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ara mateix, no hi ha ponts disponibles. Podeu esperar-vos una estona i "
-"torna-ho a intentar o provar un mètode alternatiu per a trobar nous ponts."
+msgstr "Ara mateix, no hi ha ponts disponibles. Podeu esperar-vos una estona i torna-ho a intentar o provar un mètode alternatiu per a trobar nous ponts."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2722,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accepta"
@@ -2906,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -2947,8 +2906,7 @@ msgstr "Nom del seu repetidor"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Port en el qual usuaris i d'altres repetidors podran comunicar-se amb el seu"
+msgstr "Port en el qual usuaris i d'altres repetidors podran comunicar-se amb el seu"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2962,9 +2920,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Per a connexions a Internet amb descàrrega ràpida però càrrega lenta, si us "
-"plau, llisteu la seva velocitat aquí."
+msgstr "Per a connexions a Internet amb descàrrega ràpida però càrrega lenta, si us plau, llisteu la seva velocitat aquí."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -2996,8 +2952,7 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
-msgstr ""
-"Mostra el tema d'ajuda sobre els límits en la velocitat d'amplada de banda"
+msgstr "Mostra el tema d'ajuda sobre els límits en la velocitat d'amplada de banda"
 
 msgctxt "ServerPage"
 msgid "Average Rate"
@@ -3158,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribueix de manera automàtica l'adreça del meu pont"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3243,9 +3206,7 @@ msgstr ""
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Navega pel sistema de fitxers local i esculliu un directori pel servei "
-"seleccionat"
+msgstr "Navega pel sistema de fitxers local i esculliu un directori pel servei seleccionat"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3272,10 +3233,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Feu clic a \"Inicia el Tor\" en el panell de control de Vidalia per a "
-"reiniciar el programari. En el cas que el Tor aborti de manera inesperada, "
-"seleccioneu \"Avançat\" per a conéixer més detalls sobre els errors"
+msgstr "Feu clic a \"Inicia el Tor\" en el panell de control de Vidalia per a reiniciar el programari. En el cas que el Tor aborti de manera inesperada, seleccioneu \"Avançat\" per a conéixer més detalls sobre els errors"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3283,10 +3241,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Esteu executant la versió \"%1\" del Tor, la qual ja no està suportada. Si "
-"us plau, actualitzeu-vos a la versió més recent, que conté correccions "
-"relacionades amb la seguretat, la fiabilitat i el rendiment. "
+msgstr "Esteu executant la versió \"%1\" del Tor, la qual ja no està suportada. Si us plau, actualitzeu-vos a la versió més recent, que conté correccions relacionades amb la seguretat, la fiabilitat i el rendiment. "
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3294,11 +3249,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Esteu executant la versió \"%1\" del Tor, que probablement ja no funciona "
-"amb la xarxa de Tor actual. Si us plau, actualitze-vos a la versió més "
-"recent, que conté correccions relacionades amb la seguretat, la fibilitat i "
-"el rendiment."
+msgstr "Esteu executant la versió \"%1\" del Tor, que probablement ja no funciona amb la xarxa de Tor actual. Si us plau, actualitze-vos a la versió més recent, que conté correccions relacionades amb la seguretat, la fibilitat i el rendiment."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3312,9 +3263,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Estem en condicions de connectar-nos correctament a la xarxa Tor. Ara, podeu"
-" configurar aplicacions per tal d'utilitzar Internet de manera anònima."
+msgstr "Estem en condicions de connectar-nos correctament a la xarxa Tor. Ara, podeu configurar aplicacions per tal d'utilitzar Internet de manera anònima."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3324,9 +3273,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"El Tor ha topat amb un error de programació. Si us plau, informeu als "
-"desenvolupadors de l'error següent a bugs.torproject.org: \"%1\""
+msgstr "El Tor ha topat amb un error de programació. Si us plau, informeu als desenvolupadors de l'error següent a bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3334,11 +3281,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"El Tor ha determinat que el rellotge del seu sistema està establert %1 "
-"seconds en el passat que el de la font de \"%2\". Si l'hora del seu rellotge"
-" no és correcta, el Tor no podrà funcionar correctament. Si us plau, "
-"verifiqueu que el seu sistema tingui l'hrora correcta."
+msgstr "El Tor ha determinat que el rellotge del seu sistema està establert %1 seconds en el passat que el de la font de \"%2\". Si l'hora del seu rellotge no és correcta, el Tor no podrà funcionar correctament. Si us plau, verifiqueu que el seu sistema tingui l'hrora correcta."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3346,11 +3289,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"El Tor ha determinat que el rellotge del seu sistema està establert %1 "
-"seconds en el futur que el de la font de \"%2\". Si l'hora del seu rellotge "
-"no és correcta, el Tor no podrà funcionar correctament. Si us plau, "
-"verifiqueu que el seu sistema tingui l'hrora correcta."
+msgstr "El Tor ha determinat que el rellotge del seu sistema està establert %1 seconds en el futur que el de la font de \"%2\". Si l'hora del seu rellotge no és correcta, el Tor no podrà funcionar correctament. Si us plau, verifiqueu que el seu sistema tingui l'hrora correcta."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3362,21 +3301,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Una de les aplicacions del seu sistema ha intentat realitzar una connexió no"
-" xifrada al Tor a través del port %1. Enviar informació en clar a través de "
-"la xarxa Tor és perillós i no està recomanat. Per la seva protecció, el Tor "
-"ha tancat de manera automàtica aquesta connexió."
+msgstr "Una de les aplicacions del seu sistema ha intentat realitzar una connexió no xifrada al Tor a través del port %1. Enviar informació en clar a través de la xarxa Tor és perillós i no està recomanat. Per la seva protecció, el Tor ha tancat de manera automàtica aquesta connexió."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Una de les aplicacions del seu sistema ha intentat realitzar una connexió no"
-" xifrada al Tor a través del port %1. Enviar informació en clar a través de "
-"la xarxa Tor és perillós i no està recomanat. "
+msgstr "Una de les aplicacions del seu sistema ha intentat realitzar una connexió no xifrada al Tor a través del port %1. Enviar informació en clar a través de la xarxa Tor és perillós i no està recomanat. "
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3388,12 +3320,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Una de les vostres aplicacions ha establert una connexió a través del Tor a "
-"\"%1\" utilitzant un protocol que podria proporcionar informació sobre la "
-"seva destinació. Si us plau, assegureu-vos que heu configurat les vostres "
-"aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució "
-"d'objectiu remot."
+msgstr "Una de les vostres aplicacions ha establert una connexió a través del Tor a \"%1\" utilitzant un protocol que podria proporcionar informació sobre la seva destinació. Si us plau, assegureu-vos que heu configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució d'objectiu remot."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3404,11 +3331,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Una de les vostres aplicacions ha establert una connexió a través del Tor "
-"emprant un protocol que aquest no compren. Si us plau, assegureu-vos que heu"
-" configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i "
-"SOCKS5 amb resolució d'objectiu remot."
+msgstr "Una de les vostres aplicacions ha establert una connexió a través del Tor emprant un protocol que aquest no compren. Si us plau, assegureu-vos que heu configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució d'objectiu remot."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3419,10 +3342,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Una de les vostres aplicacions ha intentat establir una connexió via el Tor "
-"a \"%1\", que aquest no reconeix com a objectiu vàlid. Si us plau, reviseu "
-"la configuració de la seva aplicació."
+msgstr "Una de les vostres aplicacions ha intentat establir una connexió via el Tor a \"%1\", que aquest no reconeix com a objectiu vàlid. Si us plau, reviseu la configuració de la seva aplicació."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3444,22 +3364,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes "
-"falses per dominis que no existeixen. Ã?s conegut que alguns ISPs i d'altres "
-"proveïdors de DNS, com per exemple, OpenDNS, fan això per tal de mostrar les"
-" seves pròpies pàgines de cerca o de publicitat."
+msgstr "El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes falses per dominis que no existeixen. �s conegut que alguns ISPs i d'altres proveïdors de DNS, com per exemple, OpenDNS, fan això per tal de mostrar les seves pròpies pàgines de cerca o de publicitat."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes "
-"falses per a dominis reconeguts. Since clients rely on Tor network relays to"
-" provide accurate DNS repsonses, your relay will not be configured as an "
-"exit relay."
+msgstr "El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes falses per a dominis reconeguts. Since clients rely on Tor network relays to provide accurate DNS repsonses, your relay will not be configured as an exit relay."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3595,8 +3507,7 @@ msgstr "Incapaç d'iniciar el servei del Tor."
 
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
-msgstr ""
-"La generació d'una funció resum per a la contrasenya de control ha fallit."
+msgstr "La generació d'una funció resum per a la contrasenya de control ha fallit."
 
 msgctxt "TorrcDialog"
 msgid "Editing torrc"
@@ -3934,5 +3845,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/cs/qt_cs.po b/src/vidalia/i18n/po/cs/qt_cs.po
index 2dae2a4..5f207de 100644
--- a/src/vidalia/i18n/po/cs/qt_cs.po
+++ b/src/vidalia/i18n/po/cs/qt_cs.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <gsanky+transifex@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-11-17 19:48+0000\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
 "Last-Translator: Sanky <gsanky+transifex@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 již existuje.\n"
-"PÅ?ejete si jej nahradit?"
+msgstr "%1 již existuje.\nPÅ?ejete si jej nahradit?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Soubor nebyl nalezen.\n"
-"Prosím ovÄ?Å?te, zda byl název souboru zadán správnÄ?."
+msgstr "%1\nSoubor nebyl nalezen.\nProsím ovÄ?Å?te, zda byl název souboru zadán správnÄ?."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"AdresáÅ? nebyl nalezen.\n"
-"Prosím ovÄ?Å?te, zda bylo jméno adresáÅ?e zadáno správnÄ?."
+msgstr "%1\nAdresáÅ? nebyl nalezen.\nProsím ovÄ?Å?te, zda bylo jméno adresáÅ?e zadáno správnÄ?."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1'  je chránÄ?n proti pÅ?episu.\n"
-"Chcete jej smazat i tak?"
+msgstr "'%1'  je chránÄ?n proti pÅ?episu.\nChcete jej smazat i tak?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Název \"%1\" nelze použít.</b><p>Zkuste použít jiný název s menším poÄ?tem"
-" znaků nebo bez zvláštních znaků."
+msgstr "<b>Název \"%1\" nelze použít.</b><p>Zkuste použít jiný název s menším poÄ?tem znaků nebo bez zvláštních znaků."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bajtů"
-
-
diff --git a/src/vidalia/i18n/po/cs/vidalia_cs.po b/src/vidalia/i18n/po/cs/vidalia_cs.po
index d1563be..8328c25 100644
--- a/src/vidalia/i18n/po/cs/vidalia_cs.po
+++ b/src/vidalia/i18n/po/cs/vidalia_cs.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-11-03 16:11+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: smejicisebestie <smejicisebestie@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -43,9 +43,7 @@ msgstr "'%1' neni platna IP adresa."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Jako způsob autentizace jste vybrali \"Heslo\", ale žádné heslo jste "
-"neurÄ?ili"
+msgstr "Jako způsob autentizace jste vybrali \"Heslo\", ale žádné heslo jste neurÄ?ili"
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -171,17 +169,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Uvedené umístÄ?ní  konfiguraÄ?ního souboru Tor obsahuje znak, který není v "
-"používaném 8-bitovém kódování povolen."
+msgstr "Uvedené umístÄ?ní  konfiguraÄ?ního souboru Tor obsahuje znak, který není v používaném 8-bitovém kódování povolen."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Uvedené umístÄ?ní adresáÅ?e urÄ?eného pro data Tor obsahuje znak, který není v "
-"používaném 8-bitovém kódování povolen."
+msgstr "Uvedené umístÄ?ní adresáÅ?e urÄ?eného pro data Tor obsahuje znak, který není v používaném 8-bitovém kódování povolen."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -205,13 +199,17 @@ msgstr "Nastavit ControlPort automaticky"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Program Vidalie nemůže odebrat službu Tor.\n"
-"\n"
-" Musíte ji tedy odebrat ruÄ?nÄ?."
+msgstr "Program Vidalie nemůže odebrat službu Tor.\n\n Musíte ji tedy odebrat ruÄ?nÄ?."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -233,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nebyl schopen naÄ?íst vybraný pÅ?eklad."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Od:"
@@ -453,9 +468,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia se snaží pÅ?ipojit do bÄ?žícího Tor procesu, který vyžaduje heslo. "
-"Prosím zadejte vaše heslo:"
+msgstr "Vidalia se snaží pÅ?ipojit do bÄ?žícího Tor procesu, který vyžaduje heslo. Prosím zadejte vaÅ¡e heslo:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1293,8 +1306,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"NepodaÅ?ilo se Vidalii restartovat automaticky. Prosím restrtujte ruÄ?nÄ?."
+msgstr "NepodaÅ?ilo se Vidalii restartovat automaticky. Prosím restrtujte ruÄ?nÄ?."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1304,27 +1316,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Byla sestavena zpráva o chybÄ?, kterou můžete odeslat vývojovému týmu Vidalia"
-" a pomoci tak s odstranÄ?ním problému. Schválená zpráva neobsahuje žádná "
-"osobní data."
+msgstr "Byla sestavena zpráva o chybÄ?, kterou můžete odeslat vývojovému týmu Vidalia a pomoci tak s odstranÄ?ním problému. Schválená zpráva neobsahuje žádná osobní data."
 
 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 ""
-"s popisem VaÅ¡ich Ä?inností pÅ?ed selháním aplikace a s následující zprávÄ? o "
-"chybÄ?."
+msgstr "s popisem VaÅ¡ich Ä?inností pÅ?ed selháním aplikace a s následující zprávÄ? o chybÄ?."
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1543,10 +1548,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia může vybraný odskaz otevÅ?ít ve výchozím prohlížeÄ?i. Pokud Váš "
-"prohlížeÄ? není momentálnÄ? nastaven pro použití sítÄ? Tor, nebude váš "
-"požadavek již anonymní"
+msgstr "Vidalia může vybraný odskaz otevÅ?ít ve výchozím prohlížeÄ?i. Pokud Váš prohlížeÄ? není momentálnÄ? nastaven pro použití sítÄ? Tor, nebude váš požadavek již anonymní"
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1560,9 +1562,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"NepodaÅ?ilo se rovnou otevÅ?ít odkaz ve vaÅ¡em prohlížeÄ?i. Vložte URL adresu "
-"odkazu pÅ?ímo do prohlížeÄ?e."
+msgstr "NepodaÅ?ilo se rovnou otevÅ?ít odkaz ve vaÅ¡em prohlížeÄ?i. Vložte URL adresu odkazu pÅ?ímo do prohlížeÄ?e."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1773,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "PÅ?ipojeno do sítÄ? Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nerozpoznaný stav spuÅ¡tÄ?ní"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "různý"
 
@@ -1844,9 +1840,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia nemuze spustit Tor. Ujistete se, ze vase nastaveni identifikatoru a "
-"lokality je odpovidajici."
+msgstr "Vidalia nemuze spustit Tor. Ujistete se, ze vase nastaveni identifikatoru a lokality je odpovidajici."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1884,9 +1878,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor software potÅ?ebuje aby Vidalia odeslala obsah ovÄ?Å?ovací cookie, ale "
-"Vidalia žádné nanšla"
+msgstr "Tor software potÅ?ebuje aby Vidalia odeslala obsah ovÄ?Å?ovací cookie, ale Vidalia žádné nanÅ¡la"
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1908,9 +1900,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia se nebyla schopna pÅ?ihlásit k odbÄ?ru událostí. Množství funkcionalit"
-" bude nejspíš nedostupných "
+msgstr "Vidalia se nebyla schopna pÅ?ihlásit k odbÄ?ru událostí. Množství funkcionalit bude nejspíš nedostupných "
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1932,9 +1922,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"MomentálnÄ? nainstalovaná verze Tor je zastaralá a již se nedoporuÄ?uje. Pro "
-"novÄ?jší verzi navÅ¡tivte stránky projektu."
+msgstr "MomentálnÄ? nainstalovaná verze Tor je zastaralá a již se nedoporuÄ?uje. Pro novÄ?jší verzi navÅ¡tivte stránky projektu."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2039,18 +2027,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalie se pokusila resetovat heslo Tor, ale nepodaÅ?ilo se restartovat Tor "
-"software. Prosím ujistÄ?te se ve správci úloh že neprobíha žádný další Tor "
-"processes"
+msgstr "Vidalie se pokusila resetovat heslo Tor, ale nepodaÅ?ilo se restartovat Tor software. Prosím ujistÄ?te se ve správci úloh že neprobíha žádný další Tor processes"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"PrávÄ? nainstalovaná verze  Toru je zastaralá a již se ji nedporuÄ?uje "
-"používat."
+msgstr "PrávÄ? nainstalovaná verze  Toru je zastaralá a již se ji nedporuÄ?uje používat."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2098,10 +2081,25 @@ 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."
-msgstr ""
-"VeÅ¡kerá komunikace pÅ?es toto pÅ?ipojení může být monitorováno. Zkontrolujte "
-"nastavení aplikace a pokud možno používejte výhradnÄ? Å¡ifrovaný protokol jako"
-" je SSL"
+msgstr "VeÅ¡kerá komunikace pÅ?es toto pÅ?ipojení může být monitorováno. Zkontrolujte nastavení aplikace a pokud možno používejte výhradnÄ? Å¡ifrovaný protokol jako je SSL"
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Konfigurace pÅ?ipojení v torrc pomocí BOOTP od %1 do %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(pravdÄ?podobnÄ? Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(pravdÄ?podobnÄ? emailový klient)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Zdá se že jedna z VaÅ¡ich aplikací %1 komunikuje neÅ¡ifrovanÄ? a nebezpeÄ?nÄ? na portu %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2111,49 +2109,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Váš uzel se vypíná.\n"
-"KliknÄ?te na 'Stop' znovu pro okamžité odpojení."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Konfigurace pÅ?ipojení v torrc pomocí BOOTP od %1 do %2"
+msgstr "Váš uzel se vypíná.\nKliknÄ?te na 'Stop' znovu pro okamžité odpojení."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ""
-"Máte právÄ? spuÅ¡tÄ?ný uzel. Jeho ukonÄ?ením pÅ?erušíte vÅ¡echna otevÅ?ená pÅ?ipojení klientů.\n"
-"\n"
-"PÅ?ejete si spojení s klienty ukonÄ?it a nechat jim Ä?as nalézt nový uzel?"
 
 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 ""
-"Vidalia zaznamenala neoÄ?ekávané ukonÄ?ení Tor software.\n"
-"\n"
-"Zkontrolujte poslední varovné a chybové zprávy v logu."
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(pravdÄ?podobnÄ? Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(pravdÄ?podobnÄ? emailový klient)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Máte právÄ? spuÅ¡tÄ?ný uzel. Jeho ukonÄ?ením pÅ?erušíte vÅ¡echna otevÅ?ená pÅ?ipojení klientů.\n\nPÅ?ejete si spojení s klienty ukonÄ?it a nechat jim Ä?as nalézt nový uzel?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Zdá se že jedna z VaÅ¡ich aplikací %1 komunikuje neÅ¡ifrovanÄ? a nebezpeÄ?nÄ? na "
-"portu %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia zaznamenala neoÄ?ekávané ukonÄ?ení Tor software.\n\nZkontrolujte poslední varovné a chybové zprávy v logu."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2427,17 +2412,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Zprávy které se objeví pÅ?i závadÄ? \n"
-"kdy Tor nemůže nadále pokraÄ?ovat."
+msgstr "Zprávy které se objeví pÅ?i závadÄ? \nkdy Tor nemůže nadále pokraÄ?ovat."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Zprávy které se objeví pÅ?i závadÄ? \n"
-"Tor."
+msgstr "Zprávy které se objeví pÅ?i závadÄ? \nTor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2445,18 +2426,13 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Zprávy které se bÄ?hem normálního \n"
-"provozu zÅ?ídka objevují a které nepÅ?edstavují \n"
-"chybu, nicménÄ? mÄ?li by jste jim vÄ?novat pozornost"
+msgstr "Zprávy které se bÄ?hem normálního \nprovozu zÅ?ídka objevují a které nepÅ?edstavují \nchybu, nicménÄ? mÄ?li by jste jim vÄ?novat pozornost"
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Zprávy které se objevují pÅ?i bÄ?žném \n"
-" provou Ä?asto"
+msgstr "Zprávy které se objevují pÅ?i bÄ?žném \n provou Ä?asto"
 
 msgctxt "MessageLog"
 msgid ""
@@ -2469,10 +2445,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Nelze zapisovat do souboru %1\n"
-"\n"
-"%2."
+msgstr "Nelze zapisovat do souboru %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2579,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Neplatný most"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Uvedený identifikátor mostu je neplatný"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopírovat (Ctrl+C)"
 
@@ -2594,16 +2559,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Pro nastavení Toru pro použití proxy serveru musíte specifikovat jak IP "
-"adresu (nebo jméno hostitele) tak Ä?íslo portu"
+msgstr "Pro nastavení Toru pro použití proxy serveru musíte specifikovat jak IP adresu (nebo jméno hostitele) tak Ä?íslo portu"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Musíte specifikovat jeden nebo více portů, které Váš firewall neblokuje"
+msgstr "Musíte specifikovat jeden nebo více portů, které Váš firewall neblokuje"
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2635,9 +2597,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"UjistÄ?te se že na uzlech jsou nastaveny porty, které jsou povoleny na "
-"firewallu"
+msgstr "UjistÄ?te se že na uzlech jsou nastaveny porty, které jsou povoleny na firewallu"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2659,9 +2619,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Zkontrolujte že jste zakodovali požadavky a použijte mostové uzly k pÅ?ístupu"
-" na internet"
+msgstr "Zkontrolujte že jste zakodovali požadavky a použijte mostové uzly k pÅ?ístupu na internet"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2699,9 +2657,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Nyní je k dispozici nový most. Můžete poÄ?kat a zkuÅ¡et to za chvili, nebo "
-"pÅ?ejít na jinou metodu jak si najít snoubenku."
+msgstr "Nyní je k dispozici nový most. Můžete poÄ?kat a zkuÅ¡et to za chvili, nebo pÅ?ejít na jinou metodu jak si najít snoubenku."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2728,13 +2684,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "prijmout"
@@ -2891,17 +2847,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Nastavili jste Tor jako most pro uživatele postižené cenzurou, ale Vaše "
-"verze Toru nepodporuje mosty"
+msgstr "Nastavili jste Tor jako most pro uživatele postižené cenzurou, ale Vaše verze Toru nepodporuje mosty"
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Prosím upgradujte Váš Tor, nebo jej nastavte tak, aby se choval jako "
-"normální uzel"
+msgstr "Prosím upgradujte Váš Tor, nebo jej nastavte tak, aby se choval jako normální uzel"
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2916,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Pracovat pouze jako klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Prenos dat pro sit Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Uzel portu"
 
@@ -2971,9 +2919,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Pro pripojeni s rychlym downloadem ale pomalym uploadem zde nastav rychlost "
-"pro uploadu."
+msgstr "Pro pripojeni s rychlym downloadem ale pomalym uploadem zde nastav rychlost pro uploadu."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3031,9 +2977,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Tvoje maximalni prenosova kapacita musi byt vyssi nebo rovna prumerne. Obe "
-"hodnoty musi byt minimalne 20 KB/s (160kbps)."
+msgstr "Tvoje maximalni prenosova kapacita musi byt vyssi nebo rovna prumerne. Obe hodnoty musi byt minimalne 20 KB/s (160kbps)."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3065,9 +3009,7 @@ msgstr "Ruzne dalsi sluzby"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"Porty 706, 1863, 5050, 5190, 5222, 8300 a 8888 {706, 1863, 5050, 5190, 5222,"
-" 5223, 8300 ?}"
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 8300 a 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3102,9 +3044,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor bude nadále blokovat nÄ?které emaily a aplikace pro sdílení souborů, "
-"kvuli omezení spamu"
+msgstr "Tor bude nadále blokovat nÄ?které emaily a aplikace pro sdílení souborů, kvuli omezení spamu"
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3135,8 +3075,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Nechte Váš uzel puÅ¡tÄ?ný, klienti pak budou snáze schopni ho najít a používat"
+msgstr "Nechte Váš uzel puÅ¡tÄ?ný, klienti pak budou snáze schopni ho najít a používat"
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3150,9 +3089,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor navrátil nesprávnÄ? formátovanou odpovÄ?Ä? Viladie, když se dotaovala na "
-"historii vyzužití mostu"
+msgstr "Tor navrátil nesprávnÄ? formátovanou odpovÄ?Ä? Viladie, když se dotaovala na historii vyzužití mostu"
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3175,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Automatická distribuce adresy mého mostu"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Sdílet adresáÅ? uzlu"
 
@@ -3182,9 +3127,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Email na kterém jste k zastižení kdyby se\n"
-"objevili problémy s uzlem. MÄ?li by jste také váš  PGP nebo GPG fingerprint."
+msgstr "Email na kterém jste k zastižení kdyby se\nobjevili problémy s uzlem. MÄ?li by jste také váš  PGP nebo GPG fingerprint."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3194,9 +3137,7 @@ 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 ""
-"Nastavte pÅ?inejmenším adresáÅ? služby a virtualní port pro každou službu, "
-"kterou chcete zachránit. Ostatní odstraÅ?te."
+msgstr "Nastavte pÅ?inejmenším adresáÅ? služby a virtualní port pro každou službu, kterou chcete zachránit. Ostatní odstraÅ?te."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3264,8 +3205,7 @@ msgstr "Kopírovat cibulová adresa vybrané služby do schránky"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"ProjdÄ?te na lokálním disku soubory a vyberte adresáÅ? pro vybranou službu"
+msgstr "ProjdÄ?te na lokálním disku soubory a vyberte adresáÅ? pro vybranou službu"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3292,10 +3232,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Ve Vidalia Ovládacím panelu kliknÄ?te na \"Start Tor\" pro restartování "
-"softwaru. Pokud Tor skonÄ?il neoÄ?ekávanÄ?, kliknÄ?te na \"PokroÄ?ilé\"  a "
-"zobrazí se Vám informace o chybách"
+msgstr "Ve Vidalia Ovládacím panelu kliknÄ?te na \"Start Tor\" pro restartování softwaru. Pokud Tor skonÄ?il neoÄ?ekávanÄ?, kliknÄ?te na \"PokroÄ?ilé\"  a zobrazí se Vám informace o chybách"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3303,9 +3240,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"PrávÄ? používáte program Tor ve verzi \"%1\" . Tato verze již není "
-"podporována. Prosím upgradujte software pro získání důležitých oprav."
+msgstr "PrávÄ? používáte program Tor ve verzi \"%1\" . Tato verze již není podporována. Prosím upgradujte software pro získání důležitých oprav."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3313,9 +3248,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"PrávÄ? používáte program Tor ve verzi \"%1\" . Tato verze již není "
-"podporována. Prosím upgradujte software pro získání důležitých oprav."
+msgstr "PrávÄ? používáte program Tor ve verzi \"%1\" . Tato verze již není podporována. Prosím upgradujte software pro získání důležitých oprav."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3329,9 +3262,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Nyní se již můžeme pÅ?ipojit do sítÄ? Tor. Nyní můžete nastavit VaÅ¡e aplikace "
-"pro anonymní používání internetu"
+msgstr "Nyní se již můžeme pÅ?ipojit do sítÄ? Tor. Nyní můžete nastavit VaÅ¡e aplikace pro anonymní používání internetu"
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3341,9 +3272,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Software Tor  našel interní chybu. Prosím odešlete básledující zprávu "
-"vývojáÅ?ům na bugs.torproject.org: \"%1\""
+msgstr "Software Tor  naÅ¡el interní chybu. Prosím odeÅ¡lete básledující zprávu vývojáÅ?ům na bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3351,10 +3280,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor identifikoval, že vaÅ¡e systémové hodiny jdou o %1 sekund opoždÄ?ne oproti"
-" zdroji \"%2\". S nesprávnÄ? nastaveným Ä?asem nemůže Tor správnÄ? pracovat. "
-"Prosím ovÄ?Å?te správnost systémového Ä?asu."
+msgstr "Tor identifikoval, že vaÅ¡e systémové hodiny jdou o %1 sekund opoždÄ?ne oproti zdroji \"%2\". S nesprávnÄ? nastaveným Ä?asem nemůže Tor správnÄ? pracovat. Prosím ovÄ?Å?te správnost systémového Ä?asu."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3362,10 +3288,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor identifikoval, že vaÅ¡e systémové hodiny jdou o %1 sekund napÅ?ed oproti "
-"zdroji \"%2\". S nesprávnÄ? nastaveným Ä?asem nemůže Tor správnÄ? pracovat. "
-"Prosím ovÄ?Å?te správnost systémového Ä?asu."
+msgstr "Tor identifikoval, že vaÅ¡e systémové hodiny jdou o %1 sekund napÅ?ed oproti zdroji \"%2\". S nesprávnÄ? nastaveným Ä?asem nemůže Tor správnÄ? pracovat. Prosím ovÄ?Å?te správnost systémového Ä?asu."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3377,20 +3300,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Jedna z aplikací na VaÅ¡em poÄ?ítaÄ?i se pokusila o nezaÅ¡ifrovanou komunikaci "
-"na portu %1. Posílání nezaÅ¡ifrovaných informací sítí Tor je nebezpeÄ?né. Pro "
-"VaÅ¡i ochranu Tor automaticky uzavÅ?el spojení."
+msgstr "Jedna z aplikací na VaÅ¡em poÄ?ítaÄ?i se pokusila o nezaÅ¡ifrovanou komunikaci na portu %1. Posílání nezaÅ¡ifrovaných informací sítí Tor je nebezpeÄ?né. Pro VaÅ¡i ochranu Tor automaticky uzavÅ?el spojení."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Jedna z aplikací na VaÅ¡em poÄ?ítaÄ?i se pokusila o nezaÅ¡ifrovanou komunikaci "
-"na portu %1. Posílání nezaÅ¡ifrovaných informací sítí Tor je nebezpeÄ?né. Pro "
-"VaÅ¡i ochranu Tor automaticky uzavÅ?el spojení."
+msgstr "Jedna z aplikací na VaÅ¡em poÄ?ítaÄ?i se pokusila o nezaÅ¡ifrovanou komunikaci na portu %1. Posílání nezaÅ¡ifrovaných informací sítí Tor je nebezpeÄ?né. Pro VaÅ¡i ochranu Tor automaticky uzavÅ?el spojení."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3402,11 +3319,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Jedna z VaÅ¡ich aplikací navázala spojení pÅ?es Tor na  \"%1\" používajíc "
-"protokol, který by prozradil informace o Vaší poloze. UjistÄ?te se že jste "
-"nastavil Vaše aplikace aby používali pouze SOCKS4a nebo SOCKS5 se remote "
-"hostname resolution."
+msgstr "Jedna z VaÅ¡ich aplikací navázala spojení pÅ?es Tor na  \"%1\" používajíc protokol, který by prozradil informace o Vaší poloze. UjistÄ?te se že jste nastavil VaÅ¡e aplikace aby používali pouze SOCKS4a nebo SOCKS5 se remote hostname resolution."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3417,10 +3330,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Jedna z VaÅ¡ich aplikací navázala spojení pÅ?es Tor používajíc protokol, který"
-" Tor nezna. UjistÄ?te se že jste nastavil VaÅ¡e aplikace aby používali pouze "
-"SOCKS4a nebo SOCKS5 se remote hostname resolution."
+msgstr "Jedna z VaÅ¡ich aplikací navázala spojení pÅ?es Tor používajíc protokol, který Tor nezna. UjistÄ?te se že jste nastavil VaÅ¡e aplikace aby používali pouze SOCKS4a nebo SOCKS5 se remote hostname resolution."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3431,10 +3341,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Jedna z VaÅ¡ich aplikací se pokouší spojit pÅ?es Tor na  \"%1\", jehož "
-"hostname nepovažuje Tor za platné. Prosím zkontrolujte nastavení Vaší "
-"aplikace."
+msgstr "Jedna z VaÅ¡ich aplikací se pokouší spojit pÅ?es Tor na  \"%1\", jehož hostname nepovažuje Tor za platné. Prosím zkontrolujte nastavení Vaší aplikace."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3445,9 +3352,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor urÄ?il VaÅ¡i veÅ?ejnou IP adresu na %1%2. Pokud to není správnÄ?, upravte "
-"hodnotu  'Adresa' v nastavení uzlu."
+msgstr "Tor urÄ?il VaÅ¡i veÅ?ejnou IP adresu na %1%2. Pokud to není správnÄ?, upravte hodnotu  'Adresa' v nastavení uzlu."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3458,20 +3363,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor zaznamenal, že Váš DNS provider odesílá nesprávné odpovÄ?di pÅ?i hledání "
-"neexistujících domén. NÄ?kteÅ?í poskytovatelé DNS a internetu to dÄ?lají, aby "
-"uživateli podstrÄ?ili vlastní reklamy nebo vyhledávaÄ?e."
+msgstr "Tor zaznamenal, že Váš DNS provider odesílá nesprávné odpovÄ?di pÅ?i hledání neexistujících domén. NÄ?kteÅ?í poskytovatelé DNS a internetu to dÄ?lají, aby uživateli podstrÄ?ili vlastní reklamy nebo vyhledávaÄ?e."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor zaznamenal, že Váš DNS provider poskytuje nesprávné odpovÄ?di u "
-"existujícíhc stránek. Vzhledem k tomu nebude Váš uzel nastaven jako "
-"výstupní."
+msgstr "Tor zaznamenal, že Váš DNS provider poskytuje nesprávné odpovÄ?di u existujícíhc stránek. Vzhledem k tomu nebude Váš uzel nastaven jako výstupní."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3482,9 +3381,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor zkouší jestli je Váš uzel pÅ?ístupný ze sítÄ? Tor pÅ?ihlášením sám sebe na "
-"%1:%2. Test může trvat nÄ?kolik minut."
+msgstr "Tor zkouší jestli je Váš uzel pÅ?ístupný ze sítÄ? Tor pÅ?ihlášením sám sebe na %1:%2. Test může trvat nÄ?kolik minut."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3504,11 +3401,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Váš uzlový server není dostupný klientům ze sítÄ? Tor. To může být pokud jste"
-" za routerem, nebo firewallem kvůli kterému je nutné porty pÅ?esmÄ?rovat. "
-"Pokud toto není Vaše IP adresa %1:%2 i a port serveru, zkontrolujte "
-"nastavení Vašeho uzlu"
+msgstr "Váš uzlový server není dostupný klientům ze sítÄ? Tor. To může být pokud jste za routerem, nebo firewallem kvůli kterému je nutné porty pÅ?esmÄ?rovat. Pokud toto není VaÅ¡e IP adresa %1:%2 i a port serveru, zkontrolujte nastavení VaÅ¡eho uzlu"
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3519,9 +3412,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor zkouší jestli je Váš adresáÅ?ový port na uzlu pÅ?ístupný ze sítÄ? Tor "
-"pÅ?ihlášením sám sebe na %1:%2. Test může trvat nÄ?kolik minut."
+msgstr "Tor zkouší jestli je Váš adresáÅ?ový port na uzlu pÅ?ístupný ze sítÄ? Tor pÅ?ihlášením sám sebe na %1:%2. Test může trvat nÄ?kolik minut."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3541,11 +3432,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Váš adresáÅ?ový port uzlu není dostupný klientům ze sítÄ? Tor. To může být "
-"pokud jste za routerem, nebo firewallem kvůli kterému je nutné porty "
-"pÅ?esmÄ?rovat. Pokud toto není VaÅ¡e IP adresa %1:%2 i a port serveru, "
-"zkontrolujte nastavení Vašeho uzlu"
+msgstr "Váš adresáÅ?ový port uzlu není dostupný klientům ze sítÄ? Tor. To může být pokud jste za routerem, nebo firewallem kvůli kterému je nutné porty pÅ?esmÄ?rovat. Pokud toto není VaÅ¡e IP adresa %1:%2 i a port serveru, zkontrolujte nastavení VaÅ¡eho uzlu"
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3555,9 +3442,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Váš ukazatel uzlu, který umožÅ?uje klientům se na nÄ?j pÅ?ipojit, byl odmítnut "
-"adresáÅ?ovým serverm na %1:%2. Uvedený důvod: %3"
+msgstr "Váš ukazatel uzlu, který umožÅ?uje klientům se na nÄ?j pÅ?ipojit, byl odmítnut adresáÅ?ovým serverm na %1:%2. Uvedený důvod: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3569,10 +3454,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Váš uzel je nyní online a dostupný pro klienty Toru. Za nÄ?kolik hodin dojde "
-"pravdÄ?podobnÄ? k vyššímu vytížení v souvislosti s tím jak vás jednotlivé "
-"klienty postupnÄ? objevují. DÄ?kujeme Vám za pÅ?ispívání Tor síti"
+msgstr "Váš uzel je nyní online a dostupný pro klienty Toru. Za nÄ?kolik hodin dojde pravdÄ?podobnÄ? k vyššímu vytížení v souvislosti s tím jak vás jednotlivé klienty postupnÄ? objevují. DÄ?kujeme Vám za pÅ?ispívání Tor síti"
 
 msgctxt "Stream"
 msgid "New"
@@ -3634,9 +3516,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Uložit nastavení. Pokud není zaÅ¡krtnuto, zmÄ?ny se projeví na právÄ? bÄ?žící "
-"instance Toru"
+msgstr "Uložit nastavení. Pokud není zaÅ¡krtnuto, zmÄ?ny se projeví na právÄ? bÄ?žící instance Toru"
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3676,8 +3556,7 @@ msgstr "Chyba pÅ?ipojování do Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"VýbÄ?r je prázdný. Prosím vyberte nÄ?jaký text, nebo použijte \"OznaÄ?it vÅ¡e\""
+msgstr "VýbÄ?r je prázdný. Prosím vyberte nÄ?jaký text, nebo použijte \"OznaÄ?it vÅ¡e\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3751,17 +3630,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia se nepodaÅ?ilo zjistit pÅ?ítomnost dostupných aktualizací, protože se "
-"nepodaÅ?ilo nalézt '%1'."
+msgstr "Vidalia se nepodaÅ?ilo zjistit pÅ?ítomnost dostupných aktualizací, protože se nepodaÅ?ilo nalézt '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia se nepodaÅ?ilo zjistit pÅ?ítomnost dostupných aktualizací, protože "
-"proces Tor aktualizace skonÄ?il neoÄ?ekávanÄ?."
+msgstr "Vidalia se nepodaÅ?ilo zjistit pÅ?ítomnost dostupných aktualizací, protože proces Tor aktualizace skonÄ?il neoÄ?ekávanÄ?."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3936,10 +3811,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Je možné že již bÄ?ží jiný proces Vidalia. Pokud skuteÄ?nÄ? žádný další proces Vidalia nebÄ?ží můžete pokraÄ?ovat dál.\n"
-"\n"
-"PÅ?ejete si dále spoÅ¡tÄ?t Vidaliu?"
+msgstr "Je možné že již bÄ?ží jiný proces Vidalia. Pokud skuteÄ?nÄ? žádný další proces Vidalia nebÄ?ží můžete pokraÄ?ovat dál.\n\nPÅ?ejete si dále spoÅ¡tÄ?t Vidaliu?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3972,5 +3844,3 @@ msgstr "%1 hodin"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 min"
-
-
diff --git a/src/vidalia/i18n/po/csb/qt_csb.po b/src/vidalia/i18n/po/csb/qt_csb.po
index f2a2ae6..5b976a7 100644
--- a/src/vidalia/i18n/po/csb/qt_csb.po
+++ b/src/vidalia/i18n/po/csb/qt_csb.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/csb/vidalia_csb.po b/src/vidalia/i18n/po/csb/vidalia_csb.po
index 4d94dae..ce3630d 100644
--- a/src/vidalia/i18n/po/csb/vidalia_csb.po
+++ b/src/vidalia/i18n/po/csb/vidalia_csb.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/cy/qt_cy.po b/src/vidalia/i18n/po/cy/qt_cy.po
index ec5dedd..54bd79a 100644
--- a/src/vidalia/i18n/po/cy/qt_cy.po
+++ b/src/vidalia/i18n/po/cy/qt_cy.po
@@ -1,11 +1,13 @@
-# 
+# Translators:
+# Translators:
+# cymro <markives@xxxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
+"Last-Translator: cymro <markives@xxxxxxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +19,7 @@ msgstr ""
 #: qaccessibleobject.cpp:348
 msgctxt "QApplication"
 msgid "Activate"
-msgstr ""
+msgstr "Ysgogi"
 
 #: qmessagebox.h:319
 msgctxt "QApplication"
@@ -42,27 +44,27 @@ msgstr ""
 #: qmessagebox.cpp:2104
 msgctxt "QDialogButtonBox"
 msgid "OK"
-msgstr ""
+msgstr "Iawn"
 
 #: qdialogbuttonbox.cpp:528
 msgctxt "QDialogButtonBox"
 msgid "Save"
-msgstr ""
+msgstr "Cadw"
 
 #: qdialogbuttonbox.cpp:531
 msgctxt "QDialogButtonBox"
 msgid "Open"
-msgstr ""
+msgstr "Agor"
 
 #: qdialogbuttonbox.cpp:534
 msgctxt "QDialogButtonBox"
 msgid "Cancel"
-msgstr ""
+msgstr "Diddymu"
 
 #: qdialogbuttonbox.cpp:537
 msgctxt "QDialogButtonBox"
 msgid "Close"
-msgstr ""
+msgstr "Cau"
 
 #: qdialogbuttonbox.cpp:540
 msgctxt "QDialogButtonBox"
@@ -72,27 +74,27 @@ msgstr ""
 #: qdialogbuttonbox.cpp:543
 msgctxt "QDialogButtonBox"
 msgid "Reset"
-msgstr ""
+msgstr "Ailosod"
 
 #: qdialogbuttonbox.cpp:546
 msgctxt "QDialogButtonBox"
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
 #: qdialogbuttonbox.cpp:550
 msgctxt "QDialogButtonBox"
 msgid "Don't Save"
-msgstr ""
+msgstr "Peidiwch â Cadw"
 
 #: qdialogbuttonbox.cpp:554
 msgctxt "QDialogButtonBox"
 msgid "Discard"
-msgstr ""
+msgstr "Gwaredu"
 
 #: qdialogbuttonbox.cpp:557
 msgctxt "QDialogButtonBox"
 msgid "&Yes"
-msgstr ""
+msgstr "&Ia"
 
 #: qdialogbuttonbox.cpp:560
 msgctxt "QDialogButtonBox"
@@ -147,7 +149,7 @@ msgstr ""
 #: qdirmodel.cpp:423
 msgctxt "QDirModel"
 msgid "Name"
-msgstr ""
+msgstr "Enw"
 
 #: qdirmodel.cpp:424
 msgctxt "QDirModel"
@@ -192,7 +194,7 @@ msgstr ""
 #: qfiledialog.cpp:435
 msgctxt "QFileDialog"
 msgid "Open"
-msgstr ""
+msgstr "Agor"
 
 #: qfiledialog.cpp:1670
 msgctxt "QFileDialog"
@@ -217,12 +219,12 @@ msgstr ""
 #: qfiledialog.cpp:462
 msgctxt "QFileDialog"
 msgid "&Rename"
-msgstr ""
+msgstr "&Ailenwi"
 
 #: qfiledialog.cpp:463
 msgctxt "QFileDialog"
 msgid "&Delete"
-msgstr ""
+msgstr "&Dileu"
 
 #: qfiledialog.cpp:464
 msgctxt "QFileDialog"
diff --git a/src/vidalia/i18n/po/cy/vidalia_cy.po b/src/vidalia/i18n/po/cy/vidalia_cy.po
index 442d953..34ef2a8 100644
--- a/src/vidalia/i18n/po/cy/vidalia_cy.po
+++ b/src/vidalia/i18n/po/cy/vidalia_cy.po
@@ -1,12 +1,14 @@
 # 
+# Translators:
 # cymro <markives@xxxxxxxxxxxxx>, 2011.
+#   <demonuk9@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: cymro <markives@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
+"Last-Translator: PoopZemli <demonuk9@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +39,7 @@ msgstr "Qt 4.4.2"
 
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
-msgstr ""
+msgstr "'%1' не Ñ? дÑ?йÑ?ноÑ? IP-адÑ?еÑ?оÑ?."
 
 msgctxt "AdvancedPage"
 msgid ""
@@ -54,7 +56,7 @@ msgstr "Ffeil heb ei darganfod"
 
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
-msgstr ""
+msgstr "%1 не Ñ?Ñ?нÑ?Ñ?. Ð?ажаÑ?Ñ?е Ñ?Ñ?воÑ?иÑ?и?"
 
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
@@ -102,7 +104,7 @@ msgstr "Cyfrinair"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr ""
+msgstr "Ð?енеÑ?Ñ?ваÑ?и випадково"
 
 msgctxt "AdvancedPage"
 msgid ":"
@@ -193,6 +195,17 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
@@ -201,7 +214,7 @@ msgstr ""
 
 msgctxt "AppearancePage"
 msgid "Language"
-msgstr ""
+msgstr "Ð?ова"
 
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
@@ -219,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ers:"
@@ -249,7 +279,7 @@ msgstr ""
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr ""
+msgstr "Ð?авжди згоÑ?и"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
@@ -261,7 +291,7 @@ msgstr ""
 
 msgctxt "BandwidthGraph"
 msgid "100"
-msgstr ""
+msgstr "100"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
@@ -281,7 +311,7 @@ msgstr ""
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "Ð?Ñ?д'Ñ?днаннÑ? до %1:%2..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
@@ -305,7 +335,7 @@ msgstr ""
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
-msgstr ""
+msgstr "Ð?Ñ?аÑ?на"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
@@ -325,11 +355,11 @@ msgstr ""
 
 msgctxt "Circuit"
 msgid "New"
-msgstr ""
+msgstr "Ð?овий"
 
 msgctxt "Circuit"
 msgid "Open"
-msgstr ""
+msgstr "Ð?Ñ?дкÑ?иÑ?и"
 
 msgctxt "Circuit"
 msgid "Building"
@@ -397,11 +427,11 @@ msgstr ""
 
 msgctxt "ConfigDialog"
 msgid "Help"
-msgstr ""
+msgstr "Ð?опомога"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
-msgstr ""
+msgstr "Ð?омилка пÑ?и збеÑ?еженнÑ? налаÑ?Ñ?Ñ?ванÑ?"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
@@ -409,7 +439,7 @@ msgstr ""
 
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
-msgstr ""
+msgstr "Ð?омилка пÑ?и заÑ?Ñ?оÑ?Ñ?ваннÑ? налаÑ?Ñ?Ñ?ванÑ?"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
@@ -1262,24 +1292,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 ""
 
@@ -1297,16 +1309,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -1751,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2060,15 +2079,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2083,24 +2114,31 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2515,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2655,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2839,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3087,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3665,14 +3699,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 ""
@@ -3766,6 +3792,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 ""
 
@@ -3815,5 +3845,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/da/qt_da.po b/src/vidalia/i18n/po/da/qt_da.po
index 261ba9d..dd51185 100644
--- a/src/vidalia/i18n/po/da/qt_da.po
+++ b/src/vidalia/i18n/po/da/qt_da.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 findes allerede.\n"
-"Vil du overskrive den?"
+msgstr "%1 findes allerede.\nVil du overskrive den?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Filen blev ikke fundet.\n"
-"Bekræft venligst, at det korrekte filnavn blev givet."
+msgstr "%1\nFilen blev ikke fundet.\nBekræft venligst, at det korrekte filnavn blev givet."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Mappen blev ikke fundet.\n"
-"Bekræft venligst, at det rigtige mappe navn blev givet."
+msgstr "%1\nMappen blev ikke fundet.\nBekræft venligst, at det rigtige mappe navn blev givet."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' er skrivebeskyttet.\n"
-"Vil du slette den alligevel?"
+msgstr "'%1' er skrivebeskyttet.\nVil du slette den alligevel?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Navnet \"%1\" kunne ikke bruges.</b><p>Prøv at bruge et andet navn, med "
-"færre karakterer og ingen grammatiske tegn."
+msgstr "<b>Navnet \"%1\" kunne ikke bruges.</b><p>Prøv at bruge et andet navn, med færre karakterer og ingen grammatiske tegn."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 byte"
-
-
diff --git a/src/vidalia/i18n/po/da/vidalia_da.po b/src/vidalia/i18n/po/da/vidalia_da.po
index 6180b32..1bd2935 100644
--- a/src/vidalia/i18n/po/da/vidalia_da.po
+++ b/src/vidalia/i18n/po/da/vidalia_da.po
@@ -1,5 +1,6 @@
 # 
 # Translators:
+#   <3xm@xxxxxxxxxxxxxxxx>, 2012.
 # Aputsiaq Janussen <aputtu@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #   <theoliver@xxxxxxxxxx>, 2011.
@@ -7,9 +8,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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-09 21:55+0000\n"
-"Last-Translator: OliverMller <theoliver@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-11 07:32+0000\n"
+"Last-Translator: decibyte <3xm@xxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,9 +46,7 @@ msgstr "'%1' er ikke en gyldig IP-adresse."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Du har valgt 'Password' autentificering, men har ikke angivet en "
-"adgangskode."
+msgstr "Du har valgt 'Password' autentificering, men har ikke angivet en adgangskode."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -173,17 +172,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Den angivne placering for Tor-konfigurationsfil indeholder tegn som ikke kan"
-" repræsenteres i dit systems aktuelle 8-bit tegnindkodning. "
+msgstr "Den angivne placering for Tor-konfigurationsfil indeholder tegn som ikke kan repræsenteres i dit systems aktuelle 8-bit tegnindkodning. "
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Den angivne placering for Tor-datakatalog indeholder tegn som ikke kan "
-"repræsenteres i dit systems aktuelle 8-bit tegnindkodning. "
+msgstr "Den angivne placering for Tor-datakatalog indeholder tegn som ikke kan repræsenteres i dit systems aktuelle 8-bit tegnindkodning. "
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -207,13 +202,17 @@ msgstr "Konfigurer KontrolPort Automatisk"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Du har valgt automatisk konfiguration af KontrolPort, men har ikke angivet nogen DataMappe. Vælg venligst et, eller slå automatisk konfiguration af kontrolport fra."
+
+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-tjeneste.\n"
-"\n"
-"Du skal muligvis fjerne den manuelt."
+msgstr "Vidalia var ikke i stand til at fjerne Tor-tjeneste.\n\nDu skal muligvis fjerne den manuelt."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -235,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunne ikke hente det valgte sprog"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "Systemikonindstillinger (ændringer træder i kraft når du genstarter Vidalia)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Vis bakkeikonet og dokikonet (slået til som standard)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Skjul bakkeikonet"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Skjul dokikonet"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Siden:"
@@ -455,17 +471,15 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia er tilsluttet til en kørende Tor-proces som kræver et kodeord. "
-"Venligst indtast til kontrolkodeord:"
+msgstr "Vidalia er tilsluttet til en kørende Tor-proces som kræver et kodeord. Venligst indtast til kontrolkodeord:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
-msgstr "Kontrol socket er ikke forbundet."
+msgstr "Kontrol-socket er ikke forbundet."
 
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
-msgstr "Fejl ved sending af kontrol kommando. [%1]"
+msgstr "Fejl ved sending af kontrolkommando. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
@@ -473,7 +487,7 @@ msgstr "Socket afbrudt mens forsøg på læsning af en linje data."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
-msgstr "Ugyldigt kontrol svar. [%1]"
+msgstr "Ugyldigt kontrolsvar. [%1]"
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
@@ -1295,9 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Vi kunne ikke automatisk genstarte Vidalia. Venligst genstart Vidalia "
-"manuelt."
+msgstr "Vi kunne ikke automatisk genstarte Vidalia. Venligst genstart Vidalia manuelt."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1307,27 +1319,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Et nedbrudsrapport er blevet oprettet, som du kan sende til Vidalia "
-"udviklere til at hjælpe med at identificere og løse problemet. Rapporten "
-"indeholder ikke personligt identificerbare oplysninger."
+msgstr "Et nedbrudsrapport er blevet oprettet, som du kan sende til Vidalia udviklere til at hjælpe med at identificere og løse problemet. Rapporten indeholder ikke personligt identificerbare oplysninger."
 
 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 ""
-"med en beskrivelse af, hvad du gjorde, før ansøgningen styrtede ned, sammen "
-"med følgende filer, der svarer til rapporten:"
+msgstr "med en beskrivelse af, hvad du gjorde, før ansøgningen styrtede ned, sammen med følgende filer, der svarer til rapporten:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1546,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia kan åbne det valgte link i din standart Internet Browser. Hvis din "
-"browser ikke er opsat til at anvende Tor, vil din anmodning ikke være "
-"anonym. "
+msgstr "Vidalia kan åbne det valgte link i din standart Internet Browser. Hvis din browser ikke er opsat til at anvende Tor, vil din anmodning ikke være anonym. "
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1563,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kunne ikke åben det valgte link i din Internetbrowser. Du kan stadig"
-" kopiere URLen og paste den ind i din browser."
+msgstr "Vidalia kunne ikke åben det valgte link i din Internetbrowser. Du kan stadig kopiere URLen og paste den ind i din browser."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1776,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Forbundet til Tor netværket!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ukendt startop status"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diverse"
 
@@ -1847,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia kunne ikke starte Tor. Kontroller dine indstillinger for at sikre, "
-"at din Tor programfil er korrekt angivet med navn og placering."
+msgstr "Vidalia kunne ikke starte Tor. Kontroller dine indstillinger for at sikre, at din Tor programfil er korrekt angivet med navn og placering."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1887,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor kræver at Vidalia sender indholdet af en godkendelses-cookie, men "
-"Vidalia var i stand til at finde en."
+msgstr "Tor kræver at Vidalia sender indholdet af en godkendelses-cookie, men Vidalia var i stand til at finde en."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1911,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia kunne ikke registrere bestemte begivenheder. Mange af Vidalia's "
-"funktioner kan være utilgængelige."
+msgstr "Vidalia kunne ikke registrere bestemte begivenheder. Mange af Vidalia's funktioner kan være utilgængelige."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1935,10 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Den nuværende installation af Tor er enten for gammel eller ikke længere "
-"anbefalelsesværdig. Besøg venligst hjemmesiden for Tor og hent den nyeste "
-"version."
+msgstr "Den nuværende installation af Tor er enten for gammel eller ikke længere anbefalelsesværdig. Besøg venligst hjemmesiden for Tor og hent den nyeste version."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1948,9 +1935,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Alle efterfølgende forbindelser vil synes at være anderledes end dine gamle "
-"forbindelser."
+msgstr "Alle efterfølgende forbindelser vil synes at være anderledes end dine gamle forbindelser."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2045,24 +2030,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia prøvede at nulstille Tors kontrol kodeord, men kunne ikke genstarte "
-"programmet. Kontroller venligst, at der ikke køre nogle Tor processer i din "
-"Jobliste."
+msgstr "Vidalia prøvede at nulstille Tors kontrol kodeord, men kunne ikke genstarte programmet. Kontroller venligst, at der ikke køre nogle Tor processer i din Jobliste."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Den aktuelt installerede version af Tor er forældet eller kan ikke længere "
-"anbefales."
+msgstr "Den aktuelt installerede version af Tor er forældet eller kan ikke længere anbefales."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Vil du gerne se, om der er en nyere pakke tilgængelig for installation?"
+msgstr "Vil du gerne se, om der er en nyere pakke tilgængelig for installation?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2072,8 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor har automatisk lukket din forbindelse for at beskytte din anonymitet."
+msgstr "Tor har automatisk lukket din forbindelse for at beskytte din anonymitet."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2087,9 +2065,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Der er ingen nye Tor-softwarepakker tilgængelige til din computer på "
-"nuværende tidspunkt."
+msgstr "Der er ingen nye Tor-softwarepakker tilgængelige til din computer på nuværende tidspunkt."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2097,8 +2073,7 @@ msgstr "Installation mislykkedes"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
-"Vidalia var ude af stand til at installere dine software-opdateringer."
+msgstr "Vidalia var ude af stand til at installere dine software-opdateringer."
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
@@ -2109,10 +2084,25 @@ 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."
-msgstr ""
-"Alt som sendes over denne forbindelse vil kunne overvåges. Tjek venligst din"
-" applikations konfiguration og brug kun krypterede protokoller, såsom SSL, "
-"om muligt."
+msgstr "Alt som sendes over denne forbindelse vil kunne overvåges. Tjek venligst din applikations konfiguration og brug kun krypterede protokoller, såsom SSL, om muligt."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootsstrapper torrc fra %1 til %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(måske Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(måske en email klient)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "En af dine applikationer %1 synes at være ved at lave en potentielt ukrypteret og usikre forbindelse til port %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2122,49 +2112,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Deres relæ er ved at lukke. \n"
-"Klik på 'Stop' igen for at stoppe din relæ nu."
+msgstr "Deres relæ er ved at lukke. \nKlik på 'Stop' igen for at stoppe din relæ nu."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootsstrapper torrc fra %1 til %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia kan ikke snakke med Tor, da den ikke kan tilgå filen: %1\n\nHere er den seneste fejlmeddelelse:\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 "Det ser ud til at Tor er holdt op med at køre siden Vidalia startede det.\n\nSee i den avancerede meddelelseslog efter mere 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?"
-msgstr ""
-"Du har i øjeblikket et relæ kørende. Afbrydelse af dit relæ vil forstyrre alle åbne klientforbindelser.\n"
-"\n"
-"Vil du gerne lukke taktfuldt og give klienterne tid til at finde nye relæer?"
+msgstr "Du har i øjeblikket et relæ kørende. Afbrydelse af dit relæ vil forstyrre alle åbne klientforbindelser.\n\nVil du gerne lukke taktfuldt og give klienterne tid til at finde nye relæer?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia registrerede at Tor-softwaren uventet blev afsluttet.\n"
-"\n"
-"Tjek venligst beskedloggen for seneste advarsler eller fejlbeskeder."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(måske Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(måske en email klient)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"En af dine applikationer %1 synes at være ved at lave en potentielt "
-"ukrypteret og usikre forbindelse til port %2."
+msgstr "Vidalia registrerede at Tor-softwaren uventet blev afsluttet.\n\nTjek venligst beskedloggen for seneste advarsler eller fejlbeskeder."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2438,17 +2415,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Beskeder som fremkommer når noget er gået\n"
-"meget galt og hvor Tor ikke kan forsætte."
+msgstr "Beskeder som fremkommer når noget er gået\nmeget galt og hvor Tor ikke kan forsætte."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Beskeder som kun fremkommer når\n"
-"noget er gået galt med Tor."
+msgstr "Beskeder som kun fremkommer når\nnoget er gået galt med Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2456,37 +2429,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Beskeder som fremkommer mindre hyppigt \n"
-"under normal Tor-brug og som ikke kan \n"
-"betragtes som fejl, men som du kan være\n"
-"interesseret i."
+msgstr "Beskeder som fremkommer mindre hyppigt \nunder normal Tor-brug og som ikke kan \nbetragtes som fejl, men som du kan være\ninteresseret i."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Beskeder som fremkommer hyppigt \n"
-"under normal brug af Tor."
+msgstr "Beskeder som fremkommer hyppigt \nunder normal brug af Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Meget detaljerede beskeder som primært\n"
-"har interesse for Tor-udviklere."
+msgstr "Meget detaljerede beskeder som primært\nhar interesse for Tor-udviklere."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Kan ikke skrive til %1\n"
-"\n"
-"%2."
+msgstr "Kan ikke skrive til %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2593,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ugyldig Bro"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den angivne bro identifikator er ikke gyldigt."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopier (Ctrl+C)"
 
@@ -2608,17 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Du skal angive både IP adresse eller værts navn og en port, for at indstille"
-" Tor til at bruge en proxy som forbindelse til Internettet."
+msgstr "Du skal angive både IP adresse eller værts navn og en port, for at indstille Tor til at bruge en proxy som forbindelse til Internettet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Du skal angive en eller flere porte, som din firewall tillader dig at "
-"tilslutte."
+msgstr "Du skal angive en eller flere porte, som din firewall tillader dig at tilslutte."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2626,9 +2576,7 @@ msgstr "'%1' er ikke et accepteret port nummer."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Kontroller, om dit lokale netværk kræver en proxy for at få adgang til "
-"Internettet"
+msgstr "Kontroller, om dit lokale netværk kræver en proxy for at få adgang til Internettet"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2652,9 +2600,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kryds for kun at forbinde til relæer der benytter porte godkendt af din "
-"firewall"
+msgstr "Kryds for kun at forbinde til relæer der benytter porte godkendt af din firewall"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2676,9 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Kryds for at kryptere mappe anmodninger, og eventuelt bruge bro relæer til "
-"at få adgang til Tor nettet"
+msgstr "Kryds for at kryptere mappe anmodninger, og eventuelt bruge bro relæer til at få adgang til Tor nettet"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2716,9 +2660,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ingen nye broer er tilgængelige i øjeblikket. Du kan enten vente en stund og"
-" forsøge igen, eller forsøge at finde nye broer med en anden metode."
+msgstr "Ingen nye broer er tilgængelige i øjeblikket. Du kan enten vente en stund og forsøge igen, eller forsøge at finde nye broer med en anden metode."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2745,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Du skal angive en eller flere broer."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "godkend"
@@ -2908,17 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Du har konfigureret Tor til at fungere som en relæ-bro for censureret "
-"brugere, men din version af Tor understøtter ikke broer."
+msgstr "Du har konfigureret Tor til at fungere som en relæ-bro for censureret brugere, men din version af Tor understøtter ikke broer."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Du skal opgradere din Tor software eller konfigurere Tor til at fungere som "
-"et normalt Tor relæ."
+msgstr "Du skal opgradere din Tor software eller konfigurere Tor til at fungere som et normalt Tor relæ."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2933,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Kør kun som en klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relæ trafik til Tor netværket"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Relæ Port:"
 
@@ -2988,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"For internetforbindelser med hurtig download hastighed, men langsom upload, "
-"skal du angive din upload hastighed her."
+msgstr "For internetforbindelser med hurtig download hastighed, men langsom upload, skal du angive din upload hastighed her."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3048,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Dit maksimale båndbredde grænse skal være større end eller lig med din "
-"gennemsnitlige båndbredde grænse. Begge værdier skal være mindst 20 kb/s."
+msgstr "Dit maksimale båndbredde grænse skal være større end eller lig med din gennemsnitlige båndbredde grænse. Begge værdier skal være mindst 20 kb/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3111,16 +3041,13 @@ msgstr "Vis hjælpe emne om afslutningspolitikker"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Hvilke Internet ressourcer skal brugere kunne få adgang til fra dit relæ?"
+msgstr "Hvilke Internet ressourcer skal brugere kunne få adgang til fra dit relæ?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor vil stadig blokere nogle udgående post og fildeling applikationer som "
-"standard for at reducere spam og anden misbrug."
+msgstr "Tor vil stadig blokere nogle udgående post og fildeling applikationer som standard for at reducere spam og anden misbrug."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3133,8 +3060,7 @@ msgstr "Lad andre få adgang til din bro ved at give dem denne linje:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Dette er identiteten af dit bro relæ, som du kan give til andre mennesker"
+msgstr "Dette er identiteten af dit bro relæ, som du kan give til andre mennesker"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3152,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Efterlad dit relæ kørende, så klienter har bedre chance for at finde og "
-"anvende det."
+msgstr "Efterlad dit relæ kørende, så klienter har bedre chance for at finde og anvende det."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3162,16 +3086,13 @@ msgstr "Historik for bro"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
-"Vidalia var ikke i stand til at indhente forbrugshistorik for din bro."
+msgstr "Vidalia var ikke i stand til at indhente forbrugshistorik for din bro."
 
 msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor returnerede et ukorrekt formatteret svar, da Vidalia forespurgte din "
-"bros forbrugshistorik."
+msgstr "Tor returnerede et ukorrekt formatteret svar, da Vidalia forespurgte din bros forbrugshistorik."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3194,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuer automatisk min bro-adresse"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Relætrafik for Tor-netværket (exit-relæ)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Relætrafik for Tor-netværket (ikke-exit-relæ)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spejl relækataloget"
 
@@ -3201,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Epost-adressen som du kan kontakte, hvis der er et\n"
-"problem med dit relæ. Du kan også inkludere din PGP- eller GPG-fingeraftryk."
+msgstr "Epost-adressen som du kan kontakte, hvis der er et\nproblem med dit relæ. Du kan også inkludere din PGP- eller GPG-fingeraftryk."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3213,9 +3140,7 @@ 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 ""
-"Opsæt mindst en tjeneste mappe og en virtuel port for hver tjeneste du vil "
-"gemme. Fjern de andre."
+msgstr "Opsæt mindst en tjeneste mappe og en virtuel port for hver tjeneste du vil gemme. Fjern de andre."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3310,10 +3235,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Klik \"Start Tor\" i Kontrolpanelet for Vidalia for at genstarte Tor-"
-"programmelet. Hvis Tor afsluttede uventet, så vælg \"Avanceret\"-fanen "
-"ovenfor for detaljer om hvilke fejl som opstod."
+msgstr "Klik \"Start Tor\" i Kontrolpanelet for Vidalia for at genstarte Tor-programmelet. Hvis Tor afsluttede uventet, så vælg \"Avanceret\"-fanen ovenfor for detaljer om hvilke fejl som opstod."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3321,10 +3243,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere "
-"anbefales. Opgradér venligst til den seneste version af softwaren, der kan "
-"indeholde vigtige rettelser vedrørende sikkerhed, pålidelighed og ydelse."
+msgstr "Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere anbefales. Opgradér venligst til den seneste version af softwaren, der kan indeholde vigtige rettelser vedrørende sikkerhed, pålidelighed og ydelse."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3332,11 +3251,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere "
-"fungerer med det nuværende Tor-netværk. Opgradér venligst til den seneste "
-"version af softwaren, der kan indeholde vigtige rettelser vedrørende "
-"sikkerhed, pålidelighed og ydelse."
+msgstr "Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere fungerer med det nuværende Tor-netværk. Opgradér venligst til den seneste version af softwaren, der kan indeholde vigtige rettelser vedrørende sikkerhed, pålidelighed og ydelse."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3350,10 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Vi var i stand til succesfuldt at etablere en forbindelse til Tor-netværket."
-" Du kan nu konfigurere dine applikationer til at anvende Internettet "
-"anonymt."
+msgstr "Vi var i stand til succesfuldt at etablere en forbindelse til Tor-netværket. Du kan nu konfigurere dine applikationer til at anvende Internettet anonymt."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3363,9 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Tor-softwaren stødte på en intern fejl. Rapportér venligst den følgende "
-"fejlbesked til Tor-udviklerne på bugs.torproject.org: \"%1\"\n"
+msgstr "Tor-softwaren stødte på en intern fejl. Rapportér venligst den følgende fejlbesked til Tor-udviklerne på bugs.torproject.org: \"%1\"\n"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3373,11 +3283,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor af afgjort at din maskines ur kan sætte til %1 sekunder tilbage i tid "
-"sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor "
-"ikke være i stand til at fungere. Bekræft venligst at maskinen viser den "
-"korrekte tid."
+msgstr "Tor af afgjort at din maskines ur kan sætte til %1 sekunder tilbage i tid sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor ikke være i stand til at fungere. Bekræft venligst at maskinen viser den korrekte tid."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3385,11 +3291,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor af afgjort at din maskines ur kan sætte til %1 sekunder frem i tid "
-"sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor "
-"ikke være i stand til at fungere. Bekræft venligst at maskinen viser den "
-"korrekte tid."
+msgstr "Tor af afgjort at din maskines ur kan sætte til %1 sekunder frem i tid sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor ikke være i stand til at fungere. Bekræft venligst at maskinen viser den korrekte tid."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3401,21 +3303,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret"
-" forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information "
-"over Tor-netværket er farligt og anbefales ikke. For din egen beskyttelse, "
-"så har Tor automatisk lukket denne forbindelse."
+msgstr "En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information over Tor-netværket er farligt og anbefales ikke. For din egen beskyttelse, så har Tor automatisk lukket denne forbindelse."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret"
-" forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information "
-"over Tor-netværket er farligt og anbefales ikke."
+msgstr "En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information over Tor-netværket er farligt og anbefales ikke."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3427,11 +3322,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"En af dine applikationer etablerede en forbindelse via Tor til \"%1\" ved "
-"hjælp af en protokol, der kan lække oplysninger om din destination. Sørg "
-"venligst for at konfigurere dine applikationer til kun at bruge SOCKS4a "
-"eller SOCKS5 med fjern værtsnavnsopløsning."
+msgstr "En af dine applikationer etablerede en forbindelse via Tor til \"%1\" ved hjælp af en protokol, der kan lække oplysninger om din destination. Sørg venligst for at konfigurere dine applikationer til kun at bruge SOCKS4a eller SOCKS5 med fjern værtsnavnsopløsning."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3442,11 +3333,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"En af dine applikationer forsøgte at etablere en forbindelse via Tor ved "
-"hjælp af en protokol, som Tor ikke forstår. Sørg venligst for at konfigurere"
-" dine applikationer til kun at bruge SOCKS4a eller SOCKS5 med fjerne "
-"værtsnavnopløsning."
+msgstr "En af dine applikationer forsøgte at etablere en forbindelse via Tor ved hjælp af en protokol, som Tor ikke forstår. Sørg venligst for at konfigurere dine applikationer til kun at bruge SOCKS4a eller SOCKS5 med fjerne værtsnavnopløsning."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3457,10 +3344,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"En af dine applikationer forsøgte at etablere en forbindelse gennem Tor til "
-"\"%1\", hvilken Tor ikke genkender som gyldigt værtsnavn. Tjek venligst din "
-"applikations konfiguration."
+msgstr "En af dine applikationer forsøgte at etablere en forbindelse gennem Tor til \"%1\", hvilken Tor ikke genkender som gyldigt værtsnavn. Tjek venligst din applikations konfiguration."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3471,10 +3355,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor har detekteret at dit relæs offentlige IP-adresse i øjeblikket er %1%2. "
-"Hvis dette ikke er korrekt, så overvej venligst at ændre indstillingen "
-"'Adresse' i dit relæs konfiguration."
+msgstr "Tor har detekteret at dit relæs offentlige IP-adresse i øjeblikket er %1%2. Hvis dette ikke er korrekt, så overvej venligst at ændre indstillingen 'Adresse' i dit relæs konfiguration."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3485,20 +3366,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor har detekteret at din DNS-udbyder udbyder falske svar for domæner som "
-"ikke eksisterer. Nogle internetudbydere, såsom OpenDNS, er kendt for at gøre"
-" dette for at kunne vise deres egen søgefunktion eller reklamesider."
+msgstr "Tor har detekteret at din DNS-udbyder udbyder falske svar for domæner som ikke eksisterer. Nogle internetudbydere, såsom OpenDNS, er kendt for at gøre dette for at kunne vise deres egen søgefunktion eller reklamesider."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor har detekteret at din DNS-udbyder udbyder falske svar for velkendte "
-"domæner. Da klienter afhænger af at Tor-netværkets relæer tilbyder akkurate "
-"DNS-svar, så vil det relæ ikke blive konfigureret som et udgående relæ."
+msgstr "Tor har detekteret at din DNS-udbyder udbyder falske svar for velkendte domæner. Da klienter afhænger af at Tor-netværkets relæer tilbyder akkurate DNS-svar, så vil det relæ ikke blive konfigureret som et udgående relæ."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3509,10 +3384,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor forsøger at afgøre om dit relæs serverport er tilgængelig fra Tor-"
-"netværket ved selv at tilslutte sig på %1:%2. Denne test kan tage flere "
-"minutter."
+msgstr "Tor forsøger at afgøre om dit relæs serverport er tilgængelig fra Tor-netværket ved selv at tilslutte sig på %1:%2. Denne test kan tage flere minutter."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3532,11 +3404,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Dit relæs serverport er ikke tilgængelig for andre Tor-klienter. Dette kan "
-"ske når du er bag en router eller brandmur som kræver at du opsætter port-"
-"videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og serverport, så"
-" tjek venligst dit relæs konfiguration."
+msgstr "Dit relæs serverport er ikke tilgængelig for andre Tor-klienter. Dette kan ske når du er bag en router eller brandmur som kræver at du opsætter port-videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og serverport, så tjek venligst dit relæs konfiguration."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3547,10 +3415,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor forsøger at afgøre om dit relæs katalogport er tilgængelig fra Tor-"
-"netværket ved selv at tilslutte på %1:%2. Denne test kan tage flere "
-"minutter. "
+msgstr "Tor forsøger at afgøre om dit relæs katalogport er tilgængelig fra Tor-netværket ved selv at tilslutte på %1:%2. Denne test kan tage flere minutter. "
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3570,11 +3435,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Dit relæs katalogport er ikke tilgængeligt fra andre Tor-klienter. Dette kan"
-" ske hvis du er bag en router eller brandmur som kræver at du opsætter port-"
-"videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og katalogport, "
-"så tjek venligst dit relæs konfiguration."
+msgstr "Dit relæs katalogport er ikke tilgængeligt fra andre Tor-klienter. Dette kan ske hvis du er bag en router eller brandmur som kræver at du opsætter port-videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og katalogport, så tjek venligst dit relæs konfiguration."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3584,10 +3445,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Dit relæs deskriptor, der gør det muligt for klienter at forbinde til dit "
-"relæ, blev afvist af katalogserveren på %1:%2. Begrundelsen som blev givet "
-"var: %3"
+msgstr "Dit relæs deskriptor, der gør det muligt for klienter at forbinde til dit relæ, blev afvist af katalogserveren på %1:%2. Begrundelsen som blev givet var: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3599,11 +3457,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Dit relæ er nu online og tilgængelig for anvendelse af Tor-klienter. Du bør "
-"kunne se en forøgelse i netværkstrafikken vist med Båndbredde-grafen inden "
-"for få timer i takt med at flere klienter finder frem til dit relæ. Tak for "
-"dit bidrag til Tor-netværket\"!"
+msgstr "Dit relæ er nu online og tilgængelig for anvendelse af Tor-klienter. Du bør kunne se en forøgelse i netværkstrafikken vist med Båndbredde-grafen inden for få timer i takt med at flere klienter finder frem til dit relæ. Tak for dit bidrag til Tor-netværket\"!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3665,9 +3519,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Gem indstillinger. Hvis umarkeret vil de kun blive anvendt på den aktuelle "
-"Tor-instans."
+msgstr "Gem indstillinger. Hvis umarkeret vil de kun blive anvendt på den aktuelle Tor-instans."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3781,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia var ude af stand til at søge efter tilgængelige "
-"softwareopdateringer, fordi det ikke kunne finde '%1'."
+msgstr "Vidalia var ude af stand til at søge efter tilgængelige softwareopdateringer, fordi det ikke kunne finde '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia var ude af stand til at søge efter tilgængelige "
-"softwareopdateringer, fordi Tor's opdateringsproces afsluttede uventet."
+msgstr "Vidalia var ude af stand til at søge efter tilgængelige softwareopdateringer, fordi Tor's opdateringsproces afsluttede uventet."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3966,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"En anden Vidalia-proces kører muligvis allerede. Hvis der ikke kører andre processer, så kan du vælge alligevel at fortsætte.\n"
-"\n"
-"Vil du gerne fortsætte med at starte Vidalia?  "
+msgstr "En anden Vidalia-proces kører muligvis allerede. Hvis der ikke kører andre processer, så kan du vælge alligevel at fortsætte.\n\nVil du gerne fortsætte med at starte Vidalia?  "
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4002,5 +3847,3 @@ msgstr "%1 timer"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 min."
-
-
diff --git a/src/vidalia/i18n/po/de/qt_de.po b/src/vidalia/i18n/po/de/qt_de.po
index 6aac76f..c750922 100644
--- a/src/vidalia/i18n/po/de/qt_de.po
+++ b/src/vidalia/i18n/po/de/qt_de.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # Hendrik Richter <hendrikr@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"Die Datei %1 existiert bereits.\n"
-"Soll sie überschrieben werden?"
+msgstr "Die Datei %1 existiert bereits.\nSoll sie überschrieben werden?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Die Datei konnte nicht gefunden werden.\n"
-"Stellen Sie sicher, dass der Dateiname richtig ist."
+msgstr "%1\nDie Datei konnte nicht gefunden werden.\nStellen Sie sicher, dass der Dateiname richtig ist."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Das Verzeichnis konnte nicht gefunden werden.\n"
-"Stellen Sie sicher, dass der Verzeichnisname richtig ist."
+msgstr "%1\nDas Verzeichnis konnte nicht gefunden werden.\nStellen Sie sicher, dass der Verzeichnisname richtig ist."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' ist schreibgeschützt.\n"
-"Möchten Sie die Datei trotzdem löschen?"
+msgstr "'%1' ist schreibgeschützt.\nMöchten Sie die Datei trotzdem löschen?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Der Name \"%1\" kann nicht verwendet werden.</b><p>Versuchen Sie, die "
-"Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden."
+msgstr "<b>Der Name \"%1\" kann nicht verwendet werden.</b><p>Versuchen Sie, die Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 Byte"
-
-
diff --git a/src/vidalia/i18n/po/de/vidalia_de.po b/src/vidalia/i18n/po/de/vidalia_de.po
index afda12e..904fef0 100644
--- a/src/vidalia/i18n/po/de/vidalia_de.po
+++ b/src/vidalia/i18n/po/de/vidalia_de.po
@@ -2,14 +2,16 @@
 # Translators:
 # bastik <bastik.tor@xxxxxxxxxxxxxx>, 2011.
 # cosimacosa <leccefv@xxxxxxxxx>, 2011.
+#   <f.schima@xxxxxxxxxxxxxx>, 2012.
 # Hendrik Richter <hendrikr@xxxxxxxxx>, 2011.
+#   <koloman375@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-13 23:02+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-23 19:14+0000\n"
 "Last-Translator: Sacro <Scion@xxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -46,9 +48,7 @@ msgstr "'%1' ist keine gültige IP-Adresse."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Sie haben 'Passwort'-Authentifizierung ausgewählt, aber kein Passwort "
-"angegeben."
+msgstr "Sie haben 'Passwort'-Authentifizierung ausgewählt, aber kein Passwort angegeben."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -120,8 +120,7 @@ msgstr "Tor-Konfigurationsdatei"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Starte die Tor-Software mit der angegebenen Konfigurationsdatei (torrc)"
+msgstr "Starte die Tor-Software mit der angegebenen Konfigurationsdatei (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -141,9 +140,7 @@ msgstr "Speichere Daten für die Tor-Software im folgenden Verzeichnis"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Wählen Sie das Verzeichnis, das verwendet wird, um Daten für die Tor-"
-"Software zu speichern"
+msgstr "Wählen Sie das Verzeichnis, das verwendet wird, um Daten für die Tor-Software zu speichern"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -177,19 +174,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, "
-"die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht "
-"dargestellt werden können."
+msgstr "Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht dargestellt werden können."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, "
-"die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht "
-"dargestellt werden können."
+msgstr "Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht dargestellt werden können."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -213,13 +204,17 @@ msgstr "Konfiguriere den Kontroll-Port automatisch."
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Du hast die Option für die automatische Konfiguration für ControlPort ausgewählt, allerdings kein Datenverzeichniss angegeben. Bitte füge ein Datenverzeichniss hinzu, oder schalte die \"Konfiguriere ControlPort automatisch\" Option ab."
+
+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"
-"\n"
-"Sie müssen diesen manuell entfernen."
+msgstr "Vidalia konnte den Tor-Dienst nicht entfernen\n\nSie müssen diesen manuell entfernen."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -241,6 +236,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 "System Icon Einstellungen (Ã?nderungen werden nach Vidalia Neustart wirksam)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Tray Icon und Dock Icon anzeigen (Standard)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Tray Icon verstecken"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Dock Icon verstecken"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Seit:"
@@ -335,8 +347,7 @@ msgstr "Anzahl der Clients"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"Rechner aus den folgenden Ländern haben deinen Tor-Server seit %1 benutzt"
+msgstr "Rechner aus den folgenden Ländern haben deinen Tor-Server seit %1 benutzt"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -462,9 +473,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia hat sich zu einem laufenden Tor-Prozess verbunden, der ein Passwort "
-"benötigt. Bitte gib das Kontroll-Passwort ein:"
+msgstr "Vidalia hat sich zu einem laufenden Tor-Prozess verbunden, der ein Passwort benötigt. Bitte gib das Kontroll-Passwort ein:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1302,9 +1311,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Leider konnte Vidalia nicht automatisch neu gestartet werden. Bitte starten "
-"Sie Vidalia händisch neu."
+msgstr "Leider konnte Vidalia nicht automatisch neu gestartet werden. Bitte starten Sie Vidalia händisch neu."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1314,27 +1321,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Ein Crash-Bericht wurde erstellt, den du an die entwickler von Vidalia "
-"senden kannst, damit das Problem schneller erkannt und beseitigt werden "
-"kann. Der gesendete Bericht enthält keine Persöhnlichen Informationen."
+msgstr "Ein Crash-Bericht wurde erstellt, den du an die entwickler von Vidalia senden kannst, damit das Problem schneller erkannt und beseitigt werden kann. Der gesendete Bericht enthält keine Persöhnlichen Informationen."
 
 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 ""
-"mit einer Beschreibung was sie getan haben bevor die Anwendung abgestürzt "
-"ist, zusammen mit den folgenden Dateien, die zu dem Bericht gehören:"
+msgstr "mit einer Beschreibung was sie getan haben bevor die Anwendung abgestürzt ist, zusammen mit den folgenden Dateien, die zu dem Bericht gehören:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1553,10 +1553,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia kann den gewählten Link in Ihrem Standard-Webbrowser öffnen. Wenn "
-"der Browser jedoch nicht für die Nutzung von Tor konfiguriert ist, wird die "
-"Anfrage nicht anonym sein."
+msgstr "Vidalia kann den gewählten Link in Ihrem Standard-Webbrowser öffnen. Wenn der Browser jedoch nicht für die Nutzung von Tor konfiguriert ist, wird die Anfrage nicht anonym sein."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1570,9 +1567,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia konnte den gewählten Link nicht im Webbrowser öffnen. Sie können "
-"aber die URL kopieren und sie in Ihrem Browser einfügen."
+msgstr "Vidalia konnte den gewählten Link nicht im Webbrowser öffnen. Sie können aber die URL kopieren und sie in Ihrem Browser einfügen."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1783,10 +1778,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"
 
@@ -1854,9 +1845,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia konnte Tor nicht starten. �berprüfen Sie Ihre Einstellungen, um "
-"sicherzustellen, dass der Pfad zur Tor-Anwendung korrekt angegeben ist."
+msgstr "Vidalia konnte Tor nicht starten. �berprüfen Sie Ihre Einstellungen, um sicherzustellen, dass der Pfad zur Tor-Anwendung korrekt angegeben ist."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1894,10 +1883,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Die Tor-Software fordert Vidalia dazu auf den Inhalt eines "
-"Authentifizierungskennworts zu schicken, aber Vidalia konnte kein solches "
-"finden."
+msgstr "Die Tor-Software fordert Vidalia dazu auf den Inhalt eines Authentifizierungskennworts zu schicken, aber Vidalia konnte kein solches finden."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1919,9 +1905,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia konnte sich für einige Ereignisse nicht registrieren. Einige von "
-"Vidalias Funktionen könnten nicht verfügbar sein."
+msgstr "Vidalia konnte sich für einige Ereignisse nicht registrieren. Einige von Vidalias Funktionen könnten nicht verfügbar sein."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1929,14 +1913,11 @@ msgstr "Authentifizierungsfehler"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Vidalia konnte keine Authentifizierung gegenüber der Tor-Software "
-"durchführen. (%1)"
+msgstr "Vidalia konnte keine Authentifizierung gegenüber der Tor-Software durchführen. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Bitte überprüfen Sie die Authentifikationseinstellungen des Kontroll-Ports."
+msgstr "Bitte überprüfen Sie die Authentifikationseinstellungen des Kontroll-Ports."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1946,10 +1927,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. "
-"Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu "
-"laden."
+msgstr "Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu laden."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1959,8 +1937,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Alle folgenden Verbindungen werden anders als alte Verbindungen erscheinen."
+msgstr "Alle folgenden Verbindungen werden anders als alte Verbindungen erscheinen."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2055,25 +2032,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia versuchte das Tor Kontroll-Passwort zurückzusetzen, konnte die Tor "
-"Software aber nicht neu starten. Bitte überprüfen Sie im Task Manager, ob "
-"nicht andere Tor Prozesse laufen."
+msgstr "Vidalia versuchte das Tor Kontroll-Passwort zurückzusetzen, konnte die Tor Software aber nicht neu starten. Bitte überprüfen Sie im Task Manager, ob nicht andere Tor Prozesse laufen."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. "
-"Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu "
-"laden."
+msgstr "Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu laden."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Wollen Sie überpüfen, ob eine neuere Version zur Installation verfügbar ist?"
+msgstr "Wollen Sie überpüfen, ob eine neuere Version zur Installation verfügbar ist?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2083,9 +2053,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor hat Ihre Verbindung automatisch geschlossen, um Ihre Anonymität zu "
-"schützen."
+msgstr "Tor hat Ihre Verbindung automatisch geschlossen, um Ihre Anonymität zu schützen."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2118,10 +2086,25 @@ 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."
-msgstr ""
-"Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. "
-"Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie "
-"wenn möglich nur verschlüsselte Protokolle wie SSL. "
+msgstr "Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie wenn möglich nur verschlüsselte Protokolle wie SSL. "
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc von %1 zu %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(vermutlich Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(vermutlich ein Email Client)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2131,49 +2114,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Ihr Relais wird beendet.\n"
-"Klicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
+msgstr "Ihr Relais wird beendet.\nKlicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc von %1 zu %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia kann nicht mit Tor kommunizieren, da es keinen zugriff auf diese datei hat: %1\n\nHier ist die letzte Fehlermeldung:\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 "Es scheint als würde Tor nicht mehr funktionieren seit Vidalia es gestartet hat.\n\nSiehe im Erweiterten Nachrichten-Log nach, um mehr Informationen zu erhalten."
 
 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?"
-msgstr ""
-"Momentan läuft bei Ihnen eine Tor-Brücke. Wenn Sie diese beenden, werden alle darüber aktiven Verbindungen unterbrochen.\n"
-"\n"
-"Wollen Sie durch ein angekündigtes Beenden den verbundenen Rechnern die Möglichkeit geben eine andere Tor-Brücke zu finden? (das kann etwas dauern)"
+msgstr "Momentan läuft bei Ihnen eine Tor-Brücke. Wenn Sie diese beenden, werden alle darüber aktiven Verbindungen unterbrochen.\n\nWollen Sie durch ein angekündigtes Beenden den verbundenen Rechnern die Möglichkeit geben eine andere Tor-Brücke zu finden? (das kann etwas dauern)"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia entdeckte dass Tor unerwartet beendet wurde.\n"
-"\n"
-"Bitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(vermutlich Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(vermutlich ein Email Client)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell "
-"unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen."
+msgstr "Vidalia entdeckte dass Tor unerwartet beendet wurde.\n\nBitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2197,8 +2167,7 @@ msgstr "Name der Logdatei wird benötigt"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Sie müssen einen Dateinamen angeben, um die Logdaten speichern zu können."
+msgstr "Sie müssen einen Dateinamen angeben, um die Logdaten speichern zu können."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2422,8 +2391,7 @@ msgstr "Ã?ffnen"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Das automatische Speichern aller neuen Nachrichten in eine Datei aktivieren"
+msgstr "Das automatische Speichern aller neuen Nachrichten in eine Datei aktivieren"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2449,17 +2417,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Meldung, welche erscheint, wenn etwas mit Tor schief \n"
-"gegangen ist, und es nicht mehr weiter laufen kann."
+msgstr "Meldung, welche erscheint, wenn etwas mit Tor schief \ngegangen ist, und es nicht mehr weiter laufen kann."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Meldung, welche nur erscheint, wenn \n"
-"etwas mit Tor schief gegangen ist."
+msgstr "Meldung, welche nur erscheint, wenn \netwas mit Tor schief gegangen ist."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2467,37 +2431,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Meldungen, die in unregelmässigen Abständen erscheinen\n"
-"und nicht offensichtlich als Fehler erkennbar sind\n"
-"sollten unkritisch sein. \n"
-"Dennoch sollten Sie diese beachten."
+msgstr "Meldungen, die in unregelmässigen Abständen erscheinen\nund nicht offensichtlich als Fehler erkennbar sind\nsollten unkritisch sein. \nDennoch sollten Sie diese beachten."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Meldungen die in regelmä�igen Abständen \n"
-"im laufenden Betrieb erscheinen."
+msgstr "Meldungen die in regelmä�igen Abständen \nim laufenden Betrieb erscheinen."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Extrem aussagekräftige Meldungen die hauptsächlich\n"
-"für Tor Entwickler interessant sind."
+msgstr "Extrem aussagekräftige Meldungen die hauptsächlich\nfür Tor Entwickler interessant sind."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Kann Datei %1 nicht speichern\n"
-"\n"
-"%2"
+msgstr "Kann Datei %1 nicht speichern\n\n%2"
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2604,14 +2557,6 @@ msgid "Ctrl+F"
 msgstr "Strg+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ungültige Brücke"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Die angegebene Brücke ist nicht gültig."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopieren (Strg+C)"
 
@@ -2619,17 +2564,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Sie müssen eine IP-Adresse oder einen Hostnamen und eine Portnummer abgeben,"
-" damit Tor einen Proxy für die Internetverbindung benutzt."
+msgstr "Sie müssen eine IP-Adresse oder einen Hostnamen und eine Portnummer abgeben, damit Tor einen Proxy für die Internetverbindung benutzt."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Sie müssen einen oder mehrere Ports angeben, zu der Ihre Firewall "
-"Verbindungen erlaubt."
+msgstr "Sie müssen einen oder mehrere Ports angeben, zu der Ihre Firewall Verbindungen erlaubt."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2637,9 +2578,7 @@ msgstr "'%1' ist keine gültige Port-Nummer."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Anklicken, wenn Ihr lokales Netzwerk einen Proxy für den Internetzugriff "
-"benötigt"
+msgstr "Anklicken, wenn Ihr lokales Netzwerk einen Proxy für den Internetzugriff benötigt"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2663,9 +2602,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Anklicken, wenn Ihre Firewall nur bestimmte Ports zur Verbindung mit Relays "
-"zulässt"
+msgstr "Anklicken, wenn Ihre Firewall nur bestimmte Ports zur Verbindung mit Relays zulässt"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2687,9 +2624,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Anklicken, damit Anfragen an das Verzeichnis verschlüsselt und Tor-Brücken "
-"zum Zugriff auf das Tor-Netzwerk verwendet werden"
+msgstr "Anklicken, damit Anfragen an das Verzeichnis verschlüsselt und Tor-Brücken zum Zugriff auf das Tor-Netzwerk verwendet werden"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2727,15 +2662,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Aktuell sind keine neuen Bridges verfügbar. Sie können entweder warten und "
-"es später erneut versuchen oder andere Methoden versuchen um neue Bridges zu"
-" finden."
+msgstr "Aktuell sind keine neuen Bridges verfügbar. Sie können entweder warten und es später erneut versuchen oder andere Methoden versuchen um neue Bridges zu finden."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Klicken Sie auf Hilfe, um mit anderen Methoden neue Brücken zu finden."
+msgstr "Klicken Sie auf Hilfe, um mit anderen Methoden neue Brücken zu finden."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2758,13 +2689,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Du musst eine oder mehrere Bridges festlegen."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "annehmen"
@@ -2921,17 +2852,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Sie haben Tor so konfiguriert, dass es als Brückenverteiler für zensierte "
-"Nutzer dient, aber Ihre Tor-Version unterstützt Brücken nicht."
+msgstr "Sie haben Tor so konfiguriert, dass es als Brückenverteiler für zensierte Nutzer dient, aber Ihre Tor-Version unterstützt Brücken nicht."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Bitte aktualisieren Sie Ihre Tor-Version oder konfigurieren Sie Tor so, dass"
-" es als normaler Verteiler arbeitet."
+msgstr "Bitte aktualisieren Sie Ihre Tor-Version oder konfigurieren Sie Tor so, dass es als normaler Verteiler arbeitet."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2946,10 +2873,6 @@ msgid "Run as a client only"
 msgstr "Benutze Tor nur als Client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Verkehr für das Tor-Netzwerk weiterleiten"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Verteiler-Port:"
 
@@ -2987,8 +2910,7 @@ msgstr "Name deines Relays"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Port, auf dem andere Benutzer und Relays deinen Relay kontaktieren können"
+msgstr "Port, auf dem andere Benutzer und Relays deinen Relay kontaktieren können"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -3002,9 +2924,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Bei Internetverbindungen mit hoher Downloadgeschwindigkeit aber niedriger "
-"Uploadgeschwindigkeitgeben Sie Ihre Uploadgeschwindigkeit bitte hier an."
+msgstr "Bei Internetverbindungen mit hoher Downloadgeschwindigkeit aber niedriger Uploadgeschwindigkeitgeben Sie Ihre Uploadgeschwindigkeit bitte hier an."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3032,8 +2952,7 @@ msgstr "Benutzerdefiniert"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Wählen Sie den Eintrag der Ihrer Internetverbindung am ehesten entspricht"
+msgstr "Wählen Sie den Eintrag der Ihrer Internetverbindung am ehesten entspricht"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
@@ -3063,10 +2982,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Ihre maximale Bandbreite muss grö�er oder gleich gro� wie die "
-"durchschnittliche Bandbreite sein. Beide Werte müssen mindestens 20 KB/s "
-"betragen."
+msgstr "Ihre maximale Bandbreite muss grö�er oder gleich gro� wie die durchschnittliche Bandbreite sein. Beide Werte müssen mindestens 20 KB/s betragen."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3127,17 +3043,13 @@ msgstr "Zeige Hilfe zu Exit-Regeln"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Welche Internetressourcen sollen Benutzer von deinem Relay aus zugreifen "
-"dürfen?"
+msgstr "Welche Internetressourcen sollen Benutzer von deinem Relay aus zugreifen dürfen?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor blockiert standardmä�ig weiterhin einige Mailversand- und Filesharing-"
-"Programme, um Spam und anderen MiÃ?brauch zu vermindern."
+msgstr "Tor blockiert standardmä�ig weiterhin einige Mailversand- und Filesharing-Programme, um Spam und anderen Mi�brauch zu vermindern."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3145,15 +3057,12 @@ msgstr "Exit-Regeln"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Lasse andere Benutzer auf deine Tor-Brücke zugreifen, indem du ihnen diese "
-"Zeile gibst:"
+msgstr "Lasse andere Benutzer auf deine Tor-Brücke zugreifen, indem du ihnen diese Zeile gibst:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Dies ist die Identität deiner Tor-Brücke, die du anderen Leute geben kannst"
+msgstr "Dies ist die Identität deiner Tor-Brücke, die du anderen Leute geben kannst"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3171,9 +3080,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Lassen sie bitte ihre Tor-Brücke aktiv damit andere Nutzer eine grö�ere "
-"Chance haben diese zu finden und zu nutzen."
+msgstr "Lassen sie bitte ihre Tor-Brücke aktiv damit andere Nutzer eine grö�ere Chance haben diese zu finden und zu nutzen."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3187,9 +3094,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor erhielt einen Rückgabewert mit falscher Formatierung als Ergebnis einer "
-"Vidalia Anfrage zu ihrer Tor-Brücke."
+msgstr "Tor erhielt einen Rückgabewert mit falscher Formatierung als Ergebnis einer Vidalia Anfrage zu ihrer Tor-Brücke."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3212,6 +3117,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Meine Bridge-Adresse automatisch verteilen"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Relais-Verkehr für das Tor-Netzwerk (ausgangs Relais)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Relais-Verkehr im Tor-Netzwerk (kein ausgangs Relais)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spiegele das Relay Verzeichnis"
 
@@ -3219,9 +3132,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Kontakt E-Mail-Adresse, über welche du im Falle eines \n"
-"Problemes informiert werden kannst. Du kannst auch deinen PGP oder GPG Fingerabdruck mit angeben."
+msgstr "Kontakt E-Mail-Adresse, über welche du im Falle eines \nProblemes informiert werden kannst. Du kannst auch deinen PGP oder GPG Fingerabdruck mit angeben."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3231,9 +3142,7 @@ 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."
+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"
@@ -3249,14 +3158,11 @@ 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]."
+msgstr "Der virtuelle Port darf nur gültige Port-Nummern enthalten [1..65535]."
 
 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."
+msgstr "Das Ziel darf nur Einträge der Form Adresse:Port, Adresse oder Port enthalten."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
@@ -3304,8 +3210,7 @@ msgstr "Kopiere die Onion-Adresse in die Zwischenablage"
 
 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"
+msgstr "Durchsuchen Sie ihr lokales Dateisystem um ein Verzeichnis auszuwählen"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3332,10 +3237,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Klicken Sie auf \"Tor starten\" in der Vidalia Systemsteuerung um Tor "
-"neuzustarten. Falls Tor unerwartet beendet wurde, klicken Sie auf die "
-"Registerkarte \"Erweitert\" für weitere Einzelheiten zu etwaigen Fehlern."
+msgstr "Klicken Sie auf \"Tor starten\" in der Vidalia Systemsteuerung um Tor neuzustarten. Falls Tor unerwartet beendet wurde, klicken Sie auf die Registerkarte \"Erweitert\" für weitere Einzelheiten zu etwaigen Fehlern."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3343,11 +3245,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Sie verwenden zur Zeit Version \"%1\" der Tor-Software. Diese wird nicht "
-"mehr empfohlen. Bitte aktualisieren Sie auf die aktuellste Version der "
-"Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, "
-"Stabilität und Performance enthalten kann."
+msgstr "Sie verwenden zur Zeit Version \"%1\" der Tor-Software. Diese wird nicht mehr empfohlen. Bitte aktualisieren Sie auf die aktuellste Version der Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3355,11 +3253,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Sie verwenden zur Zeit Version \"%1\" der Tor-Software, diese funktioniert "
-"evt. nicht mehr mit dem aktuellen Tor-Netzwerk. Bitte aktualisieren Sie auf "
-"die aktuellste Version der Software, da diese wichtige Verbesserungen "
-"hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
+msgstr "Sie verwenden zur Zeit Version \"%1\" der Tor-Software, diese funktioniert evt. nicht mehr mit dem aktuellen Tor-Netzwerk. Bitte aktualisieren Sie auf die aktuellste Version der Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3373,9 +3267,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Es wurde eine Verbindung zum Tor-Netzwerk erfolgreich hergestellt. Sie "
-"können jetzt Ihre Programme konfigurieren um das Internet anonym zu nützen."
+msgstr "Es wurde eine Verbindung zum Tor-Netzwerk erfolgreich hergestellt. Sie können jetzt Ihre Programme konfigurieren um das Internet anonym zu nützen."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3385,10 +3277,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Die Tor-Software hat einen internen Fehler entdeckt. Bitte informieren Sie "
-"die Tor-Entwickler über die folgendene Fehlermeldung via "
-"bugs.torproject.org: \"%1\""
+msgstr "Die Tor-Software hat einen internen Fehler entdeckt. Bitte informieren Sie die Tor-Entwickler über die folgendene Fehlermeldung via bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3396,11 +3285,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden "
-"zurückgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig "
-"eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr "
-"Computer die richtige Zeit verwendet. "
+msgstr "Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden zurückgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr Computer die richtige Zeit verwendet. "
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3408,11 +3293,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden "
-"vorgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig "
-"eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr "
-"Computer die richtige Zeit verwendet. "
+msgstr "Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden vorgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr Computer die richtige Zeit verwendet. "
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3424,21 +3305,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
+msgstr "One of the applications on your computer may have attempted to make an unencrypted connection through Tor to port %1. Sending unencrypted information over the Tor network is dangerous and not recommended. For your protection, Tor has automatically closed this connection."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Eines Ihrer Programme auf Ihrem Computer hat wahrscheinlich versucht eine "
-"unverschlüsselte Verbindung durch Tor zu Port %1 herzustellen. Das Senden "
-"von unverschlüsselten Informationen ist gefährlich und nicht empfehlenswert."
+msgstr "Eines Ihrer Programme auf Ihrem Computer hat wahrscheinlich versucht eine unverschlüsselte Verbindung durch Tor zu Port %1 herzustellen. Das Senden von unverschlüsselten Informationen ist gefährlich und nicht empfehlenswert."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3450,11 +3324,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Eines Ihrer Programme hat eine Verbindung durch Tor zu \"%1\" hergestellt. "
-"Es verwendet ein Protokoll, welches Informationen über Ihr Ziel preisgeben "
-"könnte. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass "
-"diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
+msgstr "Eines Ihrer Programme hat eine Verbindung durch Tor zu \"%1\" hergestellt. Es verwendet ein Protokoll, welches Informationen über Ihr Ziel preisgeben könnte. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3465,11 +3335,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Eines Ihrer Programme hat versucht mit einem für Tor unbekannten Protokoll "
-"eine Verbindung durch Tor herzustellen. Bitte stellen Sie sicher Ihre "
-"Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit "
-"\"Remote\" Hostnamen-Auflösung verwenden."
+msgstr "Eines Ihrer Programme hat versucht mit einem für Tor unbekannten Protokoll eine Verbindung durch Tor herzustellen. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3480,10 +3346,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Eines Ihrer Programme hat versucht eine Verbindung durch Tor zu \"%1\" "
-"herzustellen, was Tor nicht als gültigen Hostnamen erkannt hat. Bitte "
-"überprüfen Sie die Konfiguration Ihres Programms."
+msgstr "Eines Ihrer Programme hat versucht eine Verbindung durch Tor zu \"%1\" herzustellen, was Tor nicht als gültigen Hostnamen erkannt hat. Bitte überprüfen Sie die Konfiguration Ihres Programms."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3494,10 +3357,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor hat festgestellt, dass die öffentliche IP Adresse Ihres Relays momentan "
-"%1%2 ist. Falls dies nicht korrekt ist, erwägen Sie die \"Adress\"-Option in"
-" Ihrer Relay-Konfiguration zu setzten."
+msgstr "Tor hat festgestellt, dass die öffentliche IP Adresse Ihres Relays momentan %1%2 ist. Falls dies nicht korrekt ist, erwägen Sie die \"Adress\"-Option in Ihrer Relay-Konfiguration zu setzten."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3508,21 +3368,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für nicht "
-"existierende Domains liefert. Einige ISPs und DNS-Provider, wie z.B. "
-"OpenDNS, sind dafür bekannt dies zu tun um ihre eigenen Such- oder Werbe- "
-"seiten anzuzeigen."
+msgstr "Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für nicht existierende Domains liefert. Einige ISPs und DNS-Provider, wie z.B. OpenDNS, sind dafür bekannt dies zu tun um ihre eigenen Such- oder Werbe- seiten anzuzeigen."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für wohlbekannte "
-"Domains liefert. Da Tor auf akkurate DNS Antworten angewiesen ist, wird Ihr "
-"Relay nicht als Exit verwendet."
+msgstr "Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für wohlbekannte Domains liefert. Da Tor auf akkurate DNS Antworten angewiesen ist, wird Ihr Relay nicht als Exit verwendet."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3533,10 +3386,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor versucht festzustellen, ob Ihr Relay-Server Port durch das Tor-Netzwerk "
-"erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige"
-" Minuten dauern."
+msgstr "Tor versucht festzustellen, ob Ihr Relay-Server Port durch das Tor-Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige Minuten dauern."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3556,12 +3406,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Ihr Relay-Server Port ist für andere Tor-Clients nicht erreichbar. Dies kann"
-" passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies "
-"erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. Ihrer "
-"Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Server Port "
-"sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
+msgstr "Ihr Relay-Server Port ist für andere Tor-Clients nicht erreichbar. Dies kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Server Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3572,10 +3417,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor versucht festzustellen, ob Ihr Relay-Verzeichnis Port durch das Tor-"
-"Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies "
-"könnte einige Minuten dauern."
+msgstr "Tor versucht festzustellen, ob Ihr Relay-Verzeichnis Port durch das Tor-Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige Minuten dauern."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3595,12 +3437,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Ihr Relay-Verzeichnis Port ist für andere Tor-Clients nicht erreichbar. Dies"
-" kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. "
-"Dies erfordert Port-Weiterleitung in der Konfiguration Ihres Routers bzw. "
-"Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr "
-"Verzeichnis Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
+msgstr "Ihr Relay-Verzeichnis Port ist für andere Tor-Clients nicht erreichbar. Dies kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies erfordert Port-Weiterleitung in der Konfiguration Ihres Routers bzw. Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Verzeichnis Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3610,9 +3447,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Ihr Relay Identifikator, der Clients ermöglicht sich zu Ihrem Relay zu "
-"verbinden, wurde vom Verzeichnis-Server %1:%2 abgewiesen. Der Grund war: %3"
+msgstr "Ihr Relay Identifikator, der Clients ermöglicht sich zu Ihrem Relay zu verbinden, wurde vom Verzeichnis-Server %1:%2 abgewiesen. Der Grund war: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3624,11 +3459,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Ihr Relay ist nun Online und kann von Tor-Clients verwendet werden. Sie "
-"sollten innerhalb weniger Stunden, während mehr Clients Ihr Relay "
-"\"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. "
-"Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
+msgstr "Ihr Relay ist nun Online und kann von Tor-Clients verwendet werden. Sie sollten innerhalb weniger Stunden, während mehr Clients Ihr Relay \"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3690,9 +3521,7 @@ 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."
+msgstr "Einstellungen speichern. Falls nicht ausgewählt werden die Einstellungen nur auf die aktuelle Tor-Instanz angewandt."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3732,9 +3561,7 @@ 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\""
+msgstr "Auswahl ist leer. Bitte wählen Sie einen Text aus oder verwenden Sie \"Alles anwenden\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3808,17 +3635,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia konnte nicht nach verfügbaren Updates suchen, da '%1' nicht gefunden"
-" werden konnte."
+msgstr "Vidalia konnte nicht nach verfügbaren Updates suchen, da '%1' nicht gefunden werden konnte."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia konnte nicht nach verfügbaren Updates suchen, da der Updateprozess "
-"unerwartet unterbrochen wurde."
+msgstr "Vidalia konnte nicht nach verfügbaren Updates suchen, da der Updateprozess unerwartet unterbrochen wurde."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3870,9 +3693,7 @@ msgstr "Installieren"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Folgend Softwarepakete wurden aktualisiert und stehen zur Installation "
-"bereit:"
+msgstr "Folgend Softwarepakete wurden aktualisiert und stehen zur Installation bereit:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3995,10 +3816,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Evtl. läuft schon ein anderer Vidalia-Prozess. Sollte wirklich kein anderer Prozess laufen, kannst du fortfahren.\n"
-"\n"
-"Möchtest du Vidalia starten?"
+msgstr "Evtl. läuft schon ein anderer Vidalia-Prozess. Sollte wirklich kein anderer Prozess laufen, kannst du fortfahren.\n\nMöchtest du Vidalia starten?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4031,5 +3849,3 @@ msgstr "%1 Stunden"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 Minuten"
-
-
diff --git a/src/vidalia/i18n/po/de_CH/qt_de_CH.po b/src/vidalia/i18n/po/de_CH/qt_de_CH.po
index 65a6e3b..0fb7c54 100644
--- a/src/vidalia/i18n/po/de_CH/qt_de_CH.po
+++ b/src/vidalia/i18n/po/de_CH/qt_de_CH.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
index 9928779..526ccea 100755
--- a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
+++ b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/de_DE/qt_de_DE.po b/src/vidalia/i18n/po/de_DE/qt_de_DE.po
index 65e9f5d..a44116d 100644
--- a/src/vidalia/i18n/po/de_DE/qt_de_DE.po
+++ b/src/vidalia/i18n/po/de_DE/qt_de_DE.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po b/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po
index cd31a6d..554b5d3 100755
--- a/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po
+++ b/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po
@@ -1,2682 +1,3816 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-11-24 15:59+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:16
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr ""
 
-#: aboutdialog.ui:53
 msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-#: aboutdialog.ui:88
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-#: aboutdialog.ui:69
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-#: aboutdialog.cpp:53
-msgctxt "AboutDialog"
-msgid "Unavailable"
-msgstr ""
-
-#: aboutdialog.cpp:57
-msgctxt "AboutDialog"
-msgid "Not Running"
-msgstr ""
-
-#: aboutdialog.ui:81
-msgctxt "AboutDialog"
-msgid "0.2.0"
-msgstr ""
-
-#: aboutdialog.ui:106
-msgctxt "AboutDialog"
-msgid "0.2.0.31-alpha-dev (r123456)"
+msgid "License"
 msgstr ""
 
-#: aboutdialog.ui:131
 msgctxt "AboutDialog"
-msgid "4.4.2"
+msgid "Vidalia 0.2.0"
 msgstr ""
 
-#: aboutdialog.ui:107
 msgctxt "AboutDialog"
-msgid "License"
+msgid "Tor 0.2.0.32"
 msgstr ""
 
-#: aboutdialog.ui:163
 msgctxt "AboutDialog"
-msgid "version"
+msgid "Qt 4.4.2"
 msgstr ""
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
-#: advancedpage.cpp:120
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr ""
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr ""
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr ""
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr ""
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr ""
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr ""
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:289
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service."
-""
-"You may need to remove it manually."
-msgstr ""
-
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr ""
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
 msgstr ""
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr ""
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr ""
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
 msgstr ""
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ""
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr ""
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
 msgstr ""
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
 msgstr ""
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
 msgstr ""
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
 msgstr ""
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
 msgstr ""
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
-#: appearancepage.ui:22
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
 
-#: appearancepage.ui:37
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
 msgstr ""
 
-#: appearancepage.ui:75
 msgctxt "AppearancePage"
 msgid "Style"
 msgstr ""
 
-#: appearancepage.ui:103
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
 msgstr ""
 
-#: appearancepage.cpp:67
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
-#: bwgraph.cpp:166
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
 
-#: bwgraph.cpp:232
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
 msgstr ""
 
-#: bwgraph.ui:40
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
 msgstr ""
 
-#: bwgraph.ui:16
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
 msgstr ""
 
-#: bwgraph.ui:63
 msgctxt "BandwidthGraph"
 msgid "Reset"
 msgstr ""
 
-#: bwgraph.ui:151
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
 msgstr ""
 
-#: bwgraph.ui:170
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
 msgstr ""
 
-#: bwgraph.ui:183
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
 msgstr ""
 
-#: bwgraph.ui:234
 msgctxt "BandwidthGraph"
 msgid "Style"
 msgstr ""
 
-#: bwgraph.ui:284
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
 msgstr ""
 
-#: bwgraph.ui:368
 msgctxt "BandwidthGraph"
 msgid "100"
 msgstr ""
 
-#: bwgraph.ui:383
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
 msgstr ""
 
-#: bwgraph.ui:443
 msgctxt "BandwidthGraph"
 msgid "Save"
 msgstr ""
 
-#: bwgraph.ui:450
 msgctxt "BandwidthGraph"
 msgid "Cancel"
 msgstr ""
 
-#: circuit.cpp:112
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
 msgctxt "Circuit"
 msgid "New"
 msgstr ""
 
-#: circuit.cpp:113
 msgctxt "Circuit"
 msgid "Open"
 msgstr ""
 
-#: circuit.cpp:114
 msgctxt "Circuit"
 msgid "Building"
 msgstr ""
 
-#: circuit.cpp:115
 msgctxt "Circuit"
 msgid "Failed"
 msgstr ""
 
-#: circuit.cpp:116
 msgctxt "Circuit"
 msgid "Closed"
 msgstr ""
 
-#: circuit.cpp:117
 msgctxt "Circuit"
 msgid "Unknown"
 msgstr ""
 
-#: circuititem.cpp:39
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Connection"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Status"
 msgstr ""
 
-#: circuitlistwidget.cpp:87
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
 msgstr ""
 
-#: circuitlistwidget.cpp:89
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
 msgstr ""
 
-#: circuitlistwidget.cpp:110
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
 msgstr ""
 
-#: configdialog.cpp:77
 msgctxt "ConfigDialog"
 msgid "General"
 msgstr ""
 
-#: configdialog.cpp:81
 msgctxt "ConfigDialog"
 msgid "Network"
 msgstr ""
 
-#: configdialog.cpp:85
 msgctxt "ConfigDialog"
 msgid "Sharing"
 msgstr ""
 
-#: configdialog.cpp:89
 msgctxt "ConfigDialog"
 msgid "Services"
 msgstr ""
 
-#: configdialog.cpp:93
 msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
-#: configdialog.cpp:97
 msgctxt "ConfigDialog"
 msgid "Advanced"
 msgstr ""
 
-#: configdialog.cpp:111
 msgctxt "ConfigDialog"
 msgid "Help"
 msgstr ""
 
-#: configdialog.cpp:196
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
 msgstr ""
 
-#: configdialog.cpp:198
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
 msgstr ""
 
-#: configdialog.cpp:225
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
 msgstr ""
 
-#: configdialog.cpp:227
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
 msgstr ""
 
-#: configdialog.ui:16
 msgctxt "ConfigDialog"
 msgid "Settings"
 msgstr ""
 
-#: controlconnection.cpp:134
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
 msgstr ""
 
-#: controlconnection.cpp:331
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgid "Remember my password"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
 msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
-#: controlsocket.cpp:70
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlsocket.cpp:80
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
 msgstr ""
 
-#: controlsocket.cpp:117
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
 msgstr ""
 
-#: controlsocket.cpp:156
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
 msgstr ""
 
-#: generalpage.cpp:62
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "CountryInfo"
+msgid "Afghanistan"
 msgstr ""
 
-#: generalpage.cpp:75
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgctxt "CountryInfo"
+msgid "Andorra"
 msgstr ""
 
-#: generalpage.cpp:85
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgctxt "CountryInfo"
+msgid "Angola"
 msgstr ""
 
-#: generalpage.cpp:98
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
 msgstr ""
 
-#: generalpage.cpp:106
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
+msgctxt "CountryInfo"
+msgid "Argentina"
 msgstr ""
 
-#: generalpage.ui:28
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
+msgctxt "CountryInfo"
+msgid "Armenia"
 msgstr ""
 
-#: generalpage.ui:121
-msgctxt "GeneralPage"
-msgid "Browse"
+msgctxt "CountryInfo"
+msgid "Australia"
 msgstr ""
 
-#: generalpage.ui:57
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
 msgstr ""
 
-#: generalpage.ui:51
-msgctxt "GeneralPage"
-msgid "Tor"
+msgctxt "CountryInfo"
+msgid "Bahamas"
 msgstr ""
 
-#: generalpage.ui:93
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
+msgctxt "CountryInfo"
+msgid "Bangladesh"
 msgstr ""
 
-#: generalpage.ui:99
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
+msgctxt "CountryInfo"
+msgid "Barbados"
 msgstr ""
 
-#: generalpage.ui:135
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
+msgctxt "CountryInfo"
+msgid "Belarus"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv: "
+msgctxt "CountryInfo"
+msgid "Belgium"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "CountryInfo"
+msgid "Belize"
 msgstr ""
 
-#: graphframe.cpp:247
-msgctxt "GraphFrame"
-msgid "Sent: "
+msgctxt "CountryInfo"
+msgid "Bhutan"
 msgstr ""
 
-#: graphframe.cpp:259
-msgctxt "GraphFrame"
-msgid "%1 KB"
+msgctxt "CountryInfo"
+msgid "Bolivia"
 msgstr ""
 
-#: graphframe.cpp:262
-msgctxt "GraphFrame"
-msgid "%1 MB"
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
 msgstr ""
 
-#: graphframe.cpp:265
-msgctxt "GraphFrame"
-msgid "%1 GB"
+msgctxt "CountryInfo"
+msgid "Botswana"
 msgstr ""
 
-#: helpbrowser.cpp:135
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents: "
+msgctxt "CountryInfo"
+msgid "Brazil"
 msgstr ""
 
-#: helpbrowser.cpp:147
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
 msgstr ""
 
-#: helpbrowser.cpp:396
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
+msgctxt "CountryInfo"
+msgid "Bulgaria"
 msgstr ""
 
-#: helpbrowser.cpp:398
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
 msgstr ""
 
-#: helpbrowser.cpp:400
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
+msgctxt "CountryInfo"
+msgid "Burundi"
 msgstr ""
 
-#: helpbrowser.cpp:445
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
+msgctxt "CountryInfo"
+msgid "Cambodia"
 msgstr ""
 
-#: helpbrowser.ui:33
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cameroon"
 msgstr ""
 
-#: helpbrowser.ui:484
-msgctxt "HelpBrowser"
-msgid "Back"
+msgctxt "CountryInfo"
+msgid "Canada"
 msgstr ""
 
-#: helpbrowser.ui:487
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
+msgctxt "CountryInfo"
+msgid "Cape Verde"
 msgstr ""
 
-#: helpbrowser.ui:490
-msgctxt "HelpBrowser"
-msgid "Backspace"
+msgctxt "CountryInfo"
+msgid "Central African Republic"
 msgstr ""
 
-#: helpbrowser.ui:498
-msgctxt "HelpBrowser"
-msgid "Forward"
+msgctxt "CountryInfo"
+msgid "Chad"
 msgstr ""
 
-#: helpbrowser.ui:501
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
+msgctxt "CountryInfo"
+msgid "Chile"
 msgstr ""
 
-#: helpbrowser.ui:504
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
+msgctxt "CountryInfo"
+msgid "China"
 msgstr ""
 
-#: helpbrowser.ui:512
-msgctxt "HelpBrowser"
-msgid "Home"
+msgctxt "CountryInfo"
+msgid "Colombia"
 msgstr ""
 
-#: helpbrowser.ui:515
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
+msgctxt "CountryInfo"
+msgid "Comoros"
 msgstr ""
 
-#: helpbrowser.ui:518
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
-#: helpbrowser.ui:535
-msgctxt "HelpBrowser"
-msgid "Find"
+msgctxt "CountryInfo"
+msgid "Congo"
 msgstr ""
 
-#: helpbrowser.ui:538
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgctxt "CountryInfo"
+msgid "Costa Rica"
 msgstr ""
 
-#: helpbrowser.ui:541
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
+msgctxt "CountryInfo"
+msgid "Cote d�Ivoire"
 msgstr ""
 
-#: helpbrowser.ui:549
-msgctxt "HelpBrowser"
-msgid "Close"
+msgctxt "CountryInfo"
+msgid "Croatia"
 msgstr ""
 
-#: helpbrowser.ui:552
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cuba"
 msgstr ""
 
-#: helpbrowser.ui:555
-msgctxt "HelpBrowser"
-msgid "Esc"
+msgctxt "CountryInfo"
+msgid "Cyprus"
 msgstr ""
 
-#: helpbrowser.ui:152
-msgctxt "HelpBrowser"
-msgid "Find:"
+msgctxt "CountryInfo"
+msgid "Czech Republic"
 msgstr ""
 
-#: helpbrowser.ui:174
-msgctxt "HelpBrowser"
-msgid "Find Previous"
+msgctxt "CountryInfo"
+msgid "Denmark"
 msgstr ""
 
-#: helpbrowser.ui:187
-msgctxt "HelpBrowser"
-msgid "Find Next"
+msgctxt "CountryInfo"
+msgid "Djibouti"
 msgstr ""
 
-#: helpbrowser.ui:221
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
+msgctxt "CountryInfo"
+msgid "Dominica"
 msgstr ""
 
-#: helpbrowser.ui:231
-msgctxt "HelpBrowser"
-msgid "Whole words only"
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
 msgstr ""
 
-#: helpbrowser.ui:305
-msgctxt "HelpBrowser"
-msgid "Help Topics"
+msgctxt "CountryInfo"
+msgid "Ecuador"
 msgstr ""
 
-#: helpbrowser.ui:260
-msgctxt "HelpBrowser"
-msgid "Contents"
+msgctxt "CountryInfo"
+msgid "Egypt"
 msgstr ""
 
-#: helpbrowser.ui:350
-msgctxt "HelpBrowser"
-msgid "Search"
+msgctxt "CountryInfo"
+msgid "El Salvador"
 msgstr ""
 
-#: helpbrowser.ui:362
-msgctxt "HelpBrowser"
-msgid "Searching for:"
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
 msgstr ""
 
-#: helpbrowser.ui:405
-msgctxt "HelpBrowser"
-msgid "Found Documents"
+msgctxt "CountryInfo"
+msgid "Eritrea"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file: "
+msgctxt "CountryInfo"
+msgid "Estonia"
 msgstr ""
 
-#: helptextbrowser.cpp:72
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
+msgctxt "CountryInfo"
+msgid "France"
 msgstr ""
 
-#: helptextbrowser.cpp:76
-msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgctxt "CountryInfo"
+msgid "Gabon"
 msgstr ""
 
-#: helptextbrowser.cpp:78
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
+msgctxt "CountryInfo"
+msgid "Gambia"
 msgstr ""
 
-#: helptextbrowser.cpp:88
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
+msgctxt "CountryInfo"
+msgid "Georgia"
 msgstr ""
 
-#: helptextbrowser.cpp:90
-msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgctxt "CountryInfo"
+msgid "Germany"
 msgstr ""
 
-#: licensedialog.ui:13
-msgctxt "LicenseDialog"
-msgid "License Information"
+msgctxt "CountryInfo"
+msgid "Ghana"
 msgstr ""
 
-#: licensedialog.ui:43
-msgctxt "LicenseDialog"
-msgid "License"
+msgctxt "CountryInfo"
+msgid "Grenada"
 msgstr ""
 
-#: licensedialog.ui:76
-msgctxt "LicenseDialog"
-msgid "Credits"
+msgctxt "CountryInfo"
+msgid "Guatemala"
 msgstr ""
 
-#: logevent.cpp:57
-msgctxt "LogEvent"
-msgid "Debug"
+msgctxt "CountryInfo"
+msgid "Guinea"
 msgstr ""
 
-#: logevent.cpp:58
-msgctxt "LogEvent"
-msgid "Info"
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
 msgstr ""
 
-#: logevent.cpp:59
-msgctxt "LogEvent"
-msgid "Notice"
+msgctxt "CountryInfo"
+msgid "Guyana"
 msgstr ""
 
-#: logevent.cpp:60
-msgctxt "LogEvent"
-msgid "Warning"
+msgctxt "CountryInfo"
+msgid "Hong Kong"
 msgstr ""
 
-#: logevent.cpp:61
-msgctxt "LogEvent"
-msgid "Error"
+msgctxt "CountryInfo"
+msgid "Haiti"
 msgstr ""
 
-#: logevent.cpp:62
-msgctxt "LogEvent"
-msgid "Unknown"
+msgctxt "CountryInfo"
+msgid "Honduras"
 msgstr ""
 
-#: mainwindow.ui:233
-msgctxt "MainWindow"
-msgid "Start Tor"
+msgctxt "CountryInfo"
+msgid "Israel"
 msgstr ""
 
-#: mainwindow.ui:443
-msgctxt "MainWindow"
-msgid "Exit"
+msgctxt "CountryInfo"
+msgid "Italy"
 msgstr ""
 
-#: mainwindow.ui:304
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
+msgctxt "CountryInfo"
+msgid "Jamaica"
 msgstr ""
 
-#: mainwindow.ui:317
-msgctxt "MainWindow"
-msgid "Message Log"
+msgctxt "CountryInfo"
+msgid "Japan"
 msgstr ""
 
-#: mainwindow.cpp:348
-msgctxt "MainWindow"
-msgid "Network Map"
+msgctxt "CountryInfo"
+msgid "Jordan"
 msgstr ""
 
-#: mainwindow.cpp:354
-msgctxt "MainWindow"
-msgid "Control Panel"
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
 msgstr ""
 
-#: mainwindow.ui:380
-msgctxt "MainWindow"
-msgid "Settings"
+msgctxt "CountryInfo"
+msgid "Kenya"
 msgstr ""
 
-#: mainwindow.ui:430
-msgctxt "MainWindow"
-msgid "About"
+msgctxt "CountryInfo"
+msgid "Kiribati"
 msgstr ""
 
-#: mainwindow.ui:367
-msgctxt "MainWindow"
-msgid "Help"
+msgctxt "CountryInfo"
+msgid "Kuwait"
 msgstr ""
 
-#: mainwindow.cpp:1391
-msgctxt "MainWindow"
-msgid "New Identity"
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
 msgstr ""
 
-#: mainwindow.cpp:437
-msgctxt "MainWindow"
-msgid "Ctrl+T"
+msgctxt "CountryInfo"
+msgid "Laos"
 msgstr ""
 
-#: mainwindow.cpp:438
-msgctxt "MainWindow"
-msgid "Ctrl+B"
+msgctxt "CountryInfo"
+msgid "Latvia"
 msgstr ""
 
-#: mainwindow.cpp:439
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:440
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:441
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:442
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:443
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:463
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
-#: mainwindow.cpp:468
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:476
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:527
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:528
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:540
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:541
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:562
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:563
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:579
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:583
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:586
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:589
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:592
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:595
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:598
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1132
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:605
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1297
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:612
 msgctxt "MainWindow"
 msgid "Unrecognized startup status"
 msgstr ""
 
-#: mainwindow.cpp:619
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:622
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:625
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:628
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:631
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:634
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:637
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:640
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:643
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:645
-msgctxt "MainWindow"
-msgid " failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:686
-msgctxt "MainWindow"
-msgid "Your relay is shutting down."
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-#: mainwindow.cpp:688
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:693
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:695
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:711
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:859
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:862
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:896
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:906
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:938
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:943
-msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
-""
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-
-#: mainwindow.cpp:965
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:966
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:997
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1001
-msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly."
-""
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-#: mainwindow.cpp:1055
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1075
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1078
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1080
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1087
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1089
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1141
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1143
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1222
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1224
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1226
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1330
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1394
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
-#: mainwindow.cpp:1409
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1458
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1459
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
-msgid "View log message history"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+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."
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1213
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
-#: messagelog.cpp:126
-msgctxt "MessageLog"
-msgid "Messages that appear when something has "
-"gone very wrong and Tor cannot proceed."
+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?"
 msgstr ""
 
-#: messagelog.cpp:128
-msgctxt "MessageLog"
-msgid "Messages that only appear when "
-"something has gone wrong with Tor."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:132
-msgctxt "MessageLog"
-msgid "Messages that appear infrequently "
-"during normal Tor operation and are "
-"not considered errors, but you may "
-"care about."
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr ""
 
-#: messagelog.cpp:310
-msgctxt "MessageLog"
-msgid "Cannot write file %1"
-""
-"%2."
-msgstr ""
-
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
 msgstr ""
 
-#: messagelog.ui:371
 msgctxt "MessageLog"
-msgid "Browse"
+msgid ""
+"Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
+msgid ""
+"Messages that only appear when \n"
+"something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
+msgid ""
+"Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Cannot write file %1\n"
+"\n"
+"%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: networkpage.cpp:193
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid "Invalid Bridge"
 msgstr ""
 
-#: networkpage.cpp:194
 msgctxt "NetworkPage"
 msgid "The specified bridge identifier is not valid."
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgid "Add a Bridge:"
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Remove the selected bridges from the list"
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Copy the selected bridges to the clipboard"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Find Bridges Now"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:139
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:143
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:144
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:148
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:150
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:156
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:100
 msgctxt "RouterDescriptorView"
-msgid "%1 days "
+msgid "Copy"
 msgstr ""
 
-#: routerdescriptorview.cpp:103
-msgctxt "RouterDescriptorView"
-msgid "%1 hours "
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
-msgctxt "RouterDescriptorView"
-msgid "%1 mins "
+msgctxt "RouterInfoDialog"
+msgid "Online"
 msgstr ""
 
-#: routerdescriptorview.cpp:109
-msgctxt "RouterDescriptorView"
-msgid "%1 secs"
+msgctxt "RouterInfoDialog"
+msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:48
-msgctxt "RouterDescriptorView"
-msgid "Copy"
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:140
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:143
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
-#: serverpage.cpp:199
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:263
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:25
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:32
 msgctxt "ServerPage"
 msgid "Relay traffic for the Tor network"
 msgstr ""
 
-#: serverpage.ui:39
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
-msgstr ""
-
-#: serverpage.ui:91
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:110
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:113
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory "
-msgstr ""
-
-#: serverpage.ui:139
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:154
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:164
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:204
-msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-
-#: serverpage.ui:234
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:267
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:279
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:337
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:370
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:380
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:76
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:435
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:466
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:471
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:476
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:481
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:486
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:491
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:456
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
 msgstr ""
 
-#: serverpage.ui:502
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
 msgstr ""
 
-#: serverpage.ui:591
 msgctxt "ServerPage"
-msgid "Average Rate"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:708
 msgctxt "ServerPage"
-msgid "KB/s"
+msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:666
 msgctxt "ServerPage"
-msgid "Maximum Rate"
+msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:695
 msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
+msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:737
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:400
 msgctxt "ServerPage"
-msgid "Bandwidth Limits"
+msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:802
 msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:805
 msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:815
 msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
+msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:818
 msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
+msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:828
 msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:831
 msgctxt "ServerPage"
-msgid "Misc Other Services"
+msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.ui:841
 msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.ui:844
 msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.ui:854
 msgctxt "ServerPage"
-msgid "Port 443"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
-#: serverpage.ui:857
 msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Bridge History"
 msgstr ""
 
-#: serverpage.ui:867
 msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:870
 msgctxt "ServerPage"
-msgid "Websites"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:896
 msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:969
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:979
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
 msgstr ""
 
-#: serverpage.ui:1015
 msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Automatically distribute my bridge address"
 msgstr ""
 
-#: serverpage.ui:1039
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid "Mirror the Relay Directory"
 msgstr ""
 
-#: serverpage.ui:1061
 msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:116
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:123
 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."
+msgid ""
+"Please configure at least a service directory and a virtual port for each "
+"service you want to save. Remove the other ones."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:452
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:458
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:547
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:578
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:598
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:384
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr ""
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:143
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:161
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:103
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: vmessagebox.cpp:77
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr ""
+
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr ""
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:75
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:89
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: main.cpp:95
-msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
-""
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-#: vidalia.cpp:169
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:171
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:173
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:175
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:177
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:180
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:183
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:186
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:190
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:238
 msgctxt "Vidalia"
-msgid "Invalid language code specified: "
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:245
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified: "
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
 msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/dz/qt_dz.po b/src/vidalia/i18n/po/dz/qt_dz.po
index 3404096..a8f65b8 100644
--- a/src/vidalia/i18n/po/dz/qt_dz.po
+++ b/src/vidalia/i18n/po/dz/qt_dz.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/dz/vidalia_dz.po b/src/vidalia/i18n/po/dz/vidalia_dz.po
index d61f97d..cea7325 100644
--- a/src/vidalia/i18n/po/dz/vidalia_dz.po
+++ b/src/vidalia/i18n/po/dz/vidalia_dz.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/el/qt_el.po b/src/vidalia/i18n/po/el/qt_el.po
index f51b4aa..82545d2 100644
--- a/src/vidalia/i18n/po/el/qt_el.po
+++ b/src/vidalia/i18n/po/el/qt_el.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 # Î?ιάννηÏ?  <yannanth@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-22 16:13+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: Î?ιάννηÏ? <yannanth@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 είδη Ï?Ï?άÏ?Ï?ει.\n"
-"Î?έλεÏ?ε να Ï?ο ανÏ?ικαÏ?αÏ?Ï?ήÏ?εÏ?ε?"
+msgstr "%1 είδη Ï?Ï?άÏ?Ï?ει.\nÎ?έλεÏ?ε να Ï?ο ανÏ?ικαÏ?αÏ?Ï?ήÏ?εÏ?ε?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Το αÏ?Ï?είο δε βÏ?έθηκε.\n"
-"ΠαÏ?ακαλÏ? βεβαιÏ?Ï?Ï?ε Ï?Ï?ι δÏ?θηκε Ï?ο Ï?Ï?Ï?Ï?Ï? Ï?νομα αÏ?Ï?είοÏ?."
+msgstr "%1\nΤο αÏ?Ï?είο δε βÏ?έθηκε.\nΠαÏ?ακαλÏ? βεβαιÏ?Ï?Ï?ε Ï?Ï?ι δÏ?θηκε Ï?ο Ï?Ï?Ï?Ï?Ï? Ï?νομα αÏ?Ï?είοÏ?."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Î? καÏ?αλογοÏ? δεν βÏ?έθηκε.\n"
-"ΠαÏ?ακαλοÏ?με βεβαιÏ?Ï?Ï?ε Ï?Ï?ι δÏ?θηκε Ï?ο Ï?Ï?Ï?Ï?Ï? Ï?νομα καÏ?αλÏ?γοÏ?."
+msgstr "%1\nÎ? καÏ?αλογοÏ? δεν βÏ?έθηκε.\nΠαÏ?ακαλοÏ?με βεβαιÏ?Ï?Ï?ε Ï?Ï?ι δÏ?θηκε Ï?ο Ï?Ï?Ï?Ï?Ï? Ï?νομα καÏ?αλÏ?γοÏ?."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"%1 έÏ?ει Ï?Ï?οÏ?Ï?αÏ?ία εγγÏ?αÏ?ήÏ?.\n"
-"Î?έλεÏ?ε να Ï?ο διαγÏ?άÏ?εÏ?ε οÏ?Ï?Ï?δήÏ?οÏ?ε?"
+msgstr "%1 έÏ?ει Ï?Ï?οÏ?Ï?αÏ?ία εγγÏ?αÏ?ήÏ?.\nÎ?έλεÏ?ε να Ï?ο διαγÏ?άÏ?εÏ?ε οÏ?Ï?Ï?δήÏ?οÏ?ε?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Το Ï?νομα %1 δε μÏ?οÏ?εί να Ï?Ï?ηÏ?ιμοÏ?οιηθεί.</b><p>Î?οκιμάÏ?Ï?ε να δÏ?Ï?εÏ?ε άλλο "
-"Ï?νομα με λιγÏ?Ï?εÏ?οÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ? ή/και Ï?Ï?Ï?ίÏ? Ï?ημεία Ï?Ï?ίξηÏ?."
+msgstr "<b>Το Ï?νομα %1 δε μÏ?οÏ?εί να Ï?Ï?ηÏ?ιμοÏ?οιηθεί.</b><p>Î?οκιμάÏ?Ï?ε να δÏ?Ï?εÏ?ε άλλο Ï?νομα με λιγÏ?Ï?εÏ?οÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ? ή/και Ï?Ï?Ï?ίÏ? Ï?ημεία Ï?Ï?ίξηÏ?."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 κιλομÏ?άιÏ? (1024 bytes)"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 μÏ?άιÏ? (8 bits)"
-
-
diff --git a/src/vidalia/i18n/po/el/vidalia_el.po b/src/vidalia/i18n/po/el/vidalia_el.po
index b02e9ee..c49cf97 100755
--- a/src/vidalia/i18n/po/el/vidalia_el.po
+++ b/src/vidalia/i18n/po/el/vidalia_el.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-07 13:05+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-22 10:08+0000\n"
 "Last-Translator: anvo <fragos.george@xxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -172,19 +172,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Î? Ï?οÏ?οθεÏ?ία Ï?οÏ? αÏ?Ï?είοÏ? Ï?Ï?θμίÏ?εÏ?ν Tor Ï?οÏ? δÏ?θηκε Ï?εÏ?ιέÏ?ει Ï?αÏ?ακÏ?ήÏ?εÏ? οι "
-"οÏ?οίοι δεν μÏ?οÏ?οÏ?ν να εμÏ?ανιÏ?Ï?οÏ?ν Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α 8-μÏ?ιÏ? κÏ?δικοÏ?οίηÏ?η "
-"Ï?αÏ?ακÏ?ήÏ?Ï?ν Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?Ï?Ï? Ï?αÏ?."
+msgstr "Î? Ï?οÏ?οθεÏ?ία Ï?οÏ? αÏ?Ï?είοÏ? Ï?Ï?θμίÏ?εÏ?ν Tor Ï?οÏ? δÏ?θηκε Ï?εÏ?ιέÏ?ει Ï?αÏ?ακÏ?ήÏ?εÏ? οι οÏ?οίοι δεν μÏ?οÏ?οÏ?ν να εμÏ?ανιÏ?Ï?οÏ?ν Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α 8-μÏ?ιÏ? κÏ?δικοÏ?οίηÏ?η Ï?αÏ?ακÏ?ήÏ?Ï?ν Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?Ï?Ï? Ï?αÏ?."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Î? Ï?οÏ?οθεÏ?ία καÏ?αλÏ?γοÏ? δεδομένÏ?ν Ï?οÏ? Tor Ï?οÏ? δÏ?θηκε Ï?εÏ?ιέÏ?ει Ï?αÏ?ακÏ?ήÏ?εÏ? οι "
-"οÏ?οίοι δεν μÏ?οÏ?οÏ?ν να εμÏ?ανιÏ?Ï?οÏ?ν Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α 8-μÏ?ιÏ? κÏ?δικοÏ?οίηÏ?η "
-"Ï?αÏ?ακÏ?ήÏ?Ï?ν Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?Ï?Ï? Ï?αÏ?."
+msgstr "Î? Ï?οÏ?οθεÏ?ία καÏ?αλÏ?γοÏ? δεδομένÏ?ν Ï?οÏ? Tor Ï?οÏ? δÏ?θηκε Ï?εÏ?ιέÏ?ει Ï?αÏ?ακÏ?ήÏ?εÏ? οι οÏ?οίοι δεν μÏ?οÏ?οÏ?ν να εμÏ?ανιÏ?Ï?οÏ?ν Ï?Ï?ην Ï?Ï?έÏ?οÏ?Ï?α 8-μÏ?ιÏ? κÏ?δικοÏ?οίηÏ?η Ï?αÏ?ακÏ?ήÏ?Ï?ν Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?Ï?Ï? Ï?αÏ?."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -200,9 +194,7 @@ msgstr "Î?Ï?Ï?είο ΡÏ?θμίÏ?εÏ?ν Tor(torrc);;Î?λα Ï?α Î?Ï?Ï?εία(*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr ""
-"Î?Ï?ιλέξÏ?ε ένα αÏ?Ï?είο Ï?οÏ? θα Ï?Ï?ηÏ?ιοÏ?οιηθεί Ï?Ï? διαδÏ?ομή για Ï?ον Ï?Ï?οδοÏ?έα Ï?οÏ? "
-"Tor"
+msgstr "Î?Ï?ιλέξÏ?ε ένα αÏ?Ï?είο Ï?οÏ? θα Ï?Ï?ηÏ?ιοÏ?οιηθεί Ï?Ï? διαδÏ?ομή για Ï?ον Ï?Ï?οδοÏ?έα Ï?οÏ? Tor"
 
 msgctxt "AdvancedPage"
 msgid "Configure ControlPort automatically"
@@ -210,13 +202,17 @@ msgstr "Î?Ï?Ï?Ï?μαÏ?η Ï?Ï?θμιÏ?η Ï?οÏ? ControlPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Î?Ï?ιλέξαÏ?ε Ï?ην αÏ?Ï?Ï?μαÏ?η Ï?Ï?θμιÏ?η για Ï?ο ControlPort, αλλά δεν καθοÏ?ίÏ?αÏ?ε Î?αÏ?άλογο Î?εδομένÏ?ν. ΠÏ?οÏ?θέÏ?Ï?ε ένα Ï?έÏ?οιο καÏ?άλογο, ή αÏ?οεÏ?ιλέξÏ?ε Ï?ην \"Î?Ï?Ï?Ï?μαÏ?η Ï?Ï?θμιÏ?η Ï?οÏ? ControlPort\"."
+
+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"
-"Î?Ï?οÏ?εί να Ï?Ï?ειαÏ?Ï?εί Ï?ειÏ?οκίνηÏ?η διαγÏ?αÏ?ή."
+msgstr "Το Vidalia αÏ?έÏ?Ï?Ï?ε Ï?Ï?η διαγÏ?αÏ?ή Ï?ηÏ? Ï?Ï?ηÏ?εÏ?ίαÏ? Tor.\n\nÎ?Ï?οÏ?εί να Ï?Ï?ειαÏ?Ï?εί Ï?ειÏ?οκίνηÏ?η διαγÏ?αÏ?ή."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -238,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Î?δÏ?ναμία Ï?Ï?Ï?Ï?Ï?Ï?ηÏ? εÏ?ιλεγμένοÏ? αÏ?Ï?είοÏ? μεÏ?άÏ?Ï?αÏ?ηÏ?."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "ΠÏ?οÏ?ιμήÏ?ειÏ? Î?ικονιδίοÏ? ΣÏ?Ï?Ï?ήμαÏ?οÏ? (οι αλλαγέÏ? θα εÏ?αÏ?μοÏ?Ï?οÏ?ν Ï?Ï?αν εÏ?ανεκκινήÏ?εÏ?ε Ï?ο Vidalia)"
+
+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 "Î?Ï?Ï?:"
@@ -332,9 +345,7 @@ msgstr "# ΠελάÏ?εÏ?"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"ΠελάÏ?εÏ? αÏ?Ï? Ï?ιÏ? ακÏ?λοÏ?θεÏ? Ï?Ï?Ï?εÏ? Ï?Ï?ηÏ?ιμοÏ?οιήÏ?αν Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ? αÏ?Ï? Ï?ην "
-"%1"
+msgstr "ΠελάÏ?εÏ? αÏ?Ï? Ï?ιÏ? ακÏ?λοÏ?θεÏ? Ï?Ï?Ï?εÏ? Ï?Ï?ηÏ?ιμοÏ?οιήÏ?αν Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ? αÏ?Ï? Ï?ην %1"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -460,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Το Vidalia Ï?Ï?νδέθηκε Ï?ε μια ενεÏ?γή διαδικαÏ?ία Tor η οÏ?οία αÏ?αιÏ?εί κÏ?δικÏ?. "
-"Î?ιÏ?άγεÏ?ε Ï?ον κÏ?δικÏ? Ï?αÏ? ελέγÏ?οÏ?:"
+msgstr "Το Vidalia Ï?Ï?νδέθηκε Ï?ε μια ενεÏ?γή διαδικαÏ?ία Tor η οÏ?οία αÏ?αιÏ?εί κÏ?δικÏ?. Î?ιÏ?άγεÏ?ε Ï?ον κÏ?δικÏ? Ï?αÏ? ελέγÏ?οÏ?:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -474,9 +483,7 @@ msgstr "Î?Ï?οÏ?Ï?Ï?ία αÏ?οÏ?Ï?ολήÏ? ενÏ?ολήÏ? ελεγÏ?οÏ?. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Î?αÏ?ά Ï?ην Ï?Ï?οÏ?Ï?άθεια ανάγνÏ?Ï?ηÏ? μιαÏ? γÏ?αμμήÏ? δεδομένÏ?ν αÏ?οÏ?Ï?νδέθηκε η Ï?Ï?οδοÏ?ή "
-"(socket)."
+msgstr "Î?αÏ?ά Ï?ην Ï?Ï?οÏ?Ï?άθεια ανάγνÏ?Ï?ηÏ? μιαÏ? γÏ?αμμήÏ? δεδομένÏ?ν αÏ?οÏ?Ï?νδέθηκε η Ï?Ï?οδοÏ?ή (socket)."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
@@ -1302,9 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Î?δÏ?ναμία αÏ?Ï?Ï?μαÏ?ηÏ? εÏ?ανεκκίνηÏ?ηÏ? Ï?οÏ? Vidalia. ΠαÏ?ακαλÏ? εÏ?ανεκκινήÏ?Ï?ε Ï?ο "
-"Vidalia Ï?ειÏ?οκίνηÏ?α."
+msgstr "Î?δÏ?ναμία αÏ?Ï?Ï?μαÏ?ηÏ? εÏ?ανεκκίνηÏ?ηÏ? Ï?οÏ? Vidalia. ΠαÏ?ακαλÏ? εÏ?ανεκκινήÏ?Ï?ε Ï?ο Vidalia Ï?ειÏ?οκίνηÏ?α."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1314,28 +1319,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Î?ημιοÏ?Ï?γήθηκε μια αναÏ?οÏ?ά καÏ?άÏ?Ï?εÏ?Ï?ηÏ? Ï?ην οÏ?οία μÏ?οÏ?είÏ?ε να αÏ?οÏ?Ï?είλεÏ?ε "
-"Ï?Ï?οÏ?Ï? Ï?Ï?ογÏ?αμμαÏ?ιÏ?Ï?έÏ? Ï?οÏ? Vidalia Ï?Ï?Ï?ε να ενÏ?οÏ?ίÏ?οÏ?ν και να διοÏ?θÏ?Ï?οÏ?ν Ï?ο "
-"Ï?Ï?Ï?βλημα. Î? Ï?Ï?οβληθείÏ?α αναÏ?οÏ?ά δεν Ï?εÏ?ιλαμβάνει οÏ?οιαδήÏ?οÏ?ε Ï?Ï?οÏ?Ï?Ï?ικά "
-"Ï?Ï?οιÏ?εία."
+msgstr "Î?ημιοÏ?Ï?γήθηκε μια αναÏ?οÏ?ά καÏ?άÏ?Ï?εÏ?Ï?ηÏ? Ï?ην οÏ?οία μÏ?οÏ?είÏ?ε να αÏ?οÏ?Ï?είλεÏ?ε Ï?Ï?οÏ?Ï? Ï?Ï?ογÏ?αμμαÏ?ιÏ?Ï?έÏ? Ï?οÏ? Vidalia Ï?Ï?Ï?ε να ενÏ?οÏ?ίÏ?οÏ?ν και να διοÏ?θÏ?Ï?οÏ?ν Ï?ο Ï?Ï?Ï?βλημα. Î? Ï?Ï?οβληθείÏ?α αναÏ?οÏ?ά δεν Ï?εÏ?ιλαμβάνει οÏ?οιαδήÏ?οÏ?ε Ï?Ï?οÏ?Ï?Ï?ικά Ï?Ï?οιÏ?εία."
 
 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 ""
-"με μια Ï?εÏ?ιγÏ?αÏ?ή Ï?Ï?ν ενεÏ?γειÏ?ν Ï?αÏ? Ï?Ï?ιν Ï?ην καÏ?άÏ?Ï?εÏ?Ï?η Ï?ηÏ? εÏ?αÏ?μογήÏ?, μαζί "
-"με Ï?α ακÏ?λοÏ?θα αÏ?Ï?εία Ï?οÏ? Ï?Ï?εÏ?ίζονÏ?αι με Ï?ην αναÏ?οÏ?ά καÏ?άÏ?Ï?εÏ?Ï?ηÏ?:"
+msgstr "με μια Ï?εÏ?ιγÏ?αÏ?ή Ï?Ï?ν ενεÏ?γειÏ?ν Ï?αÏ? Ï?Ï?ιν Ï?ην καÏ?άÏ?Ï?εÏ?Ï?η Ï?ηÏ? εÏ?αÏ?μογήÏ?, μαζί με Ï?α ακÏ?λοÏ?θα αÏ?Ï?εία Ï?οÏ? Ï?Ï?εÏ?ίζονÏ?αι με Ï?ην αναÏ?οÏ?ά καÏ?άÏ?Ï?εÏ?Ï?ηÏ?:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1375,8 +1372,7 @@ msgstr "Î?Ï?αÏ?μογή ΠληÏ?εξοÏ?Ï?ιοÏ? (Proxy) (Ï?Ï?οεÏ?αιÏ?ικ
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr ""
-"Î?κκίνηÏ?η μιαÏ? εÏ?αÏ?μογήÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή (proxy) Ï?Ï?αν εκκινεί Ï?ο Tor"
+msgstr "Î?κκίνηÏ?η μιαÏ? εÏ?αÏ?μογήÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή (proxy) Ï?Ï?αν εκκινεί Ï?ο Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
@@ -1555,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Το Vidalia μÏ?οÏ?εί να ανοίξει Ï?ον Ï?Ï?νδεÏ?μο Ï?οÏ? εÏ?ιλέξαÏ?ε Ï?Ï?ον αÏ?Ï?ικÏ? "
-"Ï?εÏ?ιηγηÏ?ή Ï?αÏ? Î?Ï?Ï?οÏ?. Î?ν ο Ï?εÏ?ιηγηÏ?ήÏ? δεν είναι ήδη Ï?Ï?θμιÏ?μένοÏ? Ï?Ï?Ï?ε να "
-"Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ο Tor, Ï?Ï?Ï?ε Ï?ο αίÏ?ημα δεν θα είναι ανÏ?νÏ?μο."
+msgstr "Το Vidalia μÏ?οÏ?εί να ανοίξει Ï?ον Ï?Ï?νδεÏ?μο Ï?οÏ? εÏ?ιλέξαÏ?ε Ï?Ï?ον αÏ?Ï?ικÏ? Ï?εÏ?ιηγηÏ?ή Ï?αÏ? Î?Ï?Ï?οÏ?. Î?ν ο Ï?εÏ?ιηγηÏ?ήÏ? δεν είναι ήδη Ï?Ï?θμιÏ?μένοÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ο Tor, Ï?Ï?Ï?ε Ï?ο αίÏ?ημα δεν θα είναι ανÏ?νÏ?μο."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1572,10 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ανοίξει Ï?ον Ï?Ï?νδεÏ?μο Ï?οÏ? εÏ?ιλέξαÏ?ε Ï?Ï?ον Ï?εÏ?ιηγηÏ?ή "
-"Î?Ï?Ï?οÏ?. Î?Ï?οÏ?είÏ?ε να ανÏ?ιγÏ?άÏ?εÏ?ε Ï?ο URL και να Ï?ο εÏ?ικολλήÏ?εÏ?ε Ï?Ï?ον Ï?εÏ?ιηγηÏ?ή "
-"Ï?αÏ?."
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ανοίξει Ï?ον Ï?Ï?νδεÏ?μο Ï?οÏ? εÏ?ιλέξαÏ?ε Ï?Ï?ον Ï?εÏ?ιηγηÏ?ή Î?Ï?Ï?οÏ?. Î?Ï?οÏ?είÏ?ε να ανÏ?ιγÏ?άÏ?εÏ?ε Ï?ο URL και να Ï?ο εÏ?ικολλήÏ?εÏ?ε Ï?Ï?ον Ï?εÏ?ιηγηÏ?ή Ï?αÏ?."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1735,8 +1725,7 @@ msgstr "ΣÏ?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?οÏ? Ï?Ï?ογÏ?άμμα
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ο Ï?Ï?θμιÏ?μένο Ï?Ï?Ï?γÏ?αμμα Î?μεÏ?Ï?ν Î?ηνÏ?μάÏ?Ï?ν"
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ο Ï?Ï?θμιÏ?μένο Ï?Ï?Ï?γÏ?αμμα Î?μεÏ?Ï?ν Î?ηνÏ?μάÏ?Ï?ν"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
@@ -1744,9 +1733,7 @@ msgstr "ΣÏ?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?οÏ? διακομιÏ?Ï?
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ον Ï?Ï?θμιÏ?μένο Ï?ληÏ?εξοÏ?Ï?ιο διακομιÏ?Ï?ή "
-"(proxy server)"
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να εκκινήÏ?ει Ï?ον Ï?Ï?θμιÏ?μένο Ï?ληÏ?εξοÏ?Ï?ιο διακομιÏ?Ï?ή (proxy server)"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
@@ -1789,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "ΣÏ?νδέθηκε Ï?Ï?ο δίκÏ?Ï?ο Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Î?γνÏ?Ï?Ï?η καÏ?άÏ?Ï?αÏ?η εκκίνηÏ?ηÏ?"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "διάÏ?οÏ?α"
 
@@ -1860,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ξεκινήÏ?ει Ï?ο Tor. Î?λέγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?αÏ? και "
-"βεβαιÏ?θείÏ?ε Ï?Ï?ι δηλÏ?Ï?αÏ?ε Ï?ο Ï?Ï?Ï?Ï?Ï? Ï?νομα για Ï?ο εκÏ?ελέÏ?ιμο Ï?οÏ? Tor."
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ξεκινήÏ?ει Ï?ο Tor. Î?λέγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?αÏ? και βεβαιÏ?θείÏ?ε Ï?Ï?ι δηλÏ?Ï?αÏ?ε Ï?ο Ï?Ï?Ï?Ï?Ï? Ï?νομα για Ï?ο εκÏ?ελέÏ?ιμο Ï?οÏ? Tor."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1900,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Το λογιÏ?μικÏ? Tor αÏ?αιÏ?εί αÏ?Ï? Ï?ο Vidalia να Ï?Ï?είλει Ï?ο Ï?εÏ?ιεÏ?Ï?μενο ενÏ?Ï? "
-"cookie εÏ?αλήθεÏ?Ï?ηÏ?, αλλά Ï?ο Vidalia δεν μÏ?Ï?Ï?εÏ?ε να Ï?ο βÏ?ει."
+msgstr "Το λογιÏ?μικÏ? Tor αÏ?αιÏ?εί αÏ?Ï? Ï?ο Vidalia να Ï?Ï?είλει Ï?ο Ï?εÏ?ιεÏ?Ï?μενο ενÏ?Ï? cookie εÏ?αλήθεÏ?Ï?ηÏ?, αλλά Ï?ο Vidalia δεν μÏ?Ï?Ï?εÏ?ε να Ï?ο βÏ?ει."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1924,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να καÏ?αÏ?Ï?Ï?ήÏ?ει κάÏ?οια Ï?Ï?μβάνÏ?α. ΠολλέÏ? λειÏ?οÏ?Ï?γίεÏ? "
-"Ï?οÏ? Vidalia ίÏ?Ï?Ï? δεν είναι διαθέÏ?ιμεÏ?."
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να καÏ?αÏ?Ï?Ï?ήÏ?ει κάÏ?οια Ï?Ï?μβάνÏ?α. ΠολλέÏ? λειÏ?οÏ?Ï?γίεÏ? Ï?οÏ? Vidalia ίÏ?Ï?Ï? δεν είναι διαθέÏ?ιμεÏ?."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1948,10 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Î? Ï?Ï?έÏ?οÏ?Ï?α εγκαÏ?εÏ?Ï?ημένη έκδοÏ?η Ï?οÏ? Tor είναι Ï?αÏ?Ï?Ï?ημένη ή δεν Ï?Ï?νίÏ?Ï?αÏ?αι "
-"Ï?λέον. Î?Ï?ιÏ?κεÏ?θείÏ?ε Ï?ον ιÏ?Ï?Ï?Ï?οÏ?ο Ï?οÏ? Tor για να Ï?αÏ?αλάβεÏ?ε Ï?ην Ï?ιο Ï?Ï?Ï?Ï?Ï?αÏ?η "
-"έκδοÏ?η."
+msgstr "Î? Ï?Ï?έÏ?οÏ?Ï?α εγκαÏ?εÏ?Ï?ημένη έκδοÏ?η Ï?οÏ? Tor είναι Ï?αÏ?Ï?Ï?ημένη ή δεν Ï?Ï?νίÏ?Ï?αÏ?αι Ï?λέον. Î?Ï?ιÏ?κεÏ?θείÏ?ε Ï?ον ιÏ?Ï?Ï?Ï?οÏ?ο Ï?οÏ? Tor για να Ï?αÏ?αλάβεÏ?ε Ï?ην Ï?ιο Ï?Ï?Ï?Ï?Ï?αÏ?η έκδοÏ?η."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1961,8 +1935,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Î?λεÏ? οι εÏ?Ï?μενεÏ? Ï?Ï?νδέÏ?ειÏ? Ï?αÏ? θα Ï?αίνονÏ?αι διαÏ?οÏ?εÏ?ικέÏ? αÏ?Ï? Ï?ιÏ? Ï?αλαιέÏ?."
+msgstr "Î?λεÏ? οι εÏ?Ï?μενεÏ? Ï?Ï?νδέÏ?ειÏ? Ï?αÏ? θα Ï?αίνονÏ?αι διαÏ?οÏ?εÏ?ικέÏ? αÏ?Ï? Ï?ιÏ? Ï?αλαιέÏ?."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2057,24 +2030,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Το Vidalia Ï?Ï?οÏ?Ï?άθηÏ?ε να εÏ?αναÏ?έÏ?ει Ï?ον αÏ?Ï?ικÏ? κÏ?δικÏ? για Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? "
-"Tor, αλλά δεν μÏ?Ï?Ï?εÏ?ε να εÏ?ανεκκινήÏ?ει Ï?ο Tor. ΠαÏ?ακαλοÏ?με ελέγξÏ?ε Ï?Ï?η "
-"διαÏ?είÏ?ιÏ?η εÏ?γαÏ?ιÏ?ν Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?Ï?ι δεν εκÏ?ελείÏ?αι κάÏ?οια άλλη Ï?Ï?ηÏ?εÏ?ία "
-"Ï?οÏ? Tor."
+msgstr "Το Vidalia Ï?Ï?οÏ?Ï?άθηÏ?ε να εÏ?αναÏ?έÏ?ει Ï?ον αÏ?Ï?ικÏ? κÏ?δικÏ? για Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? Tor, αλλά δεν μÏ?Ï?Ï?εÏ?ε να εÏ?ανεκκινήÏ?ει Ï?ο Tor. ΠαÏ?ακαλοÏ?με ελέγξÏ?ε Ï?Ï?η διαÏ?είÏ?ιÏ?η εÏ?γαÏ?ιÏ?ν Ï?οÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?Ï?ι δεν εκÏ?ελείÏ?αι κάÏ?οια άλλη Ï?Ï?ηÏ?εÏ?ία Ï?οÏ? Tor."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Î? εγκαÏ?εÏ?Ï?ημένη έκδοÏ?η Ï?οÏ? Tor είναι ξεÏ?εÏ?αÏ?μένη ή δεν Ï?Ï?νιÏ?Ï?άÏ?αι Ï?λέον."
+msgstr "Î? εγκαÏ?εÏ?Ï?ημένη έκδοÏ?η Ï?οÏ? Tor είναι ξεÏ?εÏ?αÏ?μένη ή δεν Ï?Ï?νιÏ?Ï?άÏ?αι Ï?λέον."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Î?έλεÏ?ε να γίνει έλεγÏ?οÏ? για νεÏ?Ï?εÏ?α διαθέÏ?ιμα Ï?ακέÏ?α Ï?Ï?οÏ? εγκαÏ?άÏ?Ï?αÏ?η;"
+msgstr "Î?έλεÏ?ε να γίνει έλεγÏ?οÏ? για νεÏ?Ï?εÏ?α διαθέÏ?ιμα Ï?ακέÏ?α Ï?Ï?οÏ? εγκαÏ?άÏ?Ï?αÏ?η;"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2084,8 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Το Tor έκλειÏ?ε αÏ?Ï?Ï?μαÏ?α Ï?ην Ï?Ï?νδεÏ?ή Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?οÏ?Ï?αÏ?εÏ?θεί η ανÏ?νÏ?μία Ï?αÏ?."
+msgstr "Το Tor έκλειÏ?ε αÏ?Ï?Ï?μαÏ?α Ï?ην Ï?Ï?νδεÏ?ή Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?οÏ?Ï?αÏ?εÏ?θεί η ανÏ?νÏ?μία Ï?αÏ?."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2099,8 +2065,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Î?εν Ï?Ï?άÏ?Ï?οÏ?ν αÏ?Ï?ή Ï?η Ï?Ï?ιγμή νεÏ?Ï?εÏ?α Ï?ακέÏ?α Tor για Ï?ον Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ?."
+msgstr "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν αÏ?Ï?ή Ï?η Ï?Ï?ιγμή νεÏ?Ï?εÏ?α Ï?ακέÏ?α Tor για Ï?ον Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ?."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2119,10 +2084,25 @@ 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."
-msgstr ""
-"Î?,Ï?ιδήÏ?οÏ?ε Ï?Ï?αλεί μέÏ?Ï? αÏ?Ï?ήÏ? Ï?ηÏ? Ï?Ï?νδεÏ?ηÏ? μÏ?οÏ?εί να αναÏ?Ï?εθεί. Î?λέγξÏ?ε Ï?ιÏ? "
-"Ï?Ï?θμίÏ?ειÏ? Ï?ηÏ? εÏ?αÏ?μογήÏ? Ï?αÏ? και Ï?Ï?ηÏ?ιμοÏ?οιή(Ï?)Ï?ε μÏ?νον κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένα "
-"Ï?Ï?Ï?Ï?Ï?κολα, Ï?Ï?Ï?Ï? SSL, αν είναι εÏ?ικÏ?Ï?."
+msgstr "Î?,Ï?ιδήÏ?οÏ?ε Ï?Ï?αλεί μέÏ?Ï? αÏ?Ï?ήÏ? Ï?ηÏ? Ï?Ï?νδεÏ?ηÏ? μÏ?οÏ?εί να αναÏ?Ï?εθεί. Î?λέγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?ηÏ? εÏ?αÏ?μογήÏ? Ï?αÏ? και Ï?Ï?ηÏ?ιμοÏ?οιή(Ï?)Ï?ε μÏ?νον κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένα Ï?Ï?Ï?Ï?Ï?κολα, Ï?Ï?Ï?Ï? SSL, αν είναι εÏ?ικÏ?Ï?."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "ΡÏ?θμιÏ?η Ï?οÏ? torrc για εκκίνηÏ?η αÏ?Ï? %1 Ï?ε %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(Ï?ιθανÏ?ν Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(Ï?ιθανÏ?ν κάÏ?οιο Ï?Ï?Ï?γÏ?αμμα ηλεκÏ?Ï?ονικήÏ? αλληλογÏ?αÏ?ίαÏ?)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? %1 Ï?αίνεÏ?αι Ï?Ï?ι Ï?Ï?αγμαÏ?οÏ?οιεί Ï?ιθανÏ?ν μη κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένεÏ? και αναÏ?Ï?αλείÏ? Ï?Ï?νδέÏ?ειÏ? Ï?Ï?ην θήÏ?α %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2132,47 +2112,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Î? αναμεÏ?αδÏ?Ï?ηÏ? Ï?αÏ? Ï?Ï?Ï?κειÏ?αι να κλείÏ?ει.\n"
-"ΠαÏ?ήÏ?Ï?ε 'Stop' ξανά για να διακÏ?Ï?εÏ?ε Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ? Ï?Ï?Ï?α."
+msgstr "Î? αναμεÏ?αδÏ?Ï?ηÏ? Ï?αÏ? Ï?Ï?Ï?κειÏ?αι να κλείÏ?ει.\nΠαÏ?ήÏ?Ï?ε 'Stop' ξανά για να διακÏ?Ï?εÏ?ε Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ? Ï?Ï?Ï?α."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "ΡÏ?θμιÏ?η Ï?οÏ? torrc για εκκίνηÏ?η αÏ?Ï? %1 Ï?ε %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Το Vidalia δεν γνÏ?Ï?ίζει Ï?Ï?Ï? να εÏ?ικοινÏ?νήÏ?ει με Ï?ο Tor διÏ?Ï?ι δεν έÏ?ει Ï?Ï?Ï?Ï?βαÏ?η Ï?ε αÏ?Ï?Ï? Ï?ο αÏ?Ï?είο: %1\n\nΤο Ï?ελεÏ?Ï?αίο μήνÏ?μα Ï?Ï?άλμαÏ?οÏ? ήÏ?αν:\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 "ΦαίνεÏ?αι Ï?Ï?ι Ï?ο Tor έÏ?ει Ï?άÏ?ει να λειÏ?οÏ?Ï?γεί αÏ?Ï? Ï?Ï?Ï?ε Ï?οÏ? Ï?ο εκκίνηÏ?ε Ï?ο Vidalia.\nÎ?είÏ?ε Ï?ιÏ? ΠÏ?οÏ?Ï?Ï?ημένεÏ? Î?αÏ?αγÏ?αÏ?έÏ? Î?ηνÏ?μάÏ?Ï?ν για Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?."
 
 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?"
-msgstr ""
-"Î?Ï?Ï?ή Ï?η Ï?Ï?ιγμή εκÏ?ελείÏ?ε έναν αναμεÏ?αδÏ?Ï?η. Î? Ï?εÏ?μαÏ?ιÏ?μÏ?Ï? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? θα διακÏ?Ï?ει κάθε ανοικÏ?ή εÏ?ικοινÏ?νία αÏ?Ï? άλλα Ï?Ï?ογÏ?άμμαÏ?α.\n"
-"Î?έλεÏ?ε η διακοÏ?ή να γίνει ομαλά Ï?Ï?Ï?ε να δοθεί Ï?Ï?Ï?νοÏ? Ï?Ï?α Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? για να βÏ?οÏ?ν νέο αναμεÏ?αδÏ?Ï?η;"
+msgstr "Î?Ï?Ï?ή Ï?η Ï?Ï?ιγμή εκÏ?ελείÏ?ε έναν αναμεÏ?αδÏ?Ï?η. Î? Ï?εÏ?μαÏ?ιÏ?μÏ?Ï? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? θα διακÏ?Ï?ει κάθε ανοικÏ?ή εÏ?ικοινÏ?νία αÏ?Ï? άλλα Ï?Ï?ογÏ?άμμαÏ?α.\nÎ?έλεÏ?ε η διακοÏ?ή να γίνει ομαλά Ï?Ï?Ï?ε να δοθεί Ï?Ï?Ï?νοÏ? Ï?Ï?α Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? για να βÏ?οÏ?ν νέο αναμεÏ?αδÏ?Ï?η;"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Το Vidalia διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι Ï?ο Tor Ï?εÏ?μάÏ?ιÏ?ε αναÏ?άνÏ?εÏ?α.\n"
-"Î?λέγξÏ?ε Ï?α μηνÏ?μαÏ?α καÏ?αγÏ?αÏ?ήÏ? για Ï?Ï?Ï?Ï?Ï?αÏ?εÏ? Ï?Ï?οειδοÏ?οιήÏ?ειÏ? και μηνÏ?μαÏ?α Ï?Ï?άλμαÏ?οÏ?."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(Ï?ιθανÏ?ν Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(Ï?ιθανÏ?ν κάÏ?οιο Ï?Ï?Ï?γÏ?αμμα ηλεκÏ?Ï?ονικήÏ? αλληλογÏ?αÏ?ίαÏ?)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? %1 Ï?αίνεÏ?αι Ï?Ï?ι Ï?Ï?αγμαÏ?οÏ?οιεί Ï?ιθανÏ?ν μη "
-"κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένεÏ? και αναÏ?Ï?αλείÏ? Ï?Ï?νδέÏ?ειÏ? Ï?Ï?ην θήÏ?α %2."
+msgstr "Το Vidalia διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι Ï?ο Tor Ï?εÏ?μάÏ?ιÏ?ε αναÏ?άνÏ?εÏ?α.\nÎ?λέγξÏ?ε Ï?α μηνÏ?μαÏ?α καÏ?αγÏ?αÏ?ήÏ? για Ï?Ï?Ï?Ï?Ï?αÏ?εÏ? Ï?Ï?οειδοÏ?οιήÏ?ειÏ? και μηνÏ?μαÏ?α Ï?Ï?άλμαÏ?οÏ?."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2180,9 +2149,7 @@ msgstr "ΦίλÏ?Ï?ο ΡÏ?θμιÏ?ηÏ? Î?αθÏ?ν"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
-"Το Vidalia δεν ήÏ?αν ικανÏ? να καÏ?αÏ?Ï?Ï?ήÏ?ει Ï?α δεδομένα Ï?Ï?εÏ?ικά με Ï?ο αÏ?Ï?είο "
-"καÏ?αγÏ?αÏ?ήÏ? Ï?οÏ? Tor."
+msgstr "Το Vidalia δεν ήÏ?αν ικανÏ? να καÏ?αÏ?Ï?Ï?ήÏ?ει Ï?α δεδομένα Ï?Ï?εÏ?ικά με Ï?ο αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ? Ï?οÏ? Tor."
 
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
@@ -2190,8 +2157,7 @@ msgstr "Î?άθοÏ? καÏ?ά Ï?ο άνοιγμα Ï?οÏ? αÏ?Ï?είοÏ? καÏ?αγ
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
-msgstr ""
-"Το Vidalia δεν ήÏ?αν ικανÏ? να ανοίξει Ï?ο Ï?Ï?γκεκÏ?ιμένο αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ?."
+msgstr "Το Vidalia δεν ήÏ?αν ικανÏ? να ανοίξει Ï?ο Ï?Ï?γκεκÏ?ιμένο αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ?."
 
 msgctxt "MessageLog"
 msgid "Log Filename Required"
@@ -2199,9 +2165,7 @@ msgstr "Î?Ï?αιÏ?είÏ?αι ένα Ï?νομα για Ï?ο αÏ?Ï?είο καÏ?α
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"ΠÏ?έÏ?ει να ειÏ?άγειÏ? ένα Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ε να μÏ?οÏ?είÏ?ε να αÏ?οθηκεÏ?Ï?εÏ?ε ένα "
-"αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ?."
+msgstr "ΠÏ?έÏ?ει να ειÏ?άγειÏ? ένα Ï?νομα αÏ?Ï?είοÏ? Ï?Ï?Ï?ε να μÏ?οÏ?είÏ?ε να αÏ?οθηκεÏ?Ï?εÏ?ε ένα αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ?."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2261,8 +2225,7 @@ msgstr "Î?κκαθάÏ?ιÏ?η"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
-"Î?κκαθάÏ?ιÏ?η Ï?λÏ?ν Ï?Ï?ν μηνÏ?μάÏ?Ï?ν αÏ?ο Ï?ο αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ? μηνÏ?μάÏ?Ï?ν (Ctrl + E)"
+msgstr "Î?κκαθάÏ?ιÏ?η Ï?λÏ?ν Ï?Ï?ν μηνÏ?μάÏ?Ï?ν αÏ?ο Ï?ο αÏ?Ï?είο καÏ?αγÏ?αÏ?ήÏ? μηνÏ?μάÏ?Ï?ν (Ctrl + E)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
@@ -2350,8 +2313,7 @@ msgstr "Î?Ï?Ï?εÏ?η"
 
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
-"Î?Ï?Ï?εÏ?η Ï?λÏ?ν Ï?Ï?ν μηνÏ?μάÏ?Ï?ν Ï?οÏ? Ï?εÏ?ιέÏ?οÏ?ν Ï?ο Ï?Ï?οÏ? αναζήÏ?ηÏ?η κείμενο (Ctrl+F)"
+msgstr "Î?Ï?Ï?εÏ?η Ï?λÏ?ν Ï?Ï?ν μηνÏ?μάÏ?Ï?ν Ï?οÏ? Ï?εÏ?ιέÏ?οÏ?ν Ï?ο Ï?Ï?οÏ? αναζήÏ?ηÏ?η κείμενο (Ctrl+F)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+F"
@@ -2415,9 +2377,7 @@ msgstr "Î?Ï?Ï?οÏ?ικÏ? αÏ?Ï?είοÏ? καÏ?αγÏ?αÏ?ήÏ? μηνÏ?μάÏ?Ï?ν"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr ""
-"Î?Ï?ιθμÏ?Ï? μηνÏ?μάÏ?Ï?ν Ï?Ï?οÏ? εμÏ?άνιÏ?η Ï?Ï?ο Ï?αÏ?άθÏ?Ï?ο Ï?οÏ? αÏ?Ï?είοÏ? καÏ?αγÏ?αÏ?ήÏ? "
-"μηνÏ?μάÏ?Ï?ν"
+msgstr "Î?Ï?ιθμÏ?Ï? μηνÏ?μάÏ?Ï?ν Ï?Ï?οÏ? εμÏ?άνιÏ?η Ï?Ï?ο Ï?αÏ?άθÏ?Ï?ο Ï?οÏ? αÏ?Ï?είοÏ? καÏ?αγÏ?αÏ?ήÏ? μηνÏ?μάÏ?Ï?ν"
 
 msgctxt "MessageLog"
 msgid "messages"
@@ -2429,9 +2389,7 @@ msgstr "ΠλοήγηÏ?η"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Î?νεÏ?γοÏ?οίÏ?η αÏ?Ï?Ï?μαÏ?ηÏ? αÏ?οθήκεÏ?Ï?ηÏ? Ï?λÏ?ν Ï?Ï?ν νέÏ?ν μηνÏ?μάÏ?Ï?ν καÏ?αγÏ?αÏ?ήÏ? Ï?ε "
-"αÏ?Ï?είο"
+msgstr "Î?νεÏ?γοÏ?οίÏ?η αÏ?Ï?Ï?μαÏ?ηÏ? αÏ?οθήκεÏ?Ï?ηÏ? Ï?λÏ?ν Ï?Ï?ν νέÏ?ν μηνÏ?μάÏ?Ï?ν καÏ?αγÏ?αÏ?ήÏ? Ï?ε αÏ?Ï?είο"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2457,17 +2415,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι Ï?Ï?αν Ï?Ï?μβαίνει κάÏ?ι\n"
-"Ï?ολÏ? Ï?οβαÏ?Ï? και Ï?ο Tor δεν μÏ?οÏ?εί να Ï?Ï?οÏ?Ï?Ï?ήÏ?ει."
+msgstr "Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι Ï?Ï?αν Ï?Ï?μβαίνει κάÏ?ι\nÏ?ολÏ? Ï?οβαÏ?Ï? και Ï?ο Tor δεν μÏ?οÏ?εί να Ï?Ï?οÏ?Ï?Ï?ήÏ?ει."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι μÏ?νον Ï?Ï?αν\n"
-"κάÏ?ι Ï?οβαÏ?Ï? Ï?Ï?μβαίνει με Ï?ο Tor."
+msgstr "Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι μÏ?νον Ï?Ï?αν\nκάÏ?ι Ï?οβαÏ?Ï? Ï?Ï?μβαίνει με Ï?ο Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2475,36 +2429,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι Ï?Ï?άνια\n"
-"Ï?Ï?ην διάÏ?κεια Ï?Ï?Ï?ιολογικÏ?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Tor και δεν\n"
-"θεÏ?Ï?οÏ?νÏ?αι Ï?Ï?άλμαÏ?α, αλλά Ï?οÏ? θα Ï?Ï?έÏ?ει να Ï?α ελέγξεÏ?ε."
+msgstr "Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι Ï?Ï?άνια\nÏ?Ï?ην διάÏ?κεια Ï?Ï?Ï?ιολογικÏ?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Tor και δεν\nθεÏ?Ï?οÏ?νÏ?αι Ï?Ï?άλμαÏ?α, αλλά Ï?οÏ? θα Ï?Ï?έÏ?ει να Ï?α ελέγξεÏ?ε."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι Ï?Ï?Ï?νά\n"
-"Ï?Ï?η διάÏ?κεια Ï?Ï?Ï?ιολογικÏ?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Tor."
+msgstr "Î?ηνÏ?μαÏ?α Ï?οÏ? εμÏ?ανίζονÏ?αι Ï?Ï?Ï?νά\nÏ?Ï?η διάÏ?κεια Ï?Ï?Ï?ιολογικÏ?ν λειÏ?οÏ?Ï?γιÏ?ν Ï?οÏ? Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Î¥Ï?εÏ?Ï?λÏ?αÏ?α μηνÏ?μαÏ?α Ï?οÏ? κÏ?Ï?ίÏ?Ï?\n"
-"αÏ?οÏ?οÏ?ν Ï?Ï?οÏ?Ï? Ï?Ï?ογÏ?αμμαÏ?ιÏ?Ï?έÏ? Ï?οÏ? Tor."
+msgstr "Î¥Ï?εÏ?Ï?λÏ?αÏ?α μηνÏ?μαÏ?α Ï?οÏ? κÏ?Ï?ίÏ?Ï?\nαÏ?οÏ?οÏ?ν Ï?Ï?οÏ?Ï? Ï?Ï?ογÏ?αμμαÏ?ιÏ?Ï?έÏ? Ï?οÏ? Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Î?δÏ?ναμία εγγÏ?αÏ?ήÏ? Ï?οÏ? αÏ?Ï?είοÏ? %1\n"
-"\n"
-"%2."
+msgstr "Î?δÏ?ναμία εγγÏ?αÏ?ήÏ? Ï?οÏ? αÏ?Ï?είοÏ? %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2611,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Î?η έγκÏ?Ï?η γέÏ?Ï?Ï?α"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Î? καθοÏ?ιÏ?μένοÏ? αÏ?ιθμÏ?Ï? αναγνÏ?Ï?ιÏ?ηÏ? Ï?ηÏ? γέÏ?Ï?Ï?αÏ? δεν είναι έγκÏ?Ï?οÏ?"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Î?νÏ?ιγÏ?αÏ?ή (Ctrl+C)"
 
@@ -2626,18 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"ΠÏ?έÏ?ει να καθοÏ?ίÏ?εÏ?ε μία διεÏ?θÏ?νÏ?η IP ή ένα Ï?νομα Ï?Ï?ολογιÏ?Ï?ή και μία θÏ?Ï?α "
-"Ï?Ï?Ï?Ï?ήμαÏ?οÏ? για να Ï?Ï?θμίÏ?εÏ?ε Ï?ο Tor να Ï?Ï?ηÏ?ιμοÏ?οιεί διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? "
-"(proxy server) για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο διαδίκÏ?Ï?ο."
+msgstr "ΠÏ?έÏ?ει να καθοÏ?ίÏ?εÏ?ε μία διεÏ?θÏ?νÏ?η IP ή ένα Ï?νομα Ï?Ï?ολογιÏ?Ï?ή και μία θÏ?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ? για να Ï?Ï?θμίÏ?εÏ?ε Ï?ο Tor να Ï?Ï?ηÏ?ιμοÏ?οιεί διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? (proxy server) για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο διαδίκÏ?Ï?ο."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"ΠÏ?έÏ?ει να καθοÏ?ίÏ?εÏ?ε μία ή και Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? θÏ?Ï?εÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?Ï?ιÏ? οÏ?οίεÏ? Ï?ο "
-"Ï?είÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? Ï?αÏ? εÏ?ιÏ?Ï?έÏ?ει Ï?Ï?νδέÏ?ειÏ?."
+msgstr "ΠÏ?έÏ?ει να καθοÏ?ίÏ?εÏ?ε μία ή και Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? θÏ?Ï?εÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? Ï?Ï?ιÏ? οÏ?οίεÏ? Ï?ο Ï?είÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? Ï?αÏ? εÏ?ιÏ?Ï?έÏ?ει Ï?Ï?νδέÏ?ειÏ?."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2645,15 +2576,11 @@ msgstr "%1 δεν είναι έγκÏ?Ï?οÏ? αÏ?ιθμÏ?Ï? θÏ?Ï?αÏ? Ï?Ï?Ï?Ï?ή
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Î?Ï?έλεξε εδÏ? αν Ï?ο Ï?οÏ?ικÏ? Ï?οÏ? δίκÏ?Ï?ο αÏ?αιÏ?εί διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? (proxy "
-"server) για να έÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο διαδίκÏ?Ï?ο"
+msgstr "Î?Ï?έλεξε εδÏ? αν Ï?ο Ï?οÏ?ικÏ? Ï?οÏ? δίκÏ?Ï?ο αÏ?αιÏ?εί διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? (proxy server) για να έÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο διαδίκÏ?Ï?ο"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
-msgstr ""
-"ΧÏ?ηÏ?ιμοÏ?οιÏ? ένα διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? (proxy server) για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο "
-"διαδίκÏ?Ï?ο"
+msgstr "ΧÏ?ηÏ?ιμοÏ?οιÏ? ένα διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? (proxy server) για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο διαδίκÏ?Ï?ο"
 
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
@@ -2673,15 +2600,11 @@ msgstr "Î?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Î?Ï?ιλέξÏ?ε εδÏ? για να Ï?Ï?νδέεÏ?Ï?ε μÏ?νο με Ï?Ï?αθμοÏ?Ï?  εÏ?ιÏ?Ï?εÏ?Ï?μενοÏ?Ï? αÏ?Ï? Ï?ο Ï?είÏ?οÏ?"
-" Ï?Ï?οÏ?Ï?αÏ?ίαÏ? θÏ?Ï?Ï?ν Ï?Ï?Ï?Ï?ήμαÏ?οÏ?"
+msgstr "Î?Ï?ιλέξÏ?ε εδÏ? για να Ï?Ï?νδέεÏ?Ï?ε μÏ?νο με Ï?Ï?αθμοÏ?Ï?  εÏ?ιÏ?Ï?εÏ?Ï?μενοÏ?Ï? αÏ?Ï? Ï?ο Ï?είÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? θÏ?Ï?Ï?ν Ï?Ï?Ï?Ï?ήμαÏ?οÏ?"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr ""
-"Το Ï?είÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? μοÏ? με αÏ?ήνει να Ï?Ï?νδέομαι μÏ?νο Ï?ε Ï?Ï?γκεκÏ?ιμένεÏ? θÏ?Ï?εÏ? "
-"Ï?Ï?Ï?Ï?ήμαÏ?οÏ?"
+msgstr "Το Ï?είÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? μοÏ? με αÏ?ήνει να Ï?Ï?νδέομαι μÏ?νο Ï?ε Ï?Ï?γκεκÏ?ιμένεÏ? θÏ?Ï?εÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ?"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
@@ -2699,10 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Î?Ï?ιλέξÏ?ε εδÏ? Ï?Ï?Ï?ε να κÏ?Ï?Ï?Ï?ογÏ?αÏ?είÏ?ε Ï?ιÏ? αιÏ?ήÏ?ειÏ? καÏ?αλÏ?γοÏ? και, εÏ?ιλεκÏ?ικά, "
-"να Ï?Ï?ηÏ?ιμοÏ?οιηÏ?ε Ï?Ï?αθμοÏ?Ï? με Ï?Ï?νδέÏ?ειÏ? γέÏ?Ï?Ï?αÏ? για να Ï?Ï?άÏ?εÏ?ε Ï?ο δίκÏ?Ï?ο Ï?οÏ? "
-"Tor"
+msgstr "Î?Ï?ιλέξÏ?ε εδÏ? Ï?Ï?Ï?ε να κÏ?Ï?Ï?Ï?ογÏ?αÏ?είÏ?ε Ï?ιÏ? αιÏ?ήÏ?ειÏ? καÏ?αλÏ?γοÏ? και, εÏ?ιλεκÏ?ικά, να Ï?Ï?ηÏ?ιμοÏ?οιηÏ?ε Ï?Ï?αθμοÏ?Ï? με Ï?Ï?νδέÏ?ειÏ? γέÏ?Ï?Ï?αÏ? για να Ï?Ï?άÏ?εÏ?ε Ï?ο δίκÏ?Ï?ο Ï?οÏ? Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2740,10 +2660,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Î?εν Ï?Ï?άÏ?Ï?οÏ?ν διαθέÏ?ιμεÏ? γέÏ?Ï?Ï?εÏ? αÏ?Ï?ή Ï?η Ï?Ï?ιγμή. Î?Ï?οÏ?είÏ?ε είÏ?ε να Ï?εÏ?ιμένεÏ?ε "
-"για λίγο και να Ï?Ï?οÏ?Ï?αθήÏ?εÏ?ε εκ νέοÏ?, είÏ?ε να δοκιμάÏ?εÏ?ε διαÏ?οÏ?εÏ?ική μέθοδο "
-"αναζήÏ?ηÏ?ηÏ? νέÏ?ν γεÏ?Ï?Ï?Ï?ν."
+msgstr "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν διαθέÏ?ιμεÏ? γέÏ?Ï?Ï?εÏ? αÏ?Ï?ή Ï?η Ï?Ï?ιγμή. Î?Ï?οÏ?είÏ?ε είÏ?ε να Ï?εÏ?ιμένεÏ?ε για λίγο και να Ï?Ï?οÏ?Ï?αθήÏ?εÏ?ε εκ νέοÏ?, είÏ?ε να δοκιμάÏ?εÏ?ε διαÏ?οÏ?εÏ?ική μέθοδο αναζήÏ?ηÏ?ηÏ? νέÏ?ν γεÏ?Ï?Ï?Ï?ν."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2770,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "ΠÏ?έÏ?ει να καθοÏ?ίÏ?εÏ?ε μια ή Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? γέÏ?Ï?Ï?εÏ?."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "αÏ?οδοÏ?ή"
@@ -2933,18 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Î?Ï?εÏ?ε Ï?Ï?θμίÏ?ει Ï?ο Tor να δÏ?α Ï?αν Ï?Ï?αθμÏ?Ï? με Ï?Ï?νδέÏ?ειÏ? γέÏ?Ï?Ï?αÏ? για Ï?οÏ?Ï? "
-"''αÏ?αγοÏ?εÏ?μένοÏ?Ï?'' Ï?Ï?ήÏ?Ï?εÏ?, αλλά η έκδοÏ?η Ï?οÏ? Tor Ï?οÏ? έÏ?εÏ?ε εγκαÏ?εÏ?Ï?ημένη "
-"δεν Ï?Ï?οÏ?Ï?ηÏ?ίζει Ï?Ï?νδέÏ?ειÏ? γέÏ?Ï?Ï?αÏ?."
+msgstr "Î?Ï?εÏ?ε Ï?Ï?θμίÏ?ει Ï?ο Tor να δÏ?α Ï?αν Ï?Ï?αθμÏ?Ï? με Ï?Ï?νδέÏ?ειÏ? γέÏ?Ï?Ï?αÏ? για Ï?οÏ?Ï? ''αÏ?αγοÏ?εÏ?μένοÏ?Ï?'' Ï?Ï?ήÏ?Ï?εÏ?, αλλά η έκδοÏ?η Ï?οÏ? Tor Ï?οÏ? έÏ?εÏ?ε εγκαÏ?εÏ?Ï?ημένη δεν Ï?Ï?οÏ?Ï?ηÏ?ίζει Ï?Ï?νδέÏ?ειÏ? γέÏ?Ï?Ï?αÏ?."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"ΠαÏ?ακαλοÏ?με αναβαθμίÏ?Ï?ε Ï?ο λογιÏ?μικÏ? Tor, ή Ï?Ï?θμίÏ?Ï?ε Ï?ο να δÏ?α μÏ?νο Ï?αν "
-"κανονικÏ?Ï? Ï?Ï?αθμÏ?Ï?. "
+msgstr "ΠαÏ?ακαλοÏ?με αναβαθμίÏ?Ï?ε Ï?ο λογιÏ?μικÏ? Tor, ή Ï?Ï?θμίÏ?Ï?ε Ï?ο να δÏ?α μÏ?νο Ï?αν κανονικÏ?Ï? Ï?Ï?αθμÏ?Ï?. "
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2959,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Î?κÏ?έλεÏ?η μÏ?νο Ï?αν Ï?ελάÏ?ηÏ?"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Î?ναμεÏ?άδÏ?Ï?ε κίνηÏ?η για Ï?ο δίκÏ?Ï?ο Ï?οÏ? Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Î?Ï?Ï?α Ï?Ï?αθμοÏ?:"
 
@@ -3000,8 +2908,7 @@ msgstr "Î?νομα Ï?οÏ? Ï?Ï?αθμοÏ? Ï?αÏ?"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Î?Ï?Ï?α Ï?Ï?ην οÏ?οία Ï?Ï?ήÏ?Ï?εÏ? και άλλοι Ï?Ï?αθμοί εÏ?ικοινÏ?νοÏ?ν με Ï?ο Ï?Ï?αθμÏ? Ï?οÏ?"
+msgstr "Î?Ï?Ï?α Ï?Ï?ην οÏ?οία Ï?Ï?ήÏ?Ï?εÏ? και άλλοι Ï?Ï?αθμοί εÏ?ικοινÏ?νοÏ?ν με Ï?ο Ï?Ï?αθμÏ? Ï?οÏ?"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -3015,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Î?ια Ï?Ï?νέÏ?ειÏ? με γÏ?ήγοÏ?ο download αλλά Ï?αμηλÏ? upload, Ï?αÏ?ακαλοÏ?με αναÏ?έÏ?εÏ?ε "
-"Ï?ην Ï?αÏ?Ï?Ï?ηÏ?α upload εδÏ?."
+msgstr "Î?ια Ï?Ï?νέÏ?ειÏ? με γÏ?ήγοÏ?ο download αλλά Ï?αμηλÏ? upload, Ï?αÏ?ακαλοÏ?με αναÏ?έÏ?εÏ?ε Ï?ην Ï?αÏ?Ï?Ï?ηÏ?α upload εδÏ?."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3045,9 +2950,7 @@ msgstr "ΠÏ?οÏ?αÏ?μοÏ?μένο"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Î?Ï?έλεξε Ï?ην καÏ?αÏ?Ï?Ï?ηÏ?η η οÏ?οία ανÏ?ιÏ?Ï?οÏ?Ï?Ï?εÏ?ει καλÏ?Ï?εÏ?α Ï?ην Ï?Ï?νδεÏ?η Ï?οÏ? Ï?Ï?ο "
-"διαδίκÏ?Ï?ο"
+msgstr "Î?Ï?έλεξε Ï?ην καÏ?αÏ?Ï?Ï?ηÏ?η η οÏ?οία ανÏ?ιÏ?Ï?οÏ?Ï?Ï?εÏ?ει καλÏ?Ï?εÏ?α Ï?ην Ï?Ï?νδεÏ?η Ï?οÏ? Ï?Ï?ο διαδίκÏ?Ï?ο"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
@@ -3077,10 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Î? μέγιÏ?Ï?οÏ? Ï?Ï?θμÏ?Ï? Ï?οÏ? εÏ?Ï?οÏ?Ï? ζÏ?νηÏ? Ï?Ï?έÏ?ει να είναι μεγαλÏ?Ï?εÏ?οÏ? ή ίÏ?οÏ? αÏ?ο Ï?ο"
-" μέÏ?ο Ï?Ï?ο Ï?οÏ? Ï?Ï?θμοÏ? έÏ?Ï?οÏ?Ï? ζÏ?νηÏ?. Î?αι οι δÏ?ο Ï?ιμέÏ? Ï?Ï?έÏ?ει να είναι "
-"Ï?οÏ?λάÏ?ιÏ?Ï?ο 20 KB/s."
+msgstr "Î? μέγιÏ?Ï?οÏ? Ï?Ï?θμÏ?Ï? Ï?οÏ? εÏ?Ï?οÏ?Ï? ζÏ?νηÏ? Ï?Ï?έÏ?ει να είναι μεγαλÏ?Ï?εÏ?οÏ? ή ίÏ?οÏ? αÏ?ο Ï?ο μέÏ?ο Ï?Ï?ο Ï?οÏ? Ï?Ï?θμοÏ? έÏ?Ï?οÏ?Ï? ζÏ?νηÏ?. Î?αι οι δÏ?ο Ï?ιμέÏ? Ï?Ï?έÏ?ει να είναι Ï?οÏ?λάÏ?ιÏ?Ï?ο 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3141,18 +3041,13 @@ msgstr "Î?μÏ?άνηÏ?η Ï?εÏ?ιεÏ?ομένοÏ? βοήθειαÏ? Ï?Ï?εÏ?ικ
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Σε Ï?ι είδοÏ?Ï? Ï?Ï?ηÏ?εÏ?ίεÏ? Internet θα μÏ?οÏ?οÏ?ν οι Ï?Ï?ήÏ?Ï?εÏ? να έÏ?οÏ?ν Ï?Ï?Ï?Ï?βαÏ?η αÏ?ο "
-"Ï?ο Ï?Ï?αθμÏ? Ï?οÏ?;"
+msgstr "Σε Ï?ι είδοÏ?Ï? Ï?Ï?ηÏ?εÏ?ίεÏ? Internet θα μÏ?οÏ?οÏ?ν οι Ï?Ï?ήÏ?Ï?εÏ? να έÏ?οÏ?ν Ï?Ï?Ï?Ï?βαÏ?η αÏ?ο Ï?ο Ï?Ï?αθμÏ? Ï?οÏ?;"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Το Tor αÏ?Ï? Ï?Ï?οεÏ?ιλογή θα μÏ?λοκάÏ?ει μεÏ?ικά εξεÏ?Ï?Ï?μενα e-mail και κάÏ?οιεÏ? "
-"εÏ?αÏ?μογέÏ? διαμοιÏ?αÏ?μοÏ? αÏ?Ï?είÏ?ν για να ελαÏ?Ï?Ï?Ï?ει Ï?ο spam και άλλεÏ? "
-"ενοÏ?λήÏ?ειÏ?. (Ï?οÏ? θα Ï?Ï?οκαλοÏ?Ï?αν άÏ?κοÏ?η Ï?Ï?Ï?Ï?Ï?Ï?η Ï?οÏ? δικÏ?Ï?οÏ?)"
+msgstr "Το Tor αÏ?Ï? Ï?Ï?οεÏ?ιλογή θα μÏ?λοκάÏ?ει μεÏ?ικά εξεÏ?Ï?Ï?μενα e-mail και κάÏ?οιεÏ? εÏ?αÏ?μογέÏ? διαμοιÏ?αÏ?μοÏ? αÏ?Ï?είÏ?ν για να ελαÏ?Ï?Ï?Ï?ει Ï?ο spam και άλλεÏ? ενοÏ?λήÏ?ειÏ?. (Ï?οÏ? θα Ï?Ï?οκαλοÏ?Ï?αν άÏ?κοÏ?η Ï?Ï?Ï?Ï?Ï?Ï?η Ï?οÏ? δικÏ?Ï?οÏ?)"
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3160,21 +3055,16 @@ msgstr "ΠολιÏ?ικέÏ? Î?ξÏ?δοÏ?"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Î?Ï?ιÏ?Ï?έÏ?Ï?ε Ï?ε άλλοÏ?Ï? Ï?Ï?ήÏ?Ï?εÏ? να έÏ?οÏ?ν Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?η δικιά Ï?οÏ? Ï?Ï?νδεÏ?η γέÏ?Ï?Ï?αÏ?,"
-" δίνονÏ?άÏ? Ï?οÏ?Ï? αÏ?Ï?ή Ï?η γÏ?αμμή:"
+msgstr "Î?Ï?ιÏ?Ï?έÏ?Ï?ε Ï?ε άλλοÏ?Ï? Ï?Ï?ήÏ?Ï?εÏ? να έÏ?οÏ?ν Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?η δικιά Ï?οÏ? Ï?Ï?νδεÏ?η γέÏ?Ï?Ï?αÏ?, δίνονÏ?άÏ? Ï?οÏ?Ï? αÏ?Ï?ή Ï?η γÏ?αμμή:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Î?Ï?Ï?ή είναι η Ï?αÏ?Ï?Ï?Ï?ηÏ?α Ï?ηÏ? Ï?Ï?νδεÏ?ηÏ? γέÏ?Ï?Ï?αÏ? Ï?οÏ? Ï?Ï?αθμοÏ? Ï?οÏ?, Ï?ην οÏ?οία "
-"μÏ?οÏ?είÏ? να δÏ?Ï?ειÏ? Ï?ε άλλοÏ?Ï? ανθÏ?Ï?Ï?οÏ?Ï?"
+msgstr "Î?Ï?Ï?ή είναι η Ï?αÏ?Ï?Ï?Ï?ηÏ?α Ï?ηÏ? Ï?Ï?νδεÏ?ηÏ? γέÏ?Ï?Ï?αÏ? Ï?οÏ? Ï?Ï?αθμοÏ? Ï?οÏ?, Ï?ην οÏ?οία μÏ?οÏ?είÏ? να δÏ?Ï?ειÏ? Ï?ε άλλοÏ?Ï? ανθÏ?Ï?Ï?οÏ?Ï?"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
-"Î?νÏ?ιγÏ?άÏ?Ï?ε Ï?η Ï?αÏ?Ï?Ï?Ï?ηÏ?α Ï?ηÏ? Ï?Ï?νδεÏ?ηÏ? γέÏ?Ï?Ï?αÏ? Ï?οÏ? Ï?Ï?αθμοÏ? Ï?οÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο "
+msgstr "Î?νÏ?ιγÏ?άÏ?Ï?ε Ï?η Ï?αÏ?Ï?Ï?Ï?ηÏ?α Ï?ηÏ? Ï?Ï?νδεÏ?ηÏ? γέÏ?Ï?Ï?αÏ? Ï?οÏ? Ï?Ï?αθμοÏ? Ï?οÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο "
 
 msgctxt "ServerPage"
 msgid "No Recent Usage"
@@ -3182,17 +3072,13 @@ msgstr "Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?Ï?Ï?Ï?αÏ?η Ï?Ï?ήÏ?η"
 
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
-msgstr ""
-"Î?εν Ï?Ï?άÏ?Ï?οÏ?ν Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οίηÏ?αν Ï?Ï?Ï?Ï?Ï?αÏ?α Ï?ον αναμεÏ?αδÏ?Ï?η"
-" Ï?αÏ?."
+msgstr "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οίηÏ?αν Ï?Ï?Ï?Ï?Ï?αÏ?α Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
 
 msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Î?Ï?ήÏ?Ï?ε Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ? να εκÏ?ελείÏ?αι Ï?Ï?νεÏ?Ï?Ï?, Ï?Ï?Ï?ε Ï?α Ï?Ï?ογÏ?άμμαÏ?α-"
-"Ï?ελάÏ?εÏ? να έÏ?οÏ?ν Ï?ην εÏ?καιÏ?ία να Ï?ον ενÏ?οÏ?ίÏ?οÏ?ν και να Ï?ον Ï?Ï?ηÏ?ιμοÏ?οιήÏ?οÏ?ν."
+msgstr "Î?Ï?ήÏ?Ï?ε Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ? να εκÏ?ελείÏ?αι Ï?Ï?νεÏ?Ï?Ï?, Ï?Ï?Ï?ε Ï?α Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? να έÏ?οÏ?ν Ï?ην εÏ?καιÏ?ία να Ï?ον ενÏ?οÏ?ίÏ?οÏ?ν και να Ï?ον Ï?Ï?ηÏ?ιμοÏ?οιήÏ?οÏ?ν."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3206,9 +3092,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Το Tor εÏ?έÏ?Ï?Ï?εÏ?ε μια αÏ?άνÏ?ηÏ?η Ï?ε ακαÏ?άλληλη μοÏ?Ï?ή, Ï?Ï?αν Ï?ο Vidalia αÏ?έÏ?Ï?ηλε "
-"αίÏ?ημα για Ï?ο ιÏ?Ï?οÏ?ικÏ? Ï?αÏ? Ï?Ï?ήÏ?ηÏ? γεÏ?Ï?Ï?Ï?ν."
+msgstr "Το Tor εÏ?έÏ?Ï?Ï?εÏ?ε μια αÏ?άνÏ?ηÏ?η Ï?ε ακαÏ?άλληλη μοÏ?Ï?ή, Ï?Ï?αν Ï?ο Vidalia αÏ?έÏ?Ï?ηλε αίÏ?ημα για Ï?ο ιÏ?Ï?οÏ?ικÏ? Ï?αÏ? Ï?Ï?ήÏ?ηÏ? γεÏ?Ï?Ï?Ï?ν."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3231,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Î?Ï?Ï?Ï?μαÏ?η διανομή Ï?ηÏ? διεÏ?θÏ?νÏ?ηÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η μοÏ?"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Î?ναμεÏ?άδοÏ?η κÏ?κλοÏ?οÏ?ίαÏ? για Ï?ο δίκÏ?Ï?ο Tor (αναμεÏ?αδÏ?Ï?ηÏ? εξÏ?δοÏ?)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Î?ναμεÏ?άδοÏ?η κÏ?κλοÏ?οÏ?ίαÏ? για Ï?ο δίκÏ?Ï?ο Tor (αναμεÏ?αδÏ?Ï?ηÏ? μη-εξÏ?δοÏ?)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Î?νÏ?ικαÏ?οÏ?Ï?Ï?ίÏ?Ï?ε Ï?ον Î?αÏ?άλογο Î?ναμεÏ?αδÏ?Ï?εÏ?ν"
 
@@ -3238,23 +3130,17 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Î? ηλεκÏ?Ï?ονική διεÏ?θÏ?νÏ?ή Ï?αÏ? για εÏ?ικοινÏ?νία Ï?ε Ï?εÏ?ίÏ?Ï?Ï?Ï?η Ï?οÏ? Ï?Ï?άÏ?ξει\n"
-"Ï?Ï?Ï?βλημα με Ï?ην αναμεÏ?άδοÏ?ή Ï?αÏ?. Î?Ï?οÏ?είÏ?ε να Ï?Ï?μÏ?εÏ?ιλάβεÏ?ε και Ï?α αÏ?οÏ?Ï?Ï?Ï?μαÏ?α Ï?αÏ? PGP ή GPG."
+msgstr "Î? ηλεκÏ?Ï?ονική διεÏ?θÏ?νÏ?ή Ï?αÏ? για εÏ?ικοινÏ?νία Ï?ε Ï?εÏ?ίÏ?Ï?Ï?Ï?η Ï?οÏ? Ï?Ï?άÏ?ξει\nÏ?Ï?Ï?βλημα με Ï?ην αναμεÏ?άδοÏ?ή Ï?αÏ?. Î?Ï?οÏ?είÏ?ε να Ï?Ï?μÏ?εÏ?ιλάβεÏ?ε και Ï?α αÏ?οÏ?Ï?Ï?Ï?μαÏ?α Ï?αÏ? PGP ή GPG."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
-msgstr ""
-"Î?άÏ?οιο λάθοÏ? Ï?αÏ?οÏ?Ï?ιάÏ?Ï?ηκε Ï?Ï?ην Ï?Ï?οÏ?Ï?άθεια αÏ?ενεÏ?γοÏ?οίηÏ?ηÏ? Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν"
+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 ""
-"ΠαÏ?ακαλοÏ?με Ï?Ï?θμίÏ?Ï?ε Ï?οÏ?λάÏ?ιÏ?Ï?ον ένα καÏ?άλογο Ï?Ï?ηÏ?εÏ?ίαÏ? και μία εικονική "
-"Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ? για κάθε μία Ï?Ï?ηÏ?εÏ?ία Ï?οÏ? θέλεÏ?ε να αÏ?οθηκεÏ?Ï?εÏ?ε. Î?ιαγÏ?άÏ?Ï?ε"
-" Ï?α Ï?Ï?Ï?λοιÏ?α."
+msgstr "ΠαÏ?ακαλοÏ?με Ï?Ï?θμίÏ?Ï?ε Ï?οÏ?λάÏ?ιÏ?Ï?ον ένα καÏ?άλογο Ï?Ï?ηÏ?εÏ?ίαÏ? και μία εικονική Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ? για κάθε μία Ï?Ï?ηÏ?εÏ?ία Ï?οÏ? θέλεÏ?ε να αÏ?οθηκεÏ?Ï?εÏ?ε. Î?ιαγÏ?άÏ?Ï?ε Ï?α Ï?Ï?Ï?λοιÏ?α."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3270,15 +3156,11 @@ msgstr "Î?Ï?ιλογή Î?αÏ?αλÏ?γοÏ? Î¥Ï?ηÏ?εÏ?ίαÏ?"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Î?ι εικονικέÏ? Ï?Ï?Ï?Ï?εÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? μÏ?οÏ?οÏ?ν να Ï?εÏ?ιέÏ?οÏ?ν μÏ?νο έγκÏ?Ï?οÏ?Ï? αÏ?ιθμοÏ?Ï? "
-"Ï?οÏ?Ï?Ï?ν Ï?Ï?Ï?Ï?ήμαÏ?οÏ?, αÏ?Ï? 1 έÏ?Ï? 65535."
+msgstr "Î?ι εικονικέÏ? Ï?Ï?Ï?Ï?εÏ? Ï?Ï?Ï?Ï?ήμαÏ?οÏ? μÏ?οÏ?οÏ?ν να Ï?εÏ?ιέÏ?οÏ?ν μÏ?νο έγκÏ?Ï?οÏ?Ï? αÏ?ιθμοÏ?Ï? Ï?οÏ?Ï?Ï?ν Ï?Ï?Ï?Ï?ήμαÏ?οÏ?, αÏ?Ï? 1 έÏ?Ï? 65535."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"Î? Ï?Ï?Ï?Ï?οÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει Ï?α εξήÏ? Ï?Ï?ο Ï?εδίο διεÏ?θÏ?νÏ?ηÏ?:Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?, "
-"διεÏ?θÏ?νÏ?η ή Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?."
+msgstr "Î? Ï?Ï?Ï?Ï?οÏ? μÏ?οÏ?εί να Ï?εÏ?ιέÏ?ει Ï?α εξήÏ? Ï?Ï?ο Ï?εδίο διεÏ?θÏ?νÏ?ηÏ?:Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?, διεÏ?θÏ?νÏ?η ή Ï?Ï?Ï?Ï?α Ï?Ï?Ï?Ï?ήμαÏ?οÏ?."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
@@ -3322,15 +3204,11 @@ msgstr "Î?Ï?ομάκÏ?Ï?νÏ?η Ï?ηÏ? εÏ?ιλεγμένηÏ? Ï?Ï?ηÏ?εÏ?ίαÏ?
 
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
-msgstr ""
-"Î?νÏ?ιγÏ?αÏ?ή Ï?ηÏ? ''διεÏ?θÏ?νÏ?ηÏ? κÏ?εμμÏ?διοÏ?'' (masked IP) Ï?ηÏ? εÏ?ιλεγμένηÏ? "
-"Ï?Ï?ηÏ?εÏ?ίαÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο"
+msgstr "Î?νÏ?ιγÏ?αÏ?ή Ï?ηÏ? ''διεÏ?θÏ?νÏ?ηÏ? κÏ?εμμÏ?διοÏ?'' (masked IP) Ï?ηÏ? εÏ?ιλεγμένηÏ? Ï?Ï?ηÏ?εÏ?ίαÏ? Ï?Ï?ο Ï?Ï?Ï?Ï?ειÏ?ο"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"ΠεÏ?ιήγηÏ?η Ï?Ï?ο Ï?οÏ?ικÏ? Ï?Ï?Ï?Ï?ημα αÏ?Ï?είÏ?ν και εÏ?ιλογή καÏ?αλÏ?γοÏ? για Ï?ην "
-"εÏ?ιλεγμένη Ï?Ï?ηÏ?εÏ?ία."
+msgstr "ΠεÏ?ιήγηÏ?η Ï?Ï?ο Ï?οÏ?ικÏ? Ï?Ï?Ï?Ï?ημα αÏ?Ï?είÏ?ν και εÏ?ιλογή καÏ?αλÏ?γοÏ? για Ï?ην εÏ?ιλεγμένη Ï?Ï?ηÏ?εÏ?ία."
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3357,10 +3235,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"ΠαÏ?ήÏ?Ï?ε \"Start Tor\" Ï?Ï?ον Πίνακα Î?λέγÏ?οÏ? Ï?οÏ? Vidalia για να εÏ?ανεκκινήÏ?εÏ?ε "
-"Ï?ο Tor. Î?ν Ï?ο Tor Ï?εÏ?μαÏ?ίÏ?Ï?ηκε αναÏ?άνÏ?εÏ?α, εÏ?ιλέξÏ?ε Ï?ο tab \"Advanced\" για "
-"λεÏ?Ï?ομέÏ?ειεÏ? για Ï?ιθανά Ï?Ï?άλμαÏ?α."
+msgstr "ΠαÏ?ήÏ?Ï?ε \"Start Tor\" Ï?Ï?ον Πίνακα Î?λέγÏ?οÏ? Ï?οÏ? Vidalia για να εÏ?ανεκκινήÏ?εÏ?ε Ï?ο Tor. Î?ν Ï?ο Tor Ï?εÏ?μαÏ?ίÏ?Ï?ηκε αναÏ?άνÏ?εÏ?α, εÏ?ιλέξÏ?ε Ï?ο tab \"Advanced\" για λεÏ?Ï?ομέÏ?ειεÏ? για Ï?ιθανά Ï?Ï?άλμαÏ?α."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3368,10 +3243,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Î?Ï?Ï?ή Ï?η Ï?Ï?ιγμή εκÏ?ελείÏ?ε Ï?ην έκδοÏ?η \"%1\" Ï?οÏ? Tor, η οÏ?οία δεν είναι Ï?λέον "
-"η Ï?Ï?νιÏ?Ï?Ï?μενη. Î?ναβαθμίÏ?Ï?ε Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?Ï?ην Ï?ιο Ï?Ï?Ï?Ï?Ï?αÏ?η έκδοÏ?ή Ï?οÏ? η οÏ?οία"
-" ίÏ?Ï?Ï? Ï?εÏ?ιέÏ?ει Ï?ημανÏ?ικέÏ? βελÏ?ιÏ?Ï?ειÏ? αÏ?Ï?αλείαÏ?, αξιοÏ?ιÏ?Ï?ίαÏ? και εÏ?ιδÏ?Ï?εÏ?ν."
+msgstr "Î?Ï?Ï?ή Ï?η Ï?Ï?ιγμή εκÏ?ελείÏ?ε Ï?ην έκδοÏ?η \"%1\" Ï?οÏ? Tor, η οÏ?οία δεν είναι Ï?λέον η Ï?Ï?νιÏ?Ï?Ï?μενη. Î?ναβαθμίÏ?Ï?ε Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?Ï?ην Ï?ιο Ï?Ï?Ï?Ï?Ï?αÏ?η έκδοÏ?ή Ï?οÏ? η οÏ?οία ίÏ?Ï?Ï? Ï?εÏ?ιέÏ?ει Ï?ημανÏ?ικέÏ? βελÏ?ιÏ?Ï?ειÏ? αÏ?Ï?αλείαÏ?, αξιοÏ?ιÏ?Ï?ίαÏ? και εÏ?ιδÏ?Ï?εÏ?ν."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3379,11 +3251,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Î?Ï?Ï?ή Ï?η Ï?Ï?ιγμή εκÏ?ελείÏ?ε Ï?ην έκδοÏ?η \"%1\" Ï?οÏ? Tor, η οÏ?οία ίÏ?Ï?Ï? δεν "
-"λειÏ?οÏ?Ï?γεί με Ï?ο Ï?Ï?έÏ?ον δίκÏ?Ï?ο Tor. Î?ναβαθμίÏ?Ï?ε Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?Ï?ην Ï?ιο "
-"Ï?Ï?Ï?Ï?Ï?αÏ?η έκδοÏ?ή Ï?οÏ? η οÏ?οία ίÏ?Ï?Ï? Ï?εÏ?ιέÏ?ει Ï?ημανÏ?ικέÏ? βελÏ?ιÏ?Ï?ειÏ? αÏ?Ï?αλείαÏ?, "
-"αξιοÏ?ιÏ?Ï?ίαÏ? και εÏ?ιδÏ?Ï?εÏ?ν."
+msgstr "Î?Ï?Ï?ή Ï?η Ï?Ï?ιγμή εκÏ?ελείÏ?ε Ï?ην έκδοÏ?η \"%1\" Ï?οÏ? Tor, η οÏ?οία ίÏ?Ï?Ï? δεν λειÏ?οÏ?Ï?γεί με Ï?ο Ï?Ï?έÏ?ον δίκÏ?Ï?ο Tor. Î?ναβαθμίÏ?Ï?ε Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?Ï?ην Ï?ιο Ï?Ï?Ï?Ï?Ï?αÏ?η έκδοÏ?ή Ï?οÏ? η οÏ?οία ίÏ?Ï?Ï? Ï?εÏ?ιέÏ?ει Ï?ημανÏ?ικέÏ? βελÏ?ιÏ?Ï?ειÏ? αÏ?Ï?αλείαÏ?, αξιοÏ?ιÏ?Ï?ίαÏ? και εÏ?ιδÏ?Ï?εÏ?ν."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3397,9 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Î? Ï?Ï?νδεÏ?η με Ï?ο δίκÏ?Ï?ο Tor αÏ?οκαÏ?αÏ?Ï?άθηκε με εÏ?ιÏ?Ï?Ï?ία. Î?Ï?οÏ?είÏ?ε Ï?Ï?Ï?α να "
-"Ï?Ï?θμίÏ?εÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Î?ιαδίκÏ?Ï?ο ανÏ?νÏ?μα."
+msgstr "Î? Ï?Ï?νδεÏ?η με Ï?ο δίκÏ?Ï?ο Tor αÏ?οκαÏ?αÏ?Ï?άθηκε με εÏ?ιÏ?Ï?Ï?ία. Î?Ï?οÏ?είÏ?ε Ï?Ï?Ï?α να Ï?Ï?θμίÏ?εÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Î?ιαδίκÏ?Ï?ο ανÏ?νÏ?μα."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3409,10 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Το Ï?Ï?Ï?γÏ?αμμα Tor έÏ?ει κάÏ?οιο εÏ?Ï?Ï?εÏ?ικÏ? Ï?Ï?άλμα. ΠαÏ?ακαλοÏ?με, αναÏ?έÏ?εÏ?ε Ï?ο "
-"μήνÏ?μα Ï?Ï?άλμαÏ?οÏ? Ï?οÏ? ακολοÏ?θεί Ï?Ï?οÏ?Ï? Ï?Ï?ογÏ?αμμαÏ?ιÏ?Ï?έÏ? Ï?οÏ? Tor, Ï?Ï?ην διεÏ?θÏ?νÏ?η"
-" bugs.torproject.org: \"%1\"."
+msgstr "Το Ï?Ï?Ï?γÏ?αμμα Tor έÏ?ει κάÏ?οιο εÏ?Ï?Ï?εÏ?ικÏ? Ï?Ï?άλμα. ΠαÏ?ακαλοÏ?με, αναÏ?έÏ?εÏ?ε Ï?ο μήνÏ?μα Ï?Ï?άλμαÏ?οÏ? Ï?οÏ? ακολοÏ?θεί Ï?Ï?οÏ?Ï? Ï?Ï?ογÏ?αμμαÏ?ιÏ?Ï?έÏ? Ï?οÏ? Tor, Ï?Ï?ην διεÏ?θÏ?νÏ?η bugs.torproject.org: \"%1\"."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3420,11 +3283,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"To Tor διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι Ï?ο Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? είναι Ï?Ï?θμιÏ?μένο Ï?άει Ï?ίÏ?Ï?"
-" %1 δεÏ?Ï?εÏ?ολέÏ?Ï?α Ï?Ï? Ï?Ï?οÏ? Ï?ον Ï?Ï?θμιÏ?Ï?ικÏ? Ï?Ï?ολογιÏ?Ï?ή \"%2\". Î?ν Ï?ο Ï?ολÏ?ι Ï?οÏ? "
-"Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? δεν είναι Ï?Ï?Ï?Ï?Ï?, Ï?ο Tor δεν θα μÏ?οÏ?έÏ?ει να λειÏ?οÏ?Ï?γήÏ?ει. "
-"Î?Ï?ιβεβαιÏ?Ï?Ï?ε Ï?Ï?ι ο Ï?Ï?ολογιÏ?Ï?ήÏ? Ï?αÏ? εμÏ?ανίζει Ï?ην Ï?Ï?Ï?Ï?ή Ï?Ï?α."
+msgstr "To Tor διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι Ï?ο Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? είναι Ï?Ï?θμιÏ?μένο Ï?άει Ï?ίÏ?Ï? %1 δεÏ?Ï?εÏ?ολέÏ?Ï?α Ï?Ï? Ï?Ï?οÏ? Ï?ον Ï?Ï?θμιÏ?Ï?ικÏ? Ï?Ï?ολογιÏ?Ï?ή \"%2\". Î?ν Ï?ο Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? δεν είναι Ï?Ï?Ï?Ï?Ï?, Ï?ο Tor δεν θα μÏ?οÏ?έÏ?ει να λειÏ?οÏ?Ï?γήÏ?ει. Î?Ï?ιβεβαιÏ?Ï?Ï?ε Ï?Ï?ι ο Ï?Ï?ολογιÏ?Ï?ήÏ? Ï?αÏ? εμÏ?ανίζει Ï?ην Ï?Ï?Ï?Ï?ή Ï?Ï?α."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3432,11 +3291,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Το Tor διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι Ï?ο Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? είνα Ï?Ï?θμιÏ?μένο Ï?άει "
-"μÏ?Ï?οÏ?Ï?ά %1 δεÏ?Ï?εÏ?Ï?λεÏ?Ï?α Ï?Ï? Ï?Ï?οÏ? Ï?ον Ï?Ï?θμιÏ?Ï?ικÏ? Ï?Ï?ολογιÏ?Ï?ή \"%2\". Î?ν Ï?ο "
-"Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?Ï? δεν είναι Ï?Ï?Ï?Ï?Ï?, Ï?ο Tor δεν θα μÏ?οÏ?έÏ?ει να "
-"λειÏ?οÏ?Ï?γήÏ?ει. Î?Ï?ιβεβαιÏ?Ï?Ï?ε Ï?Ï?ι ο Ï?Ï?ολογιÏ?Ï?ήÏ? Ï?αÏ? εμÏ?ανίζει Ï?ην Ï?Ï?Ï?Ï?ή Ï?Ï?α."
+msgstr "Το Tor διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι Ï?ο Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? είνα Ï?Ï?θμιÏ?μένο Ï?άει μÏ?Ï?οÏ?Ï?ά %1 δεÏ?Ï?εÏ?Ï?λεÏ?Ï?α Ï?Ï? Ï?Ï?οÏ? Ï?ον Ï?Ï?θμιÏ?Ï?ικÏ? Ï?Ï?ολογιÏ?Ï?ή \"%2\". Î?ν Ï?ο Ï?ολÏ?ι Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?Ï? δεν είναι Ï?Ï?Ï?Ï?Ï?, Ï?ο Tor δεν θα μÏ?οÏ?έÏ?ει να λειÏ?οÏ?Ï?γήÏ?ει. Î?Ï?ιβεβαιÏ?Ï?Ï?ε Ï?Ï?ι ο Ï?Ï?ολογιÏ?Ï?ήÏ? Ï?αÏ? εμÏ?ανίζει Ï?ην Ï?Ï?Ï?Ï?ή Ï?Ï?α."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3448,21 +3303,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Î?άÏ?οια εÏ?αÏ?μογή Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? ίÏ?Ï?Ï? Ï?Ï?οÏ?Ï?άθηÏ?ε να Ï?Ï?νδεθεί Ï?Ï?Ï?ίÏ? "
-"κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ην θÏ?Ï?α %1. Î? αÏ?οÏ?Ï?ολή μη κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένÏ?ν "
-"Ï?ληÏ?οÏ?οÏ?ιÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor είναι εÏ?ικίνδÏ?νη και δεν Ï?Ï?νιÏ?Ï?άÏ?αι. Î?ια "
-"Ï?ην δική Ï?αÏ? Ï?Ï?οÏ?Ï?αÏ?ία Ï?ο Tor έκλειÏ?ε Ï?ην Ï?Ï?νδεÏ?η αÏ?Ï?ή."
+msgstr "Î?άÏ?οια εÏ?αÏ?μογή Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? ίÏ?Ï?Ï? Ï?Ï?οÏ?Ï?άθηÏ?ε να Ï?Ï?νδεθεί Ï?Ï?Ï?ίÏ? κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ην θÏ?Ï?α %1. Î? αÏ?οÏ?Ï?ολή μη κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένÏ?ν Ï?ληÏ?οÏ?οÏ?ιÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor είναι εÏ?ικίνδÏ?νη και δεν Ï?Ï?νιÏ?Ï?άÏ?αι. Î?ια Ï?ην δική Ï?αÏ? Ï?Ï?οÏ?Ï?αÏ?ία Ï?ο Tor έκλειÏ?ε Ï?ην Ï?Ï?νδεÏ?η αÏ?Ï?ή."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Î?άÏ?οια εÏ?αÏ?μογή Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? ίÏ?Ï?Ï? Ï?Ï?οÏ?Ï?άθηÏ?ε να Ï?Ï?νδεθεί Ï?Ï?Ï?ίÏ? "
-"κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ην θÏ?Ï?α %1. Î? αÏ?οÏ?Ï?ολή μη κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένÏ?ν "
-"Ï?ληÏ?οÏ?οÏ?ιÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor είναι εÏ?ικίνδÏ?νη και δεν Ï?Ï?νιÏ?Ï?άÏ?αι."
+msgstr "Î?άÏ?οια εÏ?αÏ?μογή Ï?οÏ? Ï?Ï?ολογιÏ?Ï?ή Ï?αÏ? ίÏ?Ï?Ï? Ï?Ï?οÏ?Ï?άθηÏ?ε να Ï?Ï?νδεθεί Ï?Ï?Ï?ίÏ? κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ην θÏ?Ï?α %1. Î? αÏ?οÏ?Ï?ολή μη κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένÏ?ν Ï?ληÏ?οÏ?οÏ?ιÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor είναι εÏ?ικίνδÏ?νη και δεν Ï?Ï?νιÏ?Ï?άÏ?αι."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3474,12 +3322,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?αγμαÏ?οÏ?οίηÏ?ε Ï?Ï?νδεÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ον/Ï?Ï?ην "
-"\"%1\" Ï?Ï?ηÏ?ιμοÏ?οιÏ?νÏ?αÏ? ένα Ï?Ï?Ï?Ï?Ï?κολο Ï?οÏ? μÏ?οÏ?εί να διοÏ?εÏ?εÏ?ει Ï?ληÏ?οÏ?οÏ?ίεÏ? "
-"Ï?Ï?εÏ?ικέÏ? με Ï?ον Ï?Ï?οοÏ?ιÏ?μÏ? Ï?ηÏ?. Î?εβαιÏ?θείÏ?ε Ï?Ï?ι έÏ?εÏ?ε Ï?Ï?θμίÏ?ει Ï?ιÏ? εÏ?αÏ?μογέÏ? "
-"Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν μÏ?νον SOCKS4a ή SOCKS5 για Ï?ην ανάλÏ?Ï?η Ï?Ï?ν "
-"ονομάÏ?Ï?ν Ï?Ï?ν αÏ?ομακÏ?Ï?Ï?μένÏ?ν Ï?Ï?ολογιÏ?Ï?Ï?ν."
+msgstr "Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?αγμαÏ?οÏ?οίηÏ?ε Ï?Ï?νδεÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ον/Ï?Ï?ην \"%1\" Ï?Ï?ηÏ?ιμοÏ?οιÏ?νÏ?αÏ? ένα Ï?Ï?Ï?Ï?Ï?κολο Ï?οÏ? μÏ?οÏ?εί να διοÏ?εÏ?εÏ?ει Ï?ληÏ?οÏ?οÏ?ίεÏ? Ï?Ï?εÏ?ικέÏ? με Ï?ον Ï?Ï?οοÏ?ιÏ?μÏ? Ï?ηÏ?. Î?εβαιÏ?θείÏ?ε Ï?Ï?ι έÏ?εÏ?ε Ï?Ï?θμίÏ?ει Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν μÏ?νον SOCKS4a ή SOCKS5 για Ï?ην ανάλÏ?Ï?η Ï?Ï?ν ονομάÏ?Ï?ν Ï?Ï?ν αÏ?ομακÏ?Ï?Ï?μένÏ?ν Ï?Ï?ολογιÏ?Ï?Ï?ν."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3490,11 +3333,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?αγμαÏ?οÏ?οίηÏ?ε Ï?Ï?νδεÏ?η μέÏ?Ï? Ï?οÏ? Tor "
-"Ï?Ï?ηÏ?ιμοÏ?οιÏ?νÏ?αÏ? Ï?Ï?Ï?Ï?Ï?κολο Ï?οÏ? Ï?ο Tor δεν καÏ?αλαβαίνει. Î?εβαιÏ?θείÏ?ε Ï?Ï?ι έÏ?εÏ?ε"
-" Ï?Ï?θμίÏ?ει Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν μÏ?νον SOCKS4a ή SOCKS5 για"
-" Ï?ην ανάλÏ?Ï?η Ï?Ï?ν ονομάÏ?Ï?ν Ï?Ï?ν αÏ?ομακÏ?Ï?Ï?μένÏ?ν Ï?Ï?ολογιÏ?Ï?Ï?ν."
+msgstr "Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?αγμαÏ?οÏ?οίηÏ?ε Ï?Ï?νδεÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ηÏ?ιμοÏ?οιÏ?νÏ?αÏ? Ï?Ï?Ï?Ï?Ï?κολο Ï?οÏ? Ï?ο Tor δεν καÏ?αλαβαίνει. Î?εβαιÏ?θείÏ?ε Ï?Ï?ι έÏ?εÏ?ε Ï?Ï?θμίÏ?ει Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν μÏ?νον SOCKS4a ή SOCKS5 για Ï?ην ανάλÏ?Ï?η Ï?Ï?ν ονομάÏ?Ï?ν Ï?Ï?ν αÏ?ομακÏ?Ï?Ï?μένÏ?ν Ï?Ï?ολογιÏ?Ï?Ï?ν."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3505,10 +3344,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?αγμαÏ?οÏ?οίηÏ?ε Ï?Ï?νδεÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ον "
-"\"%1\", Ï?ον οÏ?οίο Ï?ο Tor δεν αναγνÏ?Ï?ίζει Ï?Ï? έγκÏ?Ï?ο Ï?νομα Ï?Ï?ολογιÏ?Ï?ή. Î?λέγξÏ?ε"
-" Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?ηÏ? εÏ?αÏ?μογήÏ? Ï?αÏ?."
+msgstr "Î?άÏ?οια αÏ?Ï? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?αγμαÏ?οÏ?οίηÏ?ε Ï?Ï?νδεÏ?η μέÏ?Ï? Ï?οÏ? Tor Ï?Ï?ον \"%1\", Ï?ον οÏ?οίο Ï?ο Tor δεν αναγνÏ?Ï?ίζει Ï?Ï? έγκÏ?Ï?ο Ï?νομα Ï?Ï?ολογιÏ?Ï?ή. Î?λέγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?ηÏ? εÏ?αÏ?μογήÏ? Ï?αÏ?."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3519,10 +3355,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Το Tor διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι η δημÏ?Ï?ια διεÏ?θÏ?νÏ?η Î?Ρ Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? αÏ?Ï?ή Ï?η "
-"Ï?Ï?ιγμή είναι %1%2. Î?ν αÏ?Ï?Ï? δεν είναι Ï?Ï?Ï?Ï?Ï?, Ï?Ï?οÏ?αÏ?μÏ?Ï?Ï?ε καÏ?άλληλα Ï?ην "
-"εÏ?ιλογή 'Address' Ï?Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
+msgstr "Το Tor διαÏ?ίÏ?Ï?Ï?Ï?ε Ï?Ï?ι η δημÏ?Ï?ια διεÏ?θÏ?νÏ?η Î?Ρ Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? αÏ?Ï?ή Ï?η Ï?Ï?ιγμή είναι %1%2. Î?ν αÏ?Ï?Ï? δεν είναι Ï?Ï?Ï?Ï?Ï?, Ï?Ï?οÏ?αÏ?μÏ?Ï?Ï?ε καÏ?άλληλα Ï?ην εÏ?ιλογή 'Address' Ï?Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3533,22 +3366,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Το Tor ενÏ?Ï?Ï?ιÏ?ε Ï?Ï?ι ο Ï?άÏ?οÏ?οÏ? DNS Ï?αÏ?έÏ?ει εÏ?Ï?αλμένα μηνÏ?μαÏ?α για Ï?εÏ?ιοÏ?έÏ? "
-"Ï?οÏ? δεν Ï?Ï?άÏ?Ï?οÏ?ν. Î?εÏ?ικοί ISP και άλλοι Ï?άÏ?οÏ?οι DNS, Ï?Ï?Ï?Ï? η OpenDNS, είναι "
-"γνÏ?Ï?Ï?Ï? Ï?Ï?ι αÏ?Ï?Ï? Ï?ο κάνοÏ?ν για να Ï?Ï?οβάλοÏ?ν Ï?ιÏ? δικέÏ? Ï?οÏ?Ï? Ï?ελίδεÏ? αναζήÏ?ηÏ?ηÏ?"
-" ή διαÏ?ήμιÏ?ηÏ?."
+msgstr "Το Tor ενÏ?Ï?Ï?ιÏ?ε Ï?Ï?ι ο Ï?άÏ?οÏ?οÏ? DNS Ï?αÏ?έÏ?ει εÏ?Ï?αλμένα μηνÏ?μαÏ?α για Ï?εÏ?ιοÏ?έÏ? Ï?οÏ? δεν Ï?Ï?άÏ?Ï?οÏ?ν. Î?εÏ?ικοί ISP και άλλοι Ï?άÏ?οÏ?οι DNS, Ï?Ï?Ï?Ï? η OpenDNS, είναι γνÏ?Ï?Ï?Ï? Ï?Ï?ι αÏ?Ï?Ï? Ï?ο κάνοÏ?ν για να Ï?Ï?οβάλοÏ?ν Ï?ιÏ? δικέÏ? Ï?οÏ?Ï? Ï?ελίδεÏ? αναζήÏ?ηÏ?ηÏ? ή διαÏ?ήμιÏ?ηÏ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Το Tor ενÏ?Ï?Ï?ιÏ?ε Ï?Ï?ι ο Ï?άÏ?οÏ?οÏ? DNS Ï?αÏ?έÏ?ει εÏ?Ï?αλμένα μηνÏ?μαÏ?α για γνÏ?Ï?Ï?έÏ? "
-"Ï?εÏ?ιοÏ?έÏ?. Î?Ï?Ï?Ï?ον Ï?α Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? βαÏ?ίζονÏ?αι Ï?Ï?οÏ?Ï? ανεμεÏ?αδÏ?Ï?εÏ? Tor "
-"για Ï?ην διαβίβαÏ?η ακÏ?ιβÏ?ν μηνÏ?μάÏ?Ï?ν DNS, ο αναμεÏ?αδÏ?Ï?ηÏ? Ï?αÏ? δεν θα Ï?Ï?θμιÏ?Ï?εί"
-" Ï?Ï? αναμεÏ?αδÏ?Ï?ηÏ? εξÏ?δοÏ?."
+msgstr "Το Tor ενÏ?Ï?Ï?ιÏ?ε Ï?Ï?ι ο Ï?άÏ?οÏ?οÏ? DNS Ï?αÏ?έÏ?ει εÏ?Ï?αλμένα μηνÏ?μαÏ?α για γνÏ?Ï?Ï?έÏ? Ï?εÏ?ιοÏ?έÏ?. Î?Ï?Ï?Ï?ον Ï?α Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? βαÏ?ίζονÏ?αι Ï?Ï?οÏ?Ï? ανεμεÏ?αδÏ?Ï?εÏ? Tor για Ï?ην διαβίβαÏ?η ακÏ?ιβÏ?ν μηνÏ?μάÏ?Ï?ν DNS, ο αναμεÏ?αδÏ?Ï?ηÏ? Ï?αÏ? δεν θα Ï?Ï?θμιÏ?Ï?εί Ï?Ï? αναμεÏ?αδÏ?Ï?ηÏ? εξÏ?δοÏ?."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3559,10 +3384,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Το Tor Ï?Ï?οÏ?Ï?αθεί να Ï?Ï?οÏ?διοÏ?ίÏ?ει αν η θÏ?Ï?α διακομηÏ?Ï?ή Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? "
-"μÏ?οÏ?εί να Ï?Ï?οÏ?εγγιÏ?Ï?εί αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor, Ï?Ï?νδεÏ?μενοÏ? Ï?Ï?οÏ?Ï? Ï?Ï?ολογιÏ?Ï?έÏ? %1 "
-"%2. Î?Ï?Ï?Ï? μÏ?οÏ?εί να διαÏ?κέÏ?ει Ï?ολλά λεÏ?Ï?ά."
+msgstr "Το Tor Ï?Ï?οÏ?Ï?αθεί να Ï?Ï?οÏ?διοÏ?ίÏ?ει αν η θÏ?Ï?α διακομηÏ?Ï?ή Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? μÏ?οÏ?εί να Ï?Ï?οÏ?εγγιÏ?Ï?εί αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor, Ï?Ï?νδεÏ?μενοÏ? Ï?Ï?οÏ?Ï? Ï?Ï?ολογιÏ?Ï?έÏ? %1 %2. Î?Ï?Ï?Ï? μÏ?οÏ?εί να διαÏ?κέÏ?ει Ï?ολλά λεÏ?Ï?ά."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3570,8 +3392,7 @@ msgstr "Î? έλεγÏ?οÏ? Ï?Ï?οÏ?εγγιÏ?Ï?ικÏ?Ï?ηÏ?αÏ? Ï?ηÏ? θÏ?Ï?αÏ?
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-"Î? θÏ?Ï?α διακομηÏ?Ï?ή Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? είναι Ï?Ï?οÏ?βάÏ?ιμη αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor!"
+msgstr "Î? θÏ?Ï?α διακομηÏ?Ï?ή Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? είναι Ï?Ï?οÏ?βάÏ?ιμη αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
@@ -3583,12 +3404,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Î? θÏ?Ï?α διακομηÏ?Ï?ή Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? δεν είναι Ï?Ï?οÏ?εγγίÏ?ημη αÏ?Ï? άλλα "
-"Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Tor. Î?Ï?Ï?Ï? μÏ?οÏ?εί να Ï?Ï?μβεί Ï?Ï?αν Ï?Ï?νδέεÏ?Ï?ε μέÏ?Ï? "
-"δÏ?ομολογηÏ?ή ή Ï?είÏ?οÏ?Ï? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? Ï?οÏ? αÏ?αιÏ?οÏ?ν Ï?Ï?θμίÏ?ειÏ? Ï?Ï?οÏ?θηÏ?ηÏ? θÏ?Ï?αÏ?. Î?ν "
-"η διεÏ?θÏ?νÏ?η %1:%2 δεν είναι η Ï?Ï?Ï?Ï?ή διεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α, ελέγξÏ?ε Ï?ιÏ? "
-"Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
+msgstr "Î? θÏ?Ï?α διακομηÏ?Ï?ή Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? δεν είναι Ï?Ï?οÏ?εγγίÏ?ημη αÏ?Ï? άλλα Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Tor. Î?Ï?Ï?Ï? μÏ?οÏ?εί να Ï?Ï?μβεί Ï?Ï?αν Ï?Ï?νδέεÏ?Ï?ε μέÏ?Ï? δÏ?ομολογηÏ?ή ή Ï?είÏ?οÏ?Ï? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? Ï?οÏ? αÏ?αιÏ?οÏ?ν Ï?Ï?θμίÏ?ειÏ? Ï?Ï?οÏ?θηÏ?ηÏ? θÏ?Ï?αÏ?. Î?ν η διεÏ?θÏ?νÏ?η %1:%2 δεν είναι η Ï?Ï?Ï?Ï?ή διεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α, ελέγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3599,10 +3415,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Το Tor Ï?Ï?οÏ?Ï?αθεί να Ï?Ï?οÏ?διοÏ?ίÏ?ει αν η θÏ?Ï?α καÏ?αλÏ?γοÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? "
-"είναι Ï?Ï?οÏ?εγγίÏ?ιμη αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor Ï?Ï?νδεÏ?μενο Ï?Ï?ον Ï?Ï?ολογιÏ?Ï?ή %1:%2. Î? "
-"έλεγÏ?οÏ? αÏ?Ï?Ï?Ï? ίÏ?Ï?Ï? διαÏ?κέÏ?ει Ï?ολλά λεÏ?Ï?ά."
+msgstr "Το Tor Ï?Ï?οÏ?Ï?αθεί να Ï?Ï?οÏ?διοÏ?ίÏ?ει αν η θÏ?Ï?α καÏ?αλÏ?γοÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? είναι Ï?Ï?οÏ?εγγίÏ?ιμη αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor Ï?Ï?νδεÏ?μενο Ï?Ï?ον Ï?Ï?ολογιÏ?Ï?ή %1:%2. Î? έλεγÏ?οÏ? αÏ?Ï?Ï?Ï? ίÏ?Ï?Ï? διαÏ?κέÏ?ει Ï?ολλά λεÏ?Ï?ά."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3610,8 +3423,7 @@ msgstr "Î? Î?λεγÏ?οÏ? ΠÏ?οÏ?εγγιÏ?Ï?ικÏ?Ï?ηÏ?αÏ? Ï?ηÏ? Î?Ï?Ï?αÏ?
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-"Î? θÏ?Ï?α καÏ?αλÏ?γοÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? είναι Ï?Ï?οÏ?βάÏ?ιμη αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor!"
+msgstr "Î? θÏ?Ï?α καÏ?αλÏ?γοÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? είναι Ï?Ï?οÏ?βάÏ?ιμη αÏ?Ï? Ï?ο δίκÏ?Ï?ο Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
@@ -3623,12 +3435,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Î? θÏ?Ï?α καÏ?αλÏ?γοÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? δεν είναι Ï?Ï?οÏ?βάÏ?ιμη αÏ?Ï? άλλα "
-"Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Tor. Î?Ï?Ï?Ï? μÏ?οÏ?εί να Ï?Ï?μβαίνει αν Ï?Ï?νδέεÏ?Ï?ε μέÏ?Ï? "
-"δÏ?ομολογηÏ?ή ή Ï?είÏ?οÏ?Ï? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? Ï?α οÏ?οία αÏ?αιÏ?οÏ?ν Ï?Ï?θμίÏ?ειÏ? Ï?Ï?οÏ?θηÏ?ηÏ? "
-"θÏ?Ï?αÏ?. Î?ν η διεÏ?θÏ?νÏ?η %1:%2 δεν είναι η Ï?Ï?Ï?Ï?ή διεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α, ελέγξÏ?ε"
-" Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
+msgstr "Î? θÏ?Ï?α καÏ?αλÏ?γοÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? δεν είναι Ï?Ï?οÏ?βάÏ?ιμη αÏ?Ï? άλλα Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Tor. Î?Ï?Ï?Ï? μÏ?οÏ?εί να Ï?Ï?μβαίνει αν Ï?Ï?νδέεÏ?Ï?ε μέÏ?Ï? δÏ?ομολογηÏ?ή ή Ï?είÏ?οÏ?Ï? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? Ï?α οÏ?οία αÏ?αιÏ?οÏ?ν Ï?Ï?θμίÏ?ειÏ? Ï?Ï?οÏ?θηÏ?ηÏ? θÏ?Ï?αÏ?. Î?ν η διεÏ?θÏ?νÏ?η %1:%2 δεν είναι η Ï?Ï?Ï?Ï?ή διεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α, ελέγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ?."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3638,10 +3445,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Î? Ï?εÏ?ιγÏ?αÏ?έαÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? ο οÏ?οίοÏ? Ï?Ï?νδέει Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Ï?Ï?ον "
-"αναμεÏ?αδÏ?Ï?η Ï?αÏ?, αÏ?οÏ?Ï?ίÏ?θηκε αÏ?Ï? Ï?ον διακομηÏ?Ï?ή καÏ?αλÏ?γοÏ? %1:%2. Î? αιÏ?ία Ï?οÏ?"
-" δίδεÏ?αι είναι: %3"
+msgstr "Î? Ï?εÏ?ιγÏ?αÏ?έαÏ? Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? ο οÏ?οίοÏ? Ï?Ï?νδέει Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? Ï?Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ?, αÏ?οÏ?Ï?ίÏ?θηκε αÏ?Ï? Ï?ον διακομηÏ?Ï?ή καÏ?αλÏ?γοÏ? %1:%2. Î? αιÏ?ία Ï?οÏ? δίδεÏ?αι είναι: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3653,12 +3457,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Î? αναμεÏ?αδÏ?Ï?ηÏ? Ï?αÏ? είναι Ï?Ï?νδεδεμένοÏ? και διαθέÏ?ιμοÏ? Ï?Ï?οÏ? Ï?Ï?ήÏ?η αÏ?Ï? "
-"Ï?Ï?ογÏ?άμμαÏ?α Tor. Î?α δείÏ?ε μια αÏ?ξηÏ?η Ï?Ï?ην κίνηÏ?η Ï?οÏ? δικÏ?Ï?οÏ?, μέÏ?Ï? Ï?οÏ? "
-"Î?Ï?αÏ?ήμαÏ?οÏ? Î?Ï?Ï?οÏ?Ï? Î?Ï?νηÏ?, μέÏ?α Ï?Ï?ιÏ? εÏ?Ï?μενεÏ? λίγεÏ? Ï?Ï?εÏ?, Ï?Ï?ο Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α "
-"Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? μαθαίνοÏ?ν για Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ?. Î?Ï?Ï?αÏ?ιÏ?Ï?οÏ?με για Ï?ην "
-"Ï?Ï?νειÏ?Ï?οÏ?ά Ï?αÏ? Ï?Ï?ο δίκÏ?ο Tor!"
+msgstr "Î? αναμεÏ?αδÏ?Ï?ηÏ? Ï?αÏ? είναι Ï?Ï?νδεδεμένοÏ? και διαθέÏ?ιμοÏ? Ï?Ï?οÏ? Ï?Ï?ήÏ?η αÏ?Ï? Ï?Ï?ογÏ?άμμαÏ?α Tor. Î?α δείÏ?ε μια αÏ?ξηÏ?η Ï?Ï?ην κίνηÏ?η Ï?οÏ? δικÏ?Ï?οÏ?, μέÏ?Ï? Ï?οÏ? Î?Ï?αÏ?ήμαÏ?οÏ? Î?Ï?Ï?οÏ?Ï? Î?Ï?νηÏ?, μέÏ?α Ï?Ï?ιÏ? εÏ?Ï?μενεÏ? λίγεÏ? Ï?Ï?εÏ?, Ï?Ï?ο Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α Ï?Ï?ογÏ?άμμαÏ?α-Ï?ελάÏ?εÏ? μαθαίνοÏ?ν για Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ?. Î?Ï?Ï?αÏ?ιÏ?Ï?οÏ?με για Ï?ην Ï?Ï?νειÏ?Ï?οÏ?ά Ï?αÏ? Ï?Ï?ο δίκÏ?ο Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3720,9 +3519,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Î?Ï?οθήκεÏ?Ï?η Ï?Ï?θμίÏ?εÏ?ν. Î?ν δεν εÏ?ιλεÏ?θεί, οι Ï?Ï?θμίÏ?ειÏ? θα εÏ?αÏ?μοÏ?θοÏ?ν μÏ?νον "
-"για Ï?ην Ï?Ï?έÏ?οÏ?Ï?α Ï?Ï?νεδÏ?ία Ï?οÏ? Tor."
+msgstr "Î?Ï?οθήκεÏ?Ï?η Ï?Ï?θμίÏ?εÏ?ν. Î?ν δεν εÏ?ιλεÏ?θεί, οι Ï?Ï?θμίÏ?ειÏ? θα εÏ?αÏ?μοÏ?θοÏ?ν μÏ?νον για Ï?ην Ï?Ï?έÏ?οÏ?Ï?α Ï?Ï?νεδÏ?ία Ï?οÏ? Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3762,9 +3559,7 @@ msgstr "ΣÏ?άλμα καÏ?ά Ï?ην Ï?Ï?νδεÏ?η Ï?Ï?ο Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Î? εÏ?ιλογή είναι άδεια. ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε κάÏ?οιο κείμενο, ή Ï?Ï?εκάÏ?εÏ?ε \"Apply"
-" all\""
+msgstr "Î? εÏ?ιλογή είναι άδεια. ΠαÏ?ακαλÏ? εÏ?ιλέξÏ?ε κάÏ?οιο κείμενο, ή Ï?Ï?εκάÏ?εÏ?ε \"Apply all\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3788,9 +3583,7 @@ msgstr "Î?εν βÏ?έθηκαν Ï?Ï?Ï?κεÏ?έÏ? Ï?οÏ? να Ï?Ï?οÏ?Ï?ηÏ?ίζ
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Î?εν βÏ?έθηκαν έγκÏ?Ï?εÏ? Ï?Ï?Ï?κεÏ?έÏ? Internet gateway (μÏ?νÏ?εμ)  Ï?οÏ? Ï?Ï?οÏ?Ï?ηÏ?ίζοÏ?ν "
-"UPnP"
+msgstr "Î?εν βÏ?έθηκαν έγκÏ?Ï?εÏ? Ï?Ï?Ï?κεÏ?έÏ? Internet gateway (μÏ?νÏ?εμ)  Ï?οÏ? Ï?Ï?οÏ?Ï?ηÏ?ίζοÏ?ν UPnP"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
@@ -3840,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ελέγξει για διαθέÏ?ιμεÏ? ενημεÏ?Ï?Ï?ειÏ? λογιÏ?μικοÏ?, "
-"διÏ?Ï?ι δεν βÏ?ήκε Ï?ον '%1'."
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ελέγξει για διαθέÏ?ιμεÏ? ενημεÏ?Ï?Ï?ειÏ? λογιÏ?μικοÏ?, διÏ?Ï?ι δεν βÏ?ήκε Ï?ον '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ελέγξει για διαθέÏ?ιμεÏ? ενημεÏ?Ï?Ï?ειÏ? λογιÏ?μικοÏ?, "
-"διÏ?Ï?ι η διεÏ?γαÏ?ία ενημέÏ?Ï?Ï?ηÏ? Ï?οÏ? Tor Ï?εÏ?μαÏ?ίÏ?Ï?ηκε αναÏ?άνÏ?εÏ?α."
+msgstr "Το Vidalia δεν μÏ?Ï?Ï?εÏ?ε να ελέγξει για διαθέÏ?ιμεÏ? ενημεÏ?Ï?Ï?ειÏ? λογιÏ?μικοÏ?, διÏ?Ï?ι η διεÏ?γαÏ?ία ενημέÏ?Ï?Ï?ηÏ? Ï?οÏ? Tor Ï?εÏ?μαÏ?ίÏ?Ï?ηκε αναÏ?άνÏ?εÏ?α."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3902,8 +3691,7 @@ msgstr "Î?γκαÏ?άÏ?Ï?αÏ?η"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Τα ακÏ?λοÏ?θα ενημεÏ?Ï?μένα Ï?ακέÏ?α λογιÏ?μικοÏ? είναι έÏ?οιμα για εγκαÏ?άÏ?Ï?αÏ?η:"
+msgstr "Τα ακÏ?λοÏ?θα ενημεÏ?Ï?μένα Ï?ακέÏ?α λογιÏ?μικοÏ? είναι έÏ?οιμα για εγκαÏ?άÏ?Ï?αÏ?η:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3971,14 +3759,11 @@ msgstr "Î?μÏ?ανίζει αÏ?Ï?Ï? Ï?ο μÏ?νημα Ï?Ï?ήÏ?ηÏ? και Ï?Ï?ο
 
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
-msgstr ""
-"Î?Ï?αναÏ?έÏ?ει Ï?Ï?ην αÏ?Ï?ική Ï?οÏ?Ï? μοÏ?Ï?ή Î?Î?Î?Σ Ï?ιÏ? αÏ?οθηκεÏ?μένεÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? "
-"Vidalia."
+msgstr "Î?Ï?αναÏ?έÏ?ει Ï?Ï?ην αÏ?Ï?ική Ï?οÏ?Ï? μοÏ?Ï?ή Î?Î?Î?Σ Ï?ιÏ? αÏ?οθηκεÏ?μένεÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? Vidalia."
 
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
-"Î?έÏ?ει Ï?ον καÏ?άλογο Ï?Ï?οÏ? Ï?ο Vidalia Ï?Ï?ηÏ?ιμοÏ?οιεί για Ï?α αÏ?Ï?εία δεδομένÏ?ν."
+msgstr "Î?έÏ?ει Ï?ον καÏ?άλογο Ï?Ï?οÏ? Ï?ο Vidalia Ï?Ï?ηÏ?ιμοÏ?οιεί για Ï?α αÏ?Ï?εία δεδομένÏ?ν."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
@@ -4029,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Î?ια διεÏ?γαÏ?ία Ï?οÏ? Vidalia μÏ?οÏ?εί να εκÏ?ελείÏ?αι ήδη. Î?ν Ï?Ï?αγμαÏ?ικά δεν Ï?Ï?άÏ?Ï?ει άλλη μια διεÏ?γαÏ?ία Ï?οÏ? Vidalia Ï?ε εκÏ?έλεÏ?η, μÏ?οÏ?είÏ?ε να διαλέξεÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε οÏ?Ï?ε Ï?ι άλλοÏ?.\n"
-"\n"
-"Î?έλεÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε Ï?ην εκκίνηÏ?η Ï?οÏ? Vidalia;"
+msgstr "Î?ια διεÏ?γαÏ?ία Ï?οÏ? Vidalia μÏ?οÏ?εί να εκÏ?ελείÏ?αι ήδη. Î?ν Ï?Ï?αγμαÏ?ικά δεν Ï?Ï?άÏ?Ï?ει άλλη μια διεÏ?γαÏ?ία Ï?οÏ? Vidalia Ï?ε εκÏ?έλεÏ?η, μÏ?οÏ?είÏ?ε να διαλέξεÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε οÏ?Ï?ε Ï?ι άλλοÏ?.\n\nÎ?έλεÏ?ε να Ï?Ï?νεÏ?ίÏ?εÏ?ε Ï?ην εκκίνηÏ?η Ï?οÏ? Vidalia;"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4065,5 +3847,3 @@ msgstr "%1 Ï?Ï?εÏ?"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 λεÏ?Ï?ά"
-
-
diff --git a/src/vidalia/i18n/po/eo/qt_eo.po b/src/vidalia/i18n/po/eo/qt_eo.po
index 9b127dd..c41e894 100644
--- a/src/vidalia/i18n/po/eo/qt_eo.po
+++ b/src/vidalia/i18n/po/eo/qt_eo.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # identity <eeemsi@xxxxxxxxxxxxxx>, 2011.
 msgid ""
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-22 16:13+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: identity <eeemsi@xxxxxxxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 jam eksistas.\n"
-"Ä?u vi volas Ä?in anstataÅ­igi?"
+msgstr "%1 jam eksistas.\nÄ?u vi volas Ä?in anstataÅ­igi?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Dosiero ne trovita.\n"
-"Bonvolu kontroli Ä?u la korekta dosiernomo estis tajpata."
+msgstr "%1\nDosiero ne trovita.\nBonvolu kontroli Ä?u la korekta dosiernomo estis tajpata."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Dosierujo ne trovita.\n"
-"Bonvolu kontroli Ä?u la korekta dosierujnomo estis tajpata."
+msgstr "%1\nDosierujo ne trovita.\nBonvolu kontroli Ä?u la korekta dosierujnomo estis tajpata."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' estas neskribalirebla.\n"
-"Ä?u vi volas Ä?in anstataÅ­igi Ä?iukaze?"
+msgstr "'%1' estas neskribalirebla.\nÄ?u vi volas Ä?in anstataÅ­igi Ä?iukaze?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>La nomo \"%1\" ne uzeblas.</b><p>Klopodi uzi alian nomon, kun malpli da "
-"signoj aÅ­ sen interpunkcio."
+msgstr "<b>La nomo \"%1\" ne uzeblas.</b><p>Klopodi uzi alian nomon, kun malpli da signoj aÅ­ sen interpunkcio."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bajtoj"
-
-
diff --git a/src/vidalia/i18n/po/eo/vidalia_eo.po b/src/vidalia/i18n/po/eo/vidalia_eo.po
index 1f641af..14be4a8 100644
--- a/src/vidalia/i18n/po/eo/vidalia_eo.po
+++ b/src/vidalia/i18n/po/eo/vidalia_eo.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # identity <eeemsi@xxxxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: identity <eeemsi@xxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -193,14 +194,22 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
-"\n"
-"Eble vi devas forigi Ä?in permane. "
+msgstr "Vidalia ne povis forigi Tor-servon.\n\nEble vi devas forigi Ä?in permane. "
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -222,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ne povis Å?arÄ?i la elektitan lingvotradukon."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ekde:"
@@ -442,9 +468,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia konektis al Tor-proceso kiu bezonas pasvorton.\n"
-"Bonvolu entajpi vian stirpasvorton:"
+msgstr "Vidalia konektis al Tor-proceso kiu bezonas pasvorton.\nBonvolu entajpi vian stirpasvorton:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1267,24 +1291,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 ""
 
@@ -1302,16 +1308,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+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..."
+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..."
+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 "GeneralPage"
@@ -1531,10 +1548,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia povas malfermi la ligilon kiun vi selektis en via defaÅ­lta "
-"foliumilo. Se via foliumilo nuntempe ne estas agordita por Tor-uzado, via "
-"peto ne estos anonima."
+msgstr "Vidalia povas malfermi la ligilon kiun vi selektis en via defaÅ­lta foliumilo. Se via foliumilo nuntempe ne estas agordita por Tor-uzado, via peto ne estos anonima."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1548,9 +1562,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ne povis malfermi la selektitan ligilon en via foliumilo. Ä?iukaze vi"
-" povas kopii la URL-on kaj Ä?in alglui en via foliumilo."
+msgstr "Vidalia ne povis malfermi la selektitan ligilon en via foliumilo. Ä?iukaze vi povas kopii la URL-on kaj Ä?in alglui en via foliumilo."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1761,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Konektita al Tor-reto"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Nerekonita startstato"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diversaĵoj"
 
@@ -1832,9 +1840,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia ne povis lanÄ?i Tor-n. Kontrolu viajn agordojn por certiÄ?i ke korekta"
-" nomo kaj loko de via Tor plenumebla dosiero estas specifita."
+msgstr "Vidalia ne povis lanÄ?i Tor-n. Kontrolu viajn agordojn por certiÄ?i ke korekta nomo kaj loko de via Tor plenumebla dosiero estas specifita."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1872,9 +1878,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor-programaro bezonas ke Vidalia sendu la enhavojn de aÅ­tentiga kuketo, sed"
-" Vidalia ne povis trovi ajn."
+msgstr "Tor-programaro bezonas ke Vidalia sendu la enhavojn de aÅ­tentiga kuketo, sed Vidalia ne povis trovi ajn."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1896,9 +1900,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia ne povis registri por kelkaj eventoj. Multe da trajtoj de Vidalia "
-"povas esti neuzeblaj."
+msgstr "Vidalia ne povis registri por kelkaj eventoj. Multe da trajtoj de Vidalia povas esti neuzeblaj."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -2076,15 +2078,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2099,25 +2113,32 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
-msgstr ", eble Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ", eble retpoÅ?tkliento,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2531,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2671,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2855,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3103,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3681,14 +3698,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 ""
@@ -3782,6 +3791,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 ""
 
@@ -3831,5 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/es/qt_es.po b/src/vidalia/i18n/po/es/qt_es.po
index a8ed761..a14c8ba 100644
--- a/src/vidalia/i18n/po/es/qt_es.po
+++ b/src/vidalia/i18n/po/es/qt_es.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
 "PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -209,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Archivo no encontrado.\n"
-"Verifique que el nombre del archivo es correcto."
+msgstr "%1\nArchivo no encontrado.\nVerifique que el nombre del archivo es correcto."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -270,18 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Archivo no encontrado.\n"
-"Verifique que el nombre del directorio es correcto."
+msgstr "%1\nArchivo no encontrado.\nVerifique que el nombre del directorio es correcto."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"«%1» está protegido contra escritura. ¿Desea eliminarlo de todas formas?"
+msgstr "«%1» está protegido contra escritura. ¿Desea eliminarlo de todas formas?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -378,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>No se puede utilizar el nombre «%1».</b><p>Intente usar otro nombre con "
-"menos caracteres o sin signos de puntuación."
+msgstr "<b>No se puede utilizar el nombre «%1».</b><p>Intente usar otro nombre con menos caracteres o sin signos de puntuación."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -441,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/es/vidalia_es.po b/src/vidalia/i18n/po/es/vidalia_es.po
index 2cedd62..236dbc7 100644
--- a/src/vidalia/i18n/po/es/vidalia_es.po
+++ b/src/vidalia/i18n/po/es/vidalia_es.po
@@ -2,16 +2,17 @@
 # Translators:
 # Daniel Franganillo <dfranganillo@xxxxxxxxx>, 2011.
 #   <lenazun@xxxxxxxxx>, 2011.
+#   <mavtra724@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #   <santiagotorresarias@xxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-22 19:54+0000\n"
-"Last-Translator: lenazun <lenazun@xxxxxxxxx>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-30 10:59+0000\n"
+"Last-Translator: mavtra <mavtra724@xxxxxxxxx>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,9 +47,7 @@ msgstr "'%1' no es una dirección IP válida."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Ha seleccionado autenticación por 'Contraseña', pero no ha especificado "
-"ninguna."
+msgstr "Ha seleccionado autentificación por 'Contraseña', pero no ha especificado ninguna."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -152,11 +151,11 @@ msgstr "Utilizar una conexión TCP (ControlPort)"
 
 msgctxt "AdvancedPage"
 msgid "Path:"
-msgstr "Dirección:"
+msgstr "Ruta:"
 
 msgctxt "AdvancedPage"
 msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Utilizar un socket de dominio de Unix (ControlSocket)"
+msgstr "Utilizar un socket de dominio Unix (ControlSocket)"
 
 msgctxt "AdvancedPage"
 msgid "Edit current torrc"
@@ -164,37 +163,31 @@ msgstr "Editar el torrc actual"
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTA: esto editará el torrc cargado en este momento"
+msgstr "NOTA: esto editará el torrc actualmente cargado"
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
-msgstr "No existe la dirección de ControlSocket"
+msgstr "No existe la ruta al ControlSocket"
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"La ubicación del archivo de configuración de tor contiene caracteres que no "
-"pueden ser representados en la codificación de caracteres de 8 bits "
-"utilizada por tu sistema."
+msgstr "La ubicación del archivo de configuración de Tor especificado contiene caracteres que no pueden ser representados en la codificación de caracteres de 8 bits utilizada por su sistema."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"La ubicacion de la carpeta de datos de Tor contiene caracteres que no pueden"
-" ser representados en la codificación de caracteres de 8 bits utilizada por "
-"tu sistema."
+msgstr "La ubicacion del directorio de datos de Tor contiene caracteres que no pueden ser representados en la codificación de caracteres de 8 bits utilizada por su sistema."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
-msgstr "Adveretencia"
+msgstr "Advertencia"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Has camiado la dirección de torrc ¿deseas reiniciar Tor?"
+msgstr "Ha cambiado la ruta a torrc. ¿Desea reiniciar Tor?"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
@@ -202,7 +195,7 @@ msgstr "Archivo de configuración de Tor (torrc);; Todos los Archivos(*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr "Elige un archivo para utilizar como dirección de Tor socket"
+msgstr "Seleccione un archivo a utilizar para la ruta del socket de Tor"
 
 msgctxt "AdvancedPage"
 msgid "Configure ControlPort automatically"
@@ -210,13 +203,17 @@ msgstr "Configurar ControlPort automáticamente"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Ha seleccionado la opción de autoconfiguración para ControlPort, pero no ha indicado un Directorio de datos. Añada uno, o desmarque la opción \"Configurar ControlPort automáticamente\"."
+
+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"
-"\n"
-"Puede que necesite eliminarlo de manera manual."
+msgstr "Vidalia no pudo suprimir el servicio Tor.\n\nPuede tener que suprimirlo de forma manual."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -238,6 +235,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 "Preferencias de iconos del sistema (los cambios se implementarán al reiniciar Vidalia)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Mostrar el Icono de bandeja y el Icono de dock (predeterminado)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Ocultar el Icono de bandeja"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Ocultar el Icono de dock"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Desde:"
@@ -252,7 +266,7 @@ msgstr "Mostrar Preferencias"
 
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
-msgstr "Uso del Ancho de Banda de Tor"
+msgstr "Uso de ancho de banda de Tor"
 
 msgctxt "BandwidthGraph"
 msgid "Reset"
@@ -268,7 +282,7 @@ msgstr "Tasa de Envío"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr "Siempre Arriba"
+msgstr "Siempre arriba"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
@@ -276,7 +290,7 @@ msgstr "Estilo"
 
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Cambia la transparencia del Gráfico de Ancho de Banda"
+msgstr "Cambia la transparencia del Gráfico de ancho de banda"
 
 msgctxt "BandwidthGraph"
 msgid "100"
@@ -296,7 +310,7 @@ msgstr "Cancelar"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr "Iniciando la solicitud de puente HTTPS."
+msgstr "Iniciando la solicitud de puente HTTPS..."
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
@@ -304,7 +318,7 @@ msgstr "Conectando a %1:%2..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr "Enviando una solicitud HTTPS para puentes."
+msgstr "Enviando una solicitud HTTPS de puentes..."
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
@@ -316,7 +330,7 @@ msgstr "Descargando puentes"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Unable to download bridges: %1"
-msgstr "No pudo descargar puentes: %1"
+msgstr "No se pudieron descargar puentes: %1"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Retrying bridge request..."
@@ -328,11 +342,11 @@ msgstr "País"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
-msgstr "Nº. de Clientes"
+msgstr "N.º de clientes"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr "Clientes de los siguientes países han usado su retransmisor desde %1"
+msgstr "Clientes de los siguientes países han usado su repetidor desde %1"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -368,7 +382,7 @@ msgstr "Desconocido"
 
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
-msgstr "<Ruta Vacía>"
+msgstr "<Ruta vacía>"
 
 msgctxt "CircuitListWidget"
 msgid "Connection"
@@ -384,11 +398,11 @@ msgstr "Acercamiento al circuito"
 
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
-msgstr "Cerrar Circuito (Del)"
+msgstr "Cerrar Circuito (Supr)"
 
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
-msgstr "Cerrar flujo (Del)"
+msgstr "Cerrar flujo (Supr)"
 
 msgctxt "ConfigDialog"
 msgid "General"
@@ -420,7 +434,7 @@ msgstr "Ayuda"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
-msgstr "Error al Guardar las Preferencias"
+msgstr "Error al guardar las preferencias"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
@@ -428,7 +442,7 @@ msgstr "Vidalia no pudo guardar sus preferencias de %1."
 
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
-msgstr "Error al Aplicar Preferencias"
+msgstr "Error al aplicar las preferencias"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
@@ -440,11 +454,11 @@ msgstr "Preferencias"
 
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia no pudo conectarse con Tor. (%1)"
+msgstr "Vidalia no pudo conectarse a Tor. (%1)"
 
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
-msgstr "Conector de Control no está conectado."
+msgstr "El socket de control no está conectado."
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
@@ -458,22 +472,19 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia se ha conectado a un proceso Tor en funcionamiento que requiere una "
-"contraseña. Introduzca su contraseña de control:"
+msgstr "Vidalia se ha conectado a un proceso Tor en ejecución que requiere una contraseña. Introduzca su contraseña de control:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
-msgstr "La conexión de control no esta conectada."
+msgstr "El socket de control no está conectado."
 
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
-msgstr "Error enviando comando de control. [%1]"
+msgstr "Error al enviar una orden de control. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Conexión desconectada mientras se trataba de leer una línea de información."
+msgstr "Socket desconectado mientras se intentaba leer una línea de datos."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
@@ -509,7 +520,7 @@ msgstr "Australia"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr "Azerbaidzhán"
+msgstr "Azerbaiyán"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
@@ -549,7 +560,7 @@ msgstr "Bosnia y Herzegovina"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr "Botswana"
+msgstr "Botsuana"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
@@ -573,7 +584,7 @@ msgstr "Burundi"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr "Cambodia"
+msgstr "Camboya"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
@@ -649,7 +660,7 @@ msgstr "Dinamarca"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr "Djibutí"
+msgstr "Yibuti"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
@@ -761,11 +772,11 @@ msgstr "Jordania"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr "Kazajhstán"
+msgstr "Kazajistán"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr "Kenya"
+msgstr "Kenia"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
@@ -777,7 +788,7 @@ msgstr "Kuwait"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr "Kirguistán"
+msgstr "Kirguizistán"
 
 msgctxt "CountryInfo"
 msgid "Laos"
@@ -793,7 +804,7 @@ msgstr "Líbano"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr "Lesotho"
+msgstr "Lesoto"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
@@ -905,7 +916,7 @@ msgstr "Níger"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr "Níger"
+msgstr "Nigeria"
 
 msgctxt "CountryInfo"
 msgid "Norway"
@@ -973,7 +984,7 @@ msgstr "Ruanda"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts y Nevis"
+msgstr "San Cristóbal y Nieves"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
@@ -993,7 +1004,7 @@ msgstr "San Marino"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr "Sao Tomé y Príncipe"
+msgstr "Santo Tomé y Príncipe"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
@@ -1073,7 +1084,7 @@ msgstr "Siria"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr "Tazhdikistán"
+msgstr "Tayikistán"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
@@ -1085,7 +1096,7 @@ msgstr "Tailandia"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr "Timor Leste"
+msgstr "Timor Oriental"
 
 msgctxt "CountryInfo"
 msgid "Togo"
@@ -1161,11 +1172,11 @@ msgstr "Vietnam"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr "Sahara Occidental"
+msgstr "Sáhara Occidental"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr "Yemén"
+msgstr "Yemen"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
@@ -1173,7 +1184,7 @@ msgstr "Zambia"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr "Zimbabue"
 
 msgctxt "CountryInfo"
 msgid "Zaire"
@@ -1197,7 +1208,7 @@ msgstr "Bahrein"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr "Benin"
+msgstr "Benín"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
@@ -1265,7 +1276,7 @@ msgstr "Maldivas"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr "Méjico"
+msgstr "México"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
@@ -1277,15 +1288,15 @@ msgstr "Taiwán"
 
 msgctxt "CrashReportDialog"
 msgid "Submit a Crash Report"
-msgstr "Enviar un reporte de fallo"
+msgstr "Enviar un informe de fallo"
 
 msgctxt "CrashReportDialog"
 msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia encontro un error y debió cerrarse"
+msgstr "Vidalia encontró un error y debió cerrarse"
 
 msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
-msgstr "Reiniciar vidalia"
+msgstr "Reiniciar Vidalia"
 
 msgctxt "CrashReportDialog"
 msgid "Don't Restart"
@@ -1299,41 +1310,30 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"No fue posible reiniciar Vidalia de manera automática. Por favor reinicie "
-"Vidalia manualmente"
+msgstr "No se pudo reiniciar Vidalia de forma automática. Reinicie Vidalia de forma manual."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
-msgstr "Por favor envíe un reporte:"
+msgstr "Por favor complete un tique en:"
 
 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Un reporte del cierre forzoso de la aplicación se ha creado para que usted "
-"pueda enviarlo a los desarrolladores de Vidalia y así ayudar a identificar "
-"una solución al problema. El reporte enviado no contiene ninguna información"
-" personal identificable."
+msgstr "Se ha creado un informe de fallo que puede enviar a los desarrolladores de Vidalia para ayudar a identificar y solucionar el problema. El informe que se envía no contiene ninguna información que le pueda identificar."
 
 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 ""
-"con una descripción de lo que estaba haciendo antes del cierre forzoso de la"
-" aplicación, junto con los siguientes archivos que corresponden al reporte "
-"del cierre forzoso:"
+msgstr "con una descripción de lo que estaba haciendo antes del cierre forzoso de la aplicación, junto con los siguientes archivos que corresponden al informe del cierre forzoso:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1345,7 +1345,7 @@ msgstr "Seleccione la ruta de Tor"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr "Seleccionar el Ejecutable del Proxy"
+msgstr "Seleccionar el ejecutable del proxy"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
@@ -1369,7 +1369,7 @@ msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr "Aplicación Proxy (opcional)"
+msgstr "Aplicación proxy (opcional)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
@@ -1377,7 +1377,7 @@ msgstr "Iniciar una aplicación proxy cuando Tor se inicie"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr "Argumentos de la aplicación Proxy:"
+msgstr "Argumentos de la aplicación proxy:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
@@ -1385,11 +1385,11 @@ msgstr "Actualizaciones de software"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr "Revisar automáticamente si hay actualizaciones de software"
+msgstr "Comprobar automáticamente si hay actualizaciones de software"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr "Revisar ahora"
+msgstr "Comprobar ahora"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
@@ -1409,7 +1409,7 @@ msgstr "%1 GB"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr "Recib."
+msgstr "Recib.:"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
@@ -1417,15 +1417,15 @@ msgstr "Enviados:"
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
-msgstr "Archivo XML suministrado no es un documento de Contenidos valido."
+msgstr "El archivo XML suministrado no es un documento de Contenidos válido."
 
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
-msgstr "La búsqueda alcanzó el final del documento"
+msgstr "La búsqueda llegó al final del documento"
 
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
-msgstr "La búsqueda alcanzó el principio del documento"
+msgstr "La búsqueda llegó al principio del documento"
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
@@ -1457,11 +1457,11 @@ msgstr "Adelante"
 
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
-msgstr "Ir a la página siguiente (Mayúsculas+Retroceso)"
+msgstr "Ir a la página siguiente (Mayúsculas + Retroceso)"
 
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
-msgstr "Shift+Retroceso"
+msgstr "Mayúsculas + Retroceso"
 
 msgctxt "HelpBrowser"
 msgid "Home"
@@ -1469,11 +1469,11 @@ msgstr "Inicio"
 
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
-msgstr "Ir a la Página de Inicio (Ctrl+H)"
+msgstr "Ir a la Página de inicio (Ctrl + H)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr "Ctrl + H"
 
 msgctxt "HelpBrowser"
 msgid "Find"
@@ -1481,11 +1481,11 @@ msgstr "Buscar"
 
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Buscar una palabra o frase en la página actual (Ctrl+F)"
+msgstr "Buscar una palabra o frase en la página actual (Ctrl + F)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr "Ctrl + F"
 
 msgctxt "HelpBrowser"
 msgid "Close"
@@ -1493,7 +1493,7 @@ msgstr "Cerrar"
 
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
-msgstr "Cerrar Ayuda de Vidalia"
+msgstr "Cerrar ayuda de Vidalia"
 
 msgctxt "HelpBrowser"
 msgid "Esc"
@@ -1509,7 +1509,7 @@ msgstr "Buscar Anterior"
 
 msgctxt "HelpBrowser"
 msgid "Find Next"
-msgstr "Encontrar Siguiente"
+msgstr "Buscar Siguiente"
 
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
@@ -1521,11 +1521,11 @@ msgstr "Palabras completas solamente"
 
 msgctxt "HelpBrowser"
 msgid "Help Topics"
-msgstr "Temas de Ayuda"
+msgstr "Temas de ayuda"
 
 msgctxt "HelpBrowser"
 msgid "Contents"
-msgstr "Contenido"
+msgstr "Ã?ndice"
 
 msgctxt "HelpBrowser"
 msgid "Search"
@@ -1541,7 +1541,7 @@ msgstr "Documentos encontrados"
 
 msgctxt "HelpBrowser"
 msgid "Error Loading Help Contents:"
-msgstr "No se pudo cargar el contenido de la Ayuda:"
+msgstr "No se pudo cargar el índice de la ayuda:"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
@@ -1552,14 +1552,11 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia puede abrir el enlace seleccionado en su Navegador predeterminado. "
-"Si su Navegador no está configurado actualmente para usar el Tor, la "
-"solicitud no será anónima."
+msgstr "Vidalia puede abrir el enlace seleccionado en su navegador predeterminado. Si su navegador no está configurado para usar Tor la solicitud no será anónima."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "¿Desea que Vidalia abra el enlace en su Navegador predeterminado?"
+msgstr "¿Desea que Vidalia abra el enlace en su navegador predeterminado?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
@@ -1569,9 +1566,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. "
-"Puede intentarlo copiando el URL y pegándolo en su navegador."
+msgstr "Vidalia no pudo abrir en su navegador el enlace seleccionado Puede copiar la dirección y pegarla en su navegador."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1579,7 +1574,7 @@ msgstr "No se pudo abrir el archivo de ayuda:"
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr "Información de Licencia"
+msgstr "Información sobre la licencia"
 
 msgctxt "LicenseDialog"
 msgid "License"
@@ -1619,7 +1614,7 @@ msgstr "Depurar"
 
 msgctxt "LogTreeItem"
 msgid "Info"
-msgstr "Info"
+msgstr "Información"
 
 msgctxt "LogTreeItem"
 msgid "Notice"
@@ -1647,19 +1642,19 @@ msgstr "Salir"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr "Gráfica de Ancho de Banda"
+msgstr "Gráfica de ancho de banda"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr "Registro de Mensajes"
+msgstr "Registro de mensajes"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr "Mapa de Red"
+msgstr "Mapa de red"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr "Panel de Control"
+msgstr "Panel de control"
 
 msgctxt "MainWindow"
 msgid "Settings"
@@ -1675,35 +1670,35 @@ msgstr "Ayuda"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr "Nueva Identidad"
+msgstr "Nueva identidad"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr "Ctrl + T"
 
 msgctxt "MainWindow"
 msgid "Ctrl+B"
-msgstr "Ctrl+B"
+msgstr "Ctrl + B"
 
 msgctxt "MainWindow"
 msgid "Ctrl+L"
-msgstr "Ctrl+L"
+msgstr "Ctrl + L"
 
 msgctxt "MainWindow"
 msgid "Ctrl+N"
-msgstr "Ctrl+N"
+msgstr "Ctrl + N"
 
 msgctxt "MainWindow"
 msgid "Ctrl+?"
-msgstr "Ctrl+?"
+msgstr "Ctrl + ?"
 
 msgctxt "MainWindow"
 msgid "Ctrl+I"
-msgstr "Ctrl+I"
+msgstr "Ctrl + I"
 
 msgctxt "MainWindow"
 msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr "Ctrl + P"
 
 msgctxt "MainWindow"
 msgid "Tor"
@@ -1719,15 +1714,15 @@ msgstr "Ayuda de Vidalia"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr "Error al iniciar navegador web"
+msgstr "Error al iniciar el navegador"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia no pudo iniciar el navegador web configurado"
+msgstr "Vidalia no pudo iniciar el navegador configurado"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr "Error al inicial el cliente IM"
+msgstr "Error al iniciar el cliente IM"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
@@ -1747,7 +1742,7 @@ msgstr "Conectando a un directorio repetidor"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr "Estableciendo una conexión con un directorio encriptado"
+msgstr "Estableciendo una conexión encriptada con el directorio"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
@@ -1759,15 +1754,15 @@ msgstr "Cargando el estado de la red"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr "Cargando los certificados de autoridad"
+msgstr "Cargando los certificados de autoridades"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr "Cargando los certificados de autoridad"
+msgstr "Solicitando información del repetidor"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr "Cargando la información del repetidor"
+msgstr "Cargando información del repetidor"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
@@ -1782,12 +1777,8 @@ 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"
+msgstr "miscelánea"
 
 msgctxt "MainWindow"
 msgid "identity mismatch"
@@ -1807,7 +1798,7 @@ msgstr "tiempo de espera de conexión agotado"
 
 msgctxt "MainWindow"
 msgid "read/write error"
-msgstr "error en escritura/lectura"
+msgstr "error de escritura/lectura"
 
 msgctxt "MainWindow"
 msgid "no route to host"
@@ -1827,7 +1818,7 @@ msgstr "Tor no está ejecutándose"
 
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
-msgstr "Tor se esta apagando"
+msgstr "Tor se está cerrando"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
@@ -1847,15 +1838,13 @@ msgstr "Iniciando Tor"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
-msgstr "Error al Iniciar Tor"
+msgstr "Error al iniciar Tor"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia no pudo iniciar Tor. Verifique sus preferencias para asegurar que "
-"estén especificados el nombre correcto y la localización del ejecutable Tor."
+msgstr "Vidalia no pudo iniciar Tor. Compruebe su configuración para cerciorarse de que incluyen el nombre correcto y la ubicación de su ejecutable Tor."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1863,92 +1852,81 @@ msgstr "Conectando con Tor"
 
 msgctxt "MainWindow"
 msgid "Connection Error"
-msgstr "Error de Conexión"
+msgstr "Error de conexión"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr "Retransmisión Activada"
+msgstr "Retransmisión activada"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
-msgstr "Error al Cerrarse"
+msgstr "Error al cerrar"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia no pudo detener el software de Tor."
+msgstr "Vidalia no pudo detener el software Tor."
 
 msgctxt "MainWindow"
 msgid "Unexpected Error"
-msgstr "Error Inesperado"
+msgstr "Error inesperado"
 
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
-msgstr "Autentificándose con Tor"
+msgstr "Autentificándose en Tor"
 
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
-msgstr "Se Requiere Autenticación a través de Cookie"
+msgstr "Se requiere autentificación mediante cookie"
 
 msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor requiere que Vidalia envíe el contenido de una cookie de autenticación, "
-"pero Vidalia no pudo encontrar ninguna."
+msgstr "Tor requiere que Vidalia envíe el contenido de una cookie de autentificación, pero Vidalia no pudo encontrar ninguna."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"¿Le gustaría examinar usted mismo para encontrar el archivo "
-"'control_auth_cookie'?"
+msgstr "¿Desea buscar usted mismo el archivo 'control_auth_cookie'?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
-msgstr "Directorio de Datos"
+msgstr "Directorio de datos"
 
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
-msgstr "Cookie de Control (control_auth_cookie)"
+msgstr "Cookie de control (control_auth_cookie)"
 
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
-msgstr "Error en el registro de Eventos"
+msgstr "Error en el registro de eventos"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia no pudo registrar algunos eventos. Muchas de las características de "
-"Vidalia pueden no estar disponibles."
+msgstr "Vidalia no pudo registrar algunos eventos. Puede que no estén disponibles muchas funciones de Vidalia."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
-msgstr "Error de Autentificación"
+msgstr "Error de autentificación"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia no pudo autentificarse ante Tor. (%1)"
+msgstr "Vidalia no pudo autentificarse al software Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Por favor, verifique la configuración de autentificación de su puerto de "
-"control."
+msgstr "Por favor, verifique la configuración de autentificación de su puerto de control."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
-msgstr "Actualización de Tor Disponible"
+msgstr "Actualización de Tor disponible"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"La versión actualmente instalada de Tor está desactualizada o no se "
-"recomiendo su uso. Por favor, visite el sitio web de Tor y descargue la "
-"versión más reciente."
+msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomienda su uso. Please visit the Tor website to download the latest version."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1958,9 +1936,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Todas las conexiones subsecuentes parecerán diferentes que sus conexiones "
-"antiguas."
+msgstr "Todas las conexiones subsecuentes parecerán diferentes que sus conexiones antiguas."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1988,7 +1964,7 @@ msgstr "Métodos abreviados de Vidalia"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "Configuración de retransmisión\n"
+msgstr "Configuración de retransmisión"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
@@ -2055,25 +2031,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia trató de reiniciar la contraseña de control de Tor, pero no pudo "
-"reiniciar su software. Verifique su Administrador de Tareas para asegurarse "
-"de que no esté ejecutándose otro proceso de Tor."
+msgstr "Vidalia trató de reiniciar la contraseña de control de Tor, pero no pudo reiniciar su software. Verifique su Administrador de Tareas para asegurarse de que no esté ejecutándose otro proceso de Tor."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"La versión actualmente instalada de Tor está desactualizada o no se "
-"recomiendo su uso."
+msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomienda su uso."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"¿Le gustaría verificar si hay un nuevo paquete disponible para su "
-"instalación?"
+msgstr "¿Le gustaría verificar si hay un nuevo paquete disponible para su instalación?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2083,8 +2052,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor ha cerrado automáticamente su conexión para proteger su anonimato."
+msgstr "Tor ha cerrado automáticamente su conexión para proteger su anonimato."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2098,9 +2066,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"En este momento no hay paquetes de software Tor disponibles para su "
-"computadora."
+msgstr "En este momento no hay paquetes de software Tor disponibles para su computadora."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2119,10 +2085,25 @@ 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."
-msgstr ""
-"Cualquier cosa enviada a través de esta conexión puede ser monitoreada. Por "
-"favor cheque la configuración de su aplicación e utilize protocolos "
-"encriptados, como SSL, si es posible"
+msgstr "Cualquier cosa enviada a través de esta conexión puede ser monitoreada. Por favor cheque la configuración de su aplicación e utilize protocolos encriptados, como SSL, si es posible"
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Desencadenando torrc de %1 a %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probablemente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probablemente un cliente de correo electrónico)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Una de sus aplicaciones %1 parece estar estableciendo una conexión potencialmente no cifrada e insegura al puerto %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2132,23 +2113,29 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Su repetidor se está deteniendo.\n"
-"Haga clic de nuevo en â??Detenerâ?? para detener ahora su repetidor."
+msgstr "Su repetidor se está deteniendo.\nHaga clic de nuevo en â??Detenerâ?? para detener ahora su repetidor."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Desencadenando torrc de %1 a %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia no sabe cómo comunicarse con Tor porque no puede acceder a este archivo: %1\n\nEste es el último mensaje de error:\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 "Parece que Tor se ha detenido tras haber sido iniciado por Vidalia.\n\nConsulte el Registro avanzado de mensajes para más información."
 
 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?"
-msgstr ""
-"Actualmente está ejecutando un repetidor. La detención del mismo interrumpiría cualesquiera conexiones que tengan abiertas los clientes.\n"
-"\n"
-"¿Podría darle tiempo a los clientes de encontrar un nuevo repetidor?"
+msgstr "Actualmente está ejecutando un repetidor. La detención del mismo interrumpiría cualesquiera conexiones que tengan abiertas los clientes.\n\n¿Podría darle tiempo a los clientes de encontrar un nuevo repetidor?"
 
 msgctxt "MainWindow"
 msgid ""
@@ -2157,22 +2144,6 @@ msgid ""
 "Please check the message log for recent warning or error messages."
 msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
 
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablemente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probablemente un cliente de correo electrónico)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Una de sus aplicaciones %1 parece estar estableciendo una conexión "
-"potencialmente no cifrada e insegura al puerto %2."
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr "Error configurando filtro"
@@ -2195,9 +2166,7 @@ msgstr "Nombre de Archivo de Registro requerido"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Debe escribir un nombre de archivo para poder guardar en él los mensajes de "
-"registro."
+msgstr "Debe escribir un nombre de archivo para poder guardar en él los mensajes de registro."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2257,7 +2226,7 @@ msgstr "Borrar"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Borrar todos los mensajes del Registro de Mensajes "
+msgstr "Borrar todos los mensajes del Registro de Mensajes"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
@@ -2409,8 +2378,7 @@ msgstr "Historial del Registro de Mensajes"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr ""
-"Cantidad de mensajes que aparecerán en la ventana del registro de mensajes"
+msgstr "Cantidad de mensajes que aparecerán en la ventana del registro de mensajes"
 
 msgctxt "MessageLog"
 msgid "messages"
@@ -2422,8 +2390,7 @@ msgstr "Examinar"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Habilitar el guardado automático en un archivo de todos los mensajes nuevos"
+msgstr "Habilitar el guardado automático en un archivo de todos los mensajes nuevos"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2449,17 +2416,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Mensajes que aparecen cuando algo ha \n"
-"ido muy mal y Tor no puede continuar."
+msgstr "Mensajes que aparecen cuando algo ha \nido muy mal y Tor no puede continuar."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Mensajes que aparecen solamente cuando \n"
-"algo ha ido mal con Tor."
+msgstr "Mensajes que aparecen solamente cuando \nalgo ha ido mal con Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2467,36 +2430,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Mensajes que aparecen raramente \n"
-"durante la operación normal de Tor y no \n"
-"se consideran errores, pero de los que es posible que"
+msgstr "Mensajes que aparecen raramente \ndurante la operación normal de Tor y no \nse consideran errores, pero de los que es posible que"
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Mensajes que aparecen frecuentemente \n"
-"durante la operación normal de Tor."
+msgstr "Mensajes que aparecen frecuentemente \ndurante la operación normal de Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Mensajes muy especializados principalmente para \n"
-"uso de los desarrolladores de Tor."
+msgstr "Mensajes muy especializados principalmente para \nuso de los desarrolladores de Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"No se puede escribir el archivo %1\n"
-"\n"
-"%2."
+msgstr "No se puede escribir el archivo %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2603,14 +2556,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Puente no válido"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "El identificador de puente especificado no es válido."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiar (Ctrl+C)"
 
@@ -2618,17 +2563,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Debe especificar una dirección IP o nombre del equipo y un número de puerto "
-"para configurar Tor para usar un proxy para acceder a Internet."
+msgstr "Debe especificar una dirección IP o nombre del equipo y un número de puerto para configurar Tor para usar un proxy para acceder a Internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Debe especificar uno o más puertos a los que su cortafuegos le permita "
-"conectarse."
+msgstr "Debe especificar uno o más puertos a los que su cortafuegos le permita conectarse."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2660,9 +2601,7 @@ msgstr "Puerto:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Active para conectarse solamente con repetidores que usen puertos permitidos"
-" por la configuración de su cortafuegos"
+msgstr "Active para conectarse solamente con repetidores que usen puertos permitidos por la configuración de su cortafuegos"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2684,9 +2623,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Active para peticiones de directorios encriptadas y opcionalmente, usar "
-"puentes repetidores para acceder a la red Tor"
+msgstr "Active para peticiones de directorios encriptadas y opcionalmente, usar puentes repetidores para acceder a la red Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2724,14 +2661,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e "
-"intentar de nuevo o probar con otro método para encontrar nuevos puentes."
+msgstr "Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e intentar de nuevo o probar con otro método para encontrar nuevos puentes."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puentes"
+msgstr "Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puentes"
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2754,13 +2688,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP/HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Debe especificar uno o más puentes."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aceptar"
@@ -2917,17 +2851,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Ha configurado Tor para actuar como repetidor de puente para usuarios "
-"censurados, pero su versión de Tor no soporta puentes."
+msgstr "Ha configurado Tor para actuar como repetidor de puente para usuarios censurados, pero su versión de Tor no soporta puentes."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Por favor, mejore su versión de Tor o configúrelo para actuar como un "
-"repetidor regular."
+msgstr "Por favor, mejore su versión de Tor o configúrelo para actuar como un repetidor regular."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2942,10 +2872,6 @@ msgid "Run as a client only"
 msgstr "Ejecutar como sólo cliente"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Repetidor de tráfico para la red Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Puerto repetidor:"
 
@@ -2983,9 +2909,7 @@ msgstr "Nombre de su repetidor"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Puerto por el que los usuarios y otros repetidores pueden comunicarse con su"
-" repetidor"
+msgstr "Puerto por el que los usuarios y otros repetidores pueden comunicarse con su repetidor"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2999,9 +2923,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Para conexiones de internet con velocidades de descarga rápida pero subida "
-"lenta, por favor escriba su velocidad de subida aquí."
+msgstr "Para conexiones de internet con velocidades de descarga rápida pero subida lenta, por favor escriba su velocidad de subida aquí."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3059,9 +2981,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"La tasa máxima de su ancho de banda debe ser mayor o igual que su tasa de "
-"ancho de banda promedio. Ambos valores deben ser al menos 20KB/s."
+msgstr "La tasa máxima de su ancho de banda debe ser mayor o igual que su tasa de ancho de banda promedio. Ambos valores deben ser al menos 20KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3122,18 +3042,13 @@ msgstr "Mostrar ayuda acerca de las políticas de salida"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"¿A cuáles recursos de Internet podrán acceder los usuarios conectados a su "
-"repetidor?"
+msgstr "¿A cuáles recursos de Internet podrán acceder los usuarios conectados a su repetidor?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor seguirá bloqueando algún correo saliente y aplicaciones de compartir "
-"archivos de manera predeterminada para reducir el correo basura y otros "
-"abusos."
+msgstr "Tor seguirá bloqueando algún correo saliente y aplicaciones de compartir archivos de manera predeterminada para reducir el correo basura y otros abusos."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3146,9 +3061,7 @@ msgstr "Permitir a otros acceder a su puente dándoles esta línea:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Este es el identificador de su puente repetidor que puede ofrecer a otras "
-"personas"
+msgstr "Este es el identificador de su puente repetidor que puede ofrecer a otras personas"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3166,9 +3079,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Permita que su repetidor siga ejecutándose para que los clientes tengan más "
-"oportunidades de encontrarlo y usarlo"
+msgstr "Permita que su repetidor siga ejecutándose para que los clientes tengan más oportunidades de encontrarlo y usarlo"
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3182,9 +3093,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor devolvió una respuesta con formato incorrecto cuando Vidalia solicitó el"
-" historial de utilización de sus puentes."
+msgstr "Tor devolvió una respuesta con formato incorrecto cuando Vidalia solicitó el historial de utilización de sus puentes."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3207,6 +3116,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuir mi dirección de puente automaticamente"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Tráfico de los repetidores de la red Tor (repetidores de salida)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Tráfico de los repetidores dentro de la red Tor (excepto los repetidores de salida)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Replicar el Directorio repetidor"
 
@@ -3214,9 +3131,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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\n"
-"problema con su repetidor. Pudiera incluir también su huella PGP o GPG."
+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"
@@ -3226,9 +3141,7 @@ 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."
+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"
@@ -3296,8 +3209,7 @@ msgstr "Copiar dirección onion del servicio seleccionado al portapapeles"
 
 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"
+msgstr "Explorar sus archivos y elegir un directorio para servicios seleccionados"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3324,10 +3236,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Seleccione \"Iniciar Tor\" en el panel de control de Vidalia para reiniciar "
-"Tor. Si tor se cerró sin inesperadamente, seleccione la pestaña de "
-"\"Avanzado\" para obtener detalles de cualquier error encontrado."
+msgstr "Seleccione \"Iniciar Tor\" en el panel de control de Vidalia para reiniciar Tor. Si tor se cerró sin inesperadamente, seleccione la pestaña de \"Avanzado\" para obtener detalles de cualquier error encontrado."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3335,11 +3244,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Actualmente está ejecutando la versión \"%1\" del software Tor, la cuál ya "
-"no es recomendada. Por favor actualice a la versión más reciente del "
-"software, la cuál podría contener mejoras importantes de seguridad, "
-"confiabilidad y desempeño."
+msgstr "Actualmente está ejecutando la versión \"%1\" del software Tor, la cuál ya no es recomendada. Por favor actualice a la versión más reciente del software, la cuál podría contener mejoras importantes de seguridad, confiabilidad y desempeño."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3347,11 +3252,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Actualmente está ejecutando la versión \"%1\" del software Tor, la cuál ya "
-"podría no funcionar con la red Tor. Por favor actualice a la versión más "
-"reciente del software, la cuál podría contener mejoras importantes de "
-"seguridad, confiabilidad y desempeño."
+msgstr "Actualmente está ejecutando la versión \"%1\" del software Tor, la cuál ya podría no funcionar con la red Tor. Por favor actualice a la versión más reciente del software, la cuál podría contener mejoras importantes de seguridad, confiabilidad y desempeño."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3365,9 +3266,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Hemos establecido una conexión exitosa con la red Tor. Ahora puede "
-"configurar sus aplicaciones para usar la Internet de forma anónima."
+msgstr "Hemos establecido una conexión exitosa con la red Tor. Ahora puede configurar sus aplicaciones para usar la Internet de forma anónima."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3377,10 +3276,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"El software Tor ha encontrado un fallo interno. Por favor reporte el "
-"siguiente mensaje de error a los desarrolladores de Tor en "
-"bugs.torproject.org: \"%1\""
+msgstr "El software Tor ha encontrado un fallo interno. Por favor reporte el siguiente mensaje de error a los desarrolladores de Tor en bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3388,11 +3284,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor ha determinado que el reloj de su ordenador podría estar configurado  %1"
-" segundos en el pasado, comparado con la fuente \"%2\". Si su reloj no está "
-"configurado correctamente, Tor no podrá funcionar. Por favor verifique que "
-"su ordenador está mostrando la hora correcta."
+msgstr "Tor ha determinado que el reloj de su ordenador podría estar configurado  %1 segundos en el pasado, comparado con la fuente \"%2\". Si su reloj no está configurado correctamente, Tor no podrá funcionar. Por favor verifique que su ordenador está mostrando la hora correcta."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3400,11 +3292,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor ha determinado que el reloj de su ordenador podría estar configurado  %1"
-" segundos en el futuro, comparado con la fuente \"%2\". Si su reloj no está "
-"configurado correctamente, Tor no podrá funcionar. Por favor verifique que "
-"su ordenador está mostrando la hora correcta."
+msgstr "Tor ha determinado que el reloj de su ordenador podría estar configurado  %1 segundos en el futuro, comparado con la fuente \"%2\". Si su reloj no está configurado correctamente, Tor no podrá funcionar. Por favor verifique que su ordenador está mostrando la hora correcta."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3416,21 +3304,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Una de las aplicaciones en su ordenador podría haber intentado establecer "
-"una conexión no cifrada a través de Tor al puerto  %1. Enviar información no"
-" cifrada por la red Tor es peligroso y es recomendado. Para su protección, "
-"Tor ha cerrado esta conexión automáticamente."
+msgstr "Una de las aplicaciones en su ordenador podría haber intentado establecer una conexión no cifrada a través de Tor al puerto  %1. Enviar información no cifrada por la red Tor es peligroso y es recomendado. Para su protección, Tor ha cerrado esta conexión automáticamente."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Una de las aplicaciones en su ordenador podría haber intentado establecer "
-"una conexión no cifrada a través de Tor al puerto  %1. Enviar información no"
-" cifrada por la red Tor es peligroso y es recomendado. "
+msgstr "Una de las aplicaciones en su ordenador podría haber intentado establecer una conexión no cifrada a través de Tor al puerto  %1. Enviar información no cifrada por la red Tor es peligroso y es recomendado. "
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3442,11 +3323,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Una de sus aplicaciones ha establecido una conexión a través de Tor a \"%1\""
-" usando un protocolo que podría filtrar información sobre su destino. Por "
-"favor asegúrese de configurar sus aplicaciones utilizando solamente SOCKS4a "
-"o SOCKS5 con resolución remota del nombre del host."
+msgstr "Una de sus aplicaciones ha establecido una conexión a través de Tor a \"%1\" usando un protocolo que podría filtrar información sobre su destino. Por favor asegúrese de configurar sus aplicaciones utilizando solamente SOCKS4a o SOCKS5 con resolución remota del nombre del host."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3457,11 +3334,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Una de sus aplicaciones ha tratado de establecer una conexión a través de "
-"Tor usando un protocolo que Tor no reconoce. Por favor asegúrese de "
-"configurar sus aplicaciones utilizando solamente SOCKS4a o SOCKS5 con "
-"resolución remota del nombre del host."
+msgstr "Una de sus aplicaciones ha tratado de establecer una conexión a través de Tor usando un protocolo que Tor no reconoce. Por favor asegúrese de configurar sus aplicaciones utilizando solamente SOCKS4a o SOCKS5 con resolución remota del nombre del host."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3472,10 +3345,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Una de sus aplicaciones ha tratado de establecer una conexión a través de "
-"Tor a \"%1\", el cuál no es reconocido por Tor como un nombre de host "
-"válido. Por favor revise la configuración de su aplicación."
+msgstr "Una de sus aplicaciones ha tratado de establecer una conexión a través de Tor a \"%1\", el cuál no es reconocido por Tor como un nombre de host válido. Por favor revise la configuración de su aplicación."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3486,10 +3356,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor ha determinado que la dirección IP pública de su retransmisión es "
-"actualmente  %1%2.  Si esto no es correcto, por favor considere establecer "
-"la opción \"Dirección\" en la configuración de su retransmisión. "
+msgstr "Tor ha determinado que la dirección IP pública de su retransmisión es actualmente  %1%2.  Si esto no es correcto, por favor considere establecer la opción \"Dirección\" en la configuración de su retransmisión. "
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3500,22 +3367,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor ha detectado que su proveedor de DNS está dando respuestas falsas para "
-"dominios que no existen.  Algunos proveedores de servicios de Internet y "
-"otros proveedores de DNS como OpenDNS, son conocidos por hacer esto para "
-"mostrar su propia página de búsqueda o páginas de publicidad."
+msgstr "Tor ha detectado que su proveedor de DNS está dando respuestas falsas para dominios que no existen.  Algunos proveedores de servicios de Internet y otros proveedores de DNS como OpenDNS, son conocidos por hacer esto para mostrar su propia página de búsqueda o páginas de publicidad."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor ha detectado que su proveedor de DNS está dando respuestas falsas para "
-"dominios conocidos. Ya que los clientes dependen de la red de "
-"retransmisiones de Tor para obtener respuestas de DNS precisas, su "
-"retransmisión no podrá ser configurada como una retransmisión de salida."
+msgstr "Tor ha detectado que su proveedor de DNS está dando respuestas falsas para dominios conocidos. Ya que los clientes dependen de la red de retransmisiones de Tor para obtener respuestas de DNS precisas, su retransmisión no podrá ser configurada como una retransmisión de salida."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3526,10 +3385,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor está tratando de terminar si el puerto del servidor de su retransmisión "
-"puede ser alcanzado por la red Tor, conectándose a si mismo en %1:%2. Esto "
-"puede tomar varios minutos."
+msgstr "Tor está tratando de terminar si el puerto del servidor de su retransmisión puede ser alcanzado por la red Tor, conectándose a si mismo en %1:%2. Esto puede tomar varios minutos."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3537,9 +3393,7 @@ msgstr "La prueba de alcance del Puerto del Servidor ha sido exitosa"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-"¡El puerto del servidor de su retransmisión puede ser alcanzado por la red "
-"Tor!"
+msgstr "¡El puerto del servidor de su retransmisión puede ser alcanzado por la red Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
@@ -3551,12 +3405,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"El puerto del servidor de su retransmisión no puede ser alcanzado por otros "
-"clientes de Tor. Esto puede suceder si se encuentra detrás de un router o un"
-" firewall que requiere configurar la redirección de puertos. Si %1:%2 i no "
-"es su dirección IP correcta y su puerto del servidor, por favor revise la "
-"configuración de su retransmisión."
+msgstr "El puerto del servidor de su retransmisión no puede ser alcanzado por otros clientes de Tor. Esto puede suceder si se encuentra detrás de un router o un firewall que requiere configurar la redirección de puertos. Si %1:%2 i no es su dirección IP correcta y su puerto del servidor, por favor revise la configuración de su retransmisión."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3567,10 +3416,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor está tratando de terminar si el puerto de directorio de su retransmisión"
-" puede ser alcanzado por la red Tor, conectándose a si mismo en %1:%2. Esto "
-"puede tomar varios minutos."
+msgstr "Tor está tratando de terminar si el puerto de directorio de su retransmisión puede ser alcanzado por la red Tor, conectándose a si mismo en %1:%2. Esto puede tomar varios minutos."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3578,9 +3424,7 @@ msgstr "La prueba de alcance del Puerto de Directorio ha sido exitosa"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-"¡El puerto del directorio de su retransmisión puede ser alcanzado por la red"
-" Tor!"
+msgstr "¡El puerto del directorio de su retransmisión puede ser alcanzado por la red Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
@@ -3592,12 +3436,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"El puerto del directorio de su retransmisión no puede ser alcanzado por "
-"otros clientes de Tor. Esto puede suceder si se encuentra detrás de un "
-"router o un firewall que requiere configurar la redirección de puertos. Si "
-"%1:%2 i no es su dirección IP correcta y su puerto del directorio, por favor"
-" revise la configuración de su retransmisión."
+msgstr "El puerto del directorio de su retransmisión no puede ser alcanzado por otros clientes de Tor. Esto puede suceder si se encuentra detrás de un router o un firewall que requiere configurar la redirección de puertos. Si %1:%2 i no es su dirección IP correcta y su puerto del directorio, por favor revise la configuración de su retransmisión."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3607,10 +3446,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"El descriptor de su retransmisión, el cuál permite a otros clientes "
-"conectarse a su retransmisión, fue rechazado por el servidor del directorio "
-"a las  %1:%2. La razón fue: %3"
+msgstr "El descriptor de su retransmisión, el cuál permite a otros clientes conectarse a su retransmisión, fue rechazado por el servidor del directorio a las  %1:%2. La razón fue: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3622,12 +3458,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Su retransmisión está en línea y disponible para su uso por otros clientes "
-"de Tor. Usted debería ver un aumento en el tráfico de la red, que se muestra"
-" en el Gráfico de Ancho de Banda, en unas cuantas horas en cuanto otros "
-"clientes conocen de la existencia de su retransmisión.  ¡Gracias por "
-"contribuir a la red Tor!"
+msgstr "Su retransmisión está en línea y disponible para su uso por otros clientes de Tor. Usted debería ver un aumento en el tráfico de la red, que se muestra en el Gráfico de Ancho de Banda, en unas cuantas horas en cuanto otros clientes conocen de la existencia de su retransmisión.  ¡Gracias por contribuir a la red Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3689,9 +3520,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Guardar configuración. Si no se marca, aplicará la configuración a la "
-"instancia actual de Tor."
+msgstr "Guardar configuración. Si no se marca, aplicará la configuración a la instancia actual de Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3731,9 +3560,7 @@ msgstr "Error conectando 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 algún texto, o seleccione "
-"\"Aplicar a todos\""
+msgstr "La selección está vacía. Por favor seleccione algún texto, o seleccione \"Aplicar a todos\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3757,8 +3584,7 @@ msgstr "No se encontraron dispositivos UpnP habilitados"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"No se encontraron dispositivos UPnP de puertas de enlace de Internet válidos"
+msgstr "No se encontraron dispositivos UPnP de puertas de enlace de Internet válidos"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
@@ -3808,17 +3634,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia no pudo verificar la existencia de actualizaciones de software "
-"disponibles porque no pudo encontrar '%1'. "
+msgstr "Vidalia no pudo verificar la existencia de actualizaciones de software disponibles porque no pudo encontrar '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia no pudo verificar si hay actualizaciones de software disponibles "
-"porque el proceso de actualización de Tor terminó inesperadamente."
+msgstr "Vidalia no pudo verificar si hay actualizaciones de software disponibles porque el proceso de actualización de Tor terminó inesperadamente."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3870,9 +3692,7 @@ msgstr "Instalar"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Los siguientes paquetes de software actualizados están listos para su "
-"instalación:"
+msgstr "Los siguientes paquetes de software actualizados están listos para su instalación:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3948,13 +3768,11 @@ msgstr "Establece el directorio de Vidalia para archivos de información."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
-"Establece el nombre y la ubicación del archivo de procesos de Vidalia."
+msgstr "Establece el nombre y la ubicación del archivo de procesos de Vidalia."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
-"Establece el nombre y la ubicación del archivo de registro de Vidalia."
+msgstr "Establece el nombre y la ubicación del archivo de registro de Vidalia."
 
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
@@ -3997,10 +3815,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Posiblemente ya se esté ejecutando otro proceso de Vidalia. Si realmente no hay otro proceso de Vidalia ejecutándose, puede optar por continuar de todos modos.\n"
-"\n"
-"Quiere continuar con el inicio de Vidalia?"
+msgstr "Posiblemente ya se esté ejecutando otro proceso de Vidalia. Si realmente no hay otro proceso de Vidalia ejecutándose, puede optar por continuar de todos modos.\n\nQuiere continuar con el inicio de Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4033,5 +3848,3 @@ msgstr "%1 horas"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 min."
-
-
diff --git a/src/vidalia/i18n/po/et/qt_et.po b/src/vidalia/i18n/po/et/qt_et.po
index 101a83f..0d8354c 100644
--- a/src/vidalia/i18n/po/et/qt_et.po
+++ b/src/vidalia/i18n/po/et/qt_et.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/et/vidalia_et.po b/src/vidalia/i18n/po/et/vidalia_et.po
index 270d9d3..8331b76 100644
--- a/src/vidalia/i18n/po/et/vidalia_et.po
+++ b/src/vidalia/i18n/po/et/vidalia_et.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/eu/qt_eu.po b/src/vidalia/i18n/po/eu/qt_eu.po
index 480643b..6fc6beb 100644
--- a/src/vidalia/i18n/po/eu/qt_eu.po
+++ b/src/vidalia/i18n/po/eu/qt_eu.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <baldarra@xxxxxxxxxxxxxxx>, 2011.
 msgid ""
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-11-14 14:31+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: baldarra <baldarra@xxxxxxxxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 existitzen da jada.\n"
-"Ordeztu nahi al duzu?"
+msgstr "%1 existitzen da jada.\nOrdeztu nahi al duzu?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Fitxategia ez da aurkitu.\n"
-"Mesedez zihurtatu fitxategi izen zuzena eman duzula."
+msgstr "%1\nFitxategia ez da aurkitu.\nMesedez zihurtatu fitxategi izen zuzena eman duzula."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Fitxategia ez da aurkitu.\n"
-"Zihurtatu direktorio izen zuzena eman duzula."
+msgstr "%1\nFitxategia ez da aurkitu.\nZihurtatu direktorio izen zuzena eman duzula."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' idatz babesturik dago.\n"
-"Ezabatu nahi al duzu hala ere?"
+msgstr "'%1' idatz babesturik dago.\nEzabatu nahi al duzu hala ere?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>\"%1\" izena ezin da erabili.</b><p>Saiatu beste izen bat erabiltzen, "
-"karaktere gutxiagorekin edo puntu markarik gabe."
+msgstr "<b>\"%1\" izena ezin da erabili.</b><p>Saiatu beste izen bat erabiltzen, karaktere gutxiagorekin edo puntu markarik gabe."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/eu/vidalia_eu.po b/src/vidalia/i18n/po/eu/vidalia_eu.po
index 733d34c..3f8bf01 100755
--- a/src/vidalia/i18n/po/eu/vidalia_eu.po
+++ b/src/vidalia/i18n/po/eu/vidalia_eu.po
@@ -1,11 +1,14 @@
 # 
+# Translators:
+# Antxon Baldarra <baldarra@xxxxxxxxxxxxxxx>, 2012.
+#   <baldarra@xxxxxxxxxxxxxxx>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-24 15:37+0000\n"
+"Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,2371 +19,2407 @@ msgstr ""
 
 msgctxt "AboutDialog"
 msgid "About Vidalia"
-msgstr ""
+msgstr "Vidaliari buruz"
 
 msgctxt "AboutDialog"
 msgid "License"
-msgstr ""
+msgstr "Lizentzia"
 
 msgctxt "AboutDialog"
 msgid "Vidalia 0.2.0"
-msgstr ""
+msgstr "Vidalia 0.2.0"
 
 msgctxt "AboutDialog"
 msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "Tor 0.2.0.32"
 
 msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
-msgstr ""
+msgstr "Qt 4.4.2"
 
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
-msgstr ""
+msgstr "'%1' ez da IP helbide zuzen bat."
 
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
+msgstr "'Pasahitza' autentifikazioa aukeratu duzu, baina ez duzu pasahitzik zehaztu."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
-msgstr ""
+msgstr "Aukeratu Tor Ezarpen Fitxategia"
 
 msgctxt "AdvancedPage"
 msgid "File Not Found"
-msgstr ""
+msgstr "Ez da Fitxategia aurkitu"
 
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
-msgstr ""
+msgstr "%1 ez da existitzen. Sortu nahi al duzu?"
 
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
-msgstr ""
+msgstr "Akatsa Fitxategia sortzerakoan"
 
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
-msgstr ""
+msgstr "Ezin izan da sortu %1 [%2]"
 
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
-msgstr ""
+msgstr "Aukeratu direktorio bat Tor Datuentzako"
 
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
-msgstr ""
+msgstr "Ezin izan da Tor Zerbitzua kendu"
 
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
-msgstr ""
+msgstr "Ezin izan da Tor Zerbitzua instalatu"
 
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
-msgstr ""
+msgstr "Vidaliak ezin izan du Tor zerbitzua instalatu."
 
 msgctxt "AdvancedPage"
 msgid "Authentication:"
-msgstr ""
+msgstr "Autentifikazioa"
 
 msgctxt "AdvancedPage"
 msgid "Address:"
-msgstr ""
+msgstr "Helbidea:"
 
 msgctxt "AdvancedPage"
 msgid "None"
-msgstr ""
+msgstr "Bat ere ez"
 
 msgctxt "AdvancedPage"
 msgid "Cookie"
-msgstr ""
+msgstr "Cookie-a"
 
 msgctxt "AdvancedPage"
 msgid "Password"
-msgstr ""
+msgstr "Pasahitza"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr ""
+msgstr "Ausazki sortu"
 
 msgctxt "AdvancedPage"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
-msgstr ""
+msgstr "Tor Ezarpen Fitxategia"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
+msgstr "Tor softwarea zehaztutako konfigurazio fitxategiarekin abiarazi (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
-msgstr ""
+msgstr "Aukeratu bidea zure ezarpen fitxategira"
 
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr ""
+msgstr "Arakatu"
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr ""
+msgstr "Datu Direktorioa"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr ""
+msgstr "Tor softwarearen datuak hurrengo direktorioan gorde"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
+msgstr "Aukeratu tor softwarearen datuak gordetzeko direktorioa"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr ""
+msgstr "Tor Kontrola"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "TCP konexioa erabili (ControlPort)"
 
 msgctxt "AdvancedPage"
 msgid "Path:"
-msgstr ""
+msgstr "Bidea:"
 
 msgctxt "AdvancedPage"
 msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Unix domeinu socketa erabili (ControlSocket)"
 
 msgctxt "AdvancedPage"
 msgid "Edit current torrc"
-msgstr ""
+msgstr "Uneko torrc editatu"
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "ADI: honek orain kargatutako torrc editatuko du"
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "ControlSocket bidea ez da existitzen."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "Zehaztutako Tor konfigurazio fitxategiaren kokalekua zure sistemaren 8-biteko karaktere kodeatzaileak idudika ezin dituen karaktereak ditu."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "Zehaztutako Tor datu direktorioaren kokalekua zure sistemaren 8-biteko karaktere kodeatzaileak idudika ezin dituen karaktereak ditu."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
-msgstr ""
+msgstr "Oharra"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "torrc-ren bidea aldatu duzu, Tor berrabiarazi nahi al duzu?"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor Konfigurazio Fitxategia (torrc);;Fitxategi Guztiak (*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Hautatu Tor socket bidea erabiltzeko fitxategi bat"
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr "ControlPort automatikoki konfiguratu"
+
+msgctxt "AdvancedPage"
+msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "ControlPorterako autokonfigurazio aukera gaitu duzu, baina ez duzu Datu Direktoriorik eman. Mesedez gehitu bat, edo ezgaitu \"ControlPort automatikoki konfiguratu\" aukera."
 
 msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
+msgstr "Vidaliak ezin izan du Tor zerbitzua kendu.\n\nEskuz kendu beharko duzu."
 
 msgctxt "AppearancePage"
 msgid "Language"
-msgstr ""
+msgstr "Hizkuntza"
 
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
-msgstr ""
+msgstr "Hautatu Vidalian erabiltzeko hizkuntza"
 
 msgctxt "AppearancePage"
 msgid "Style"
-msgstr ""
+msgstr "Estiloa"
 
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
-msgstr ""
+msgstr "Aukeratu Vidaliaren interfaze estiloa"
 
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
-msgstr ""
+msgstr "Vidaliak ezin izan du aukeratutako hizkuntza itzulpena kargatu."
+
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "Sistemaren Ikono Hobespenak (aldaketak Vidalia berrabiarazten duzunean izango dute eragina)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Erakutsi Erretilu eta Kai Ikonoak (lehenetsia)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Ezkutatu Erretilu Ikonoa"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Ezkutatu Kai Ikonoa"
 
 msgctxt "BandwidthGraph"
 msgid "Since:"
-msgstr ""
+msgstr "Noiztik:"
 
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
-msgstr ""
+msgstr "Ezarpenak ezkutatu"
 
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
-msgstr ""
+msgstr "Ezarpenak erakutsi"
 
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
-msgstr ""
+msgstr "Tor Banda-zabalera erabilpena"
 
 msgctxt "BandwidthGraph"
 msgid "Reset"
-msgstr ""
+msgstr "Berrabiarazi"
 
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
-msgstr ""
+msgstr "Jasotze abiadura"
 
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
-msgstr ""
+msgstr "Bidaltze abiadura"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr ""
+msgstr "Beti goian"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
-msgstr ""
+msgstr "Estiloa"
 
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
-msgstr ""
+msgstr "Aldatu Banda-zabalera grafikoaren gardentasuna"
 
 msgctxt "BandwidthGraph"
 msgid "100"
-msgstr ""
+msgstr "100"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
-msgstr ""
+msgstr "Opako"
 
 msgctxt "BandwidthGraph"
 msgid "Save"
-msgstr ""
+msgstr "Gorde"
 
 msgctxt "BandwidthGraph"
 msgid "Cancel"
-msgstr ""
+msgstr "Utzi"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr ""
+msgstr "HTTPS zubi eskaera hasten..."
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "%1:%2 ra konetatzen..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr ""
+msgstr "Zubientzako HTTPS eskaera bidaltzen..."
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
-msgstr ""
+msgstr "Zubi zerrenda deskargatzen..."
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Downloading Bridges"
-msgstr ""
+msgstr "Zubiak deskargatzen"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Unable to download bridges: %1"
-msgstr ""
+msgstr "Ezin izan dira zubiak deskargatu: %1"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Retrying bridge request..."
-msgstr ""
+msgstr "Zubien eskaera berriz saiatzen..."
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
-msgstr ""
+msgstr "Herrialdea"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
-msgstr ""
+msgstr "# Bezeroak"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
+msgstr "Hurrego herrialdeetako bezeroak zure errelea erabili dute %1 tik"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
-msgstr ""
+msgstr "Zubi erabilpen Laburpena"
 
 msgctxt "BridgeUsageDialog"
 msgid "Client Summary"
-msgstr ""
+msgstr "Bezero Laburpena"
 
 msgctxt "Circuit"
 msgid "New"
-msgstr ""
+msgstr "Berria"
 
 msgctxt "Circuit"
 msgid "Open"
-msgstr ""
+msgstr "Irekita"
 
 msgctxt "Circuit"
 msgid "Building"
-msgstr ""
+msgstr "Eraikitzen"
 
 msgctxt "Circuit"
 msgid "Failed"
-msgstr ""
+msgstr "Huts egin du"
 
 msgctxt "Circuit"
 msgid "Closed"
-msgstr ""
+msgstr "Itxita"
 
 msgctxt "Circuit"
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
-msgstr ""
+msgstr "<Bide hutsa>"
 
 msgctxt "CircuitListWidget"
 msgid "Connection"
-msgstr ""
+msgstr "Konexioa"
 
 msgctxt "CircuitListWidget"
 msgid "Status"
-msgstr ""
+msgstr "Egoera"
 
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
-msgstr ""
+msgstr "Zirkuitura zooma"
 
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
-msgstr ""
+msgstr "Zirkuitua itxi (Supr)"
 
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
-msgstr ""
+msgstr "Korrontea itxi (Supr)"
 
 msgctxt "ConfigDialog"
 msgid "General"
-msgstr ""
+msgstr "Orokorra"
 
 msgctxt "ConfigDialog"
 msgid "Network"
-msgstr ""
+msgstr "Sarea"
 
 msgctxt "ConfigDialog"
 msgid "Sharing"
-msgstr ""
+msgstr "Elkarbanaketa"
 
 msgctxt "ConfigDialog"
 msgid "Services"
-msgstr ""
+msgstr "Zerbitzuak"
 
 msgctxt "ConfigDialog"
 msgid "Appearance"
-msgstr ""
+msgstr "Itxura"
 
 msgctxt "ConfigDialog"
 msgid "Advanced"
-msgstr ""
+msgstr "Aurreratua"
 
 msgctxt "ConfigDialog"
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
-msgstr ""
+msgstr "Huts ezarpenak gordetzerakoan"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
-msgstr ""
+msgstr "Vidaliak ezin izan ditu zure %1 ezarpenak gorde"
 
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
-msgstr ""
+msgstr "Huts ezarpenak aplikatzerakoan"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr ""
+msgstr "Vidaliak ezin izan ditu zure %1 ezarpenak Toren aplikatu"
 
 msgctxt "ConfigDialog"
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr ""
+msgstr "Vidaliak ezin izan du Torera konektatu. (%1)"
 
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
-msgstr ""
+msgstr "Socket kontrola ez dago konektatuta."
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
-msgstr ""
+msgstr "Pasahitza beharrezkoa"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Remember my password"
-msgstr ""
+msgstr "Gogoratu nire pasahitza"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
+msgstr "Vidalia exekutatzen ari den eta pasahitza behar duen Tor prozesu batera konektatu da. Mesedez sartu zure kontrolezko pasahitza:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
-msgstr ""
+msgstr "Socket kontrola ez dago konektatuta."
 
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
-msgstr ""
+msgstr "Huts kontrol komandoa bidaltzerakoan. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
+msgstr "Socketa deskonektatu da datu lerro bat irakurtzen saiatzerakoan."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
-msgstr ""
+msgstr "Baliogabeko kontrol erantzuna. [%1]"
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistan"
 
 msgctxt "CountryInfo"
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 msgctxt "CountryInfo"
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "Antigua eta Barbuda"
 
 msgctxt "CountryInfo"
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaijan"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamak"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "Belarus"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "Belgika"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Bosnia-Herzegovina"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "Kanbodia"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cabo Verde"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "Afrika Erdiko Errepublika"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "Txad"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "Txile"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "Txina"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "Kolonbia"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "Komoreak"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Kongoko Errepublika Demokratikoa"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "Boli Kosta"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "Kroazia"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "Txipre"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "Txekiar Errepublika"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "Dinamarka"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibuti"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikar Errepublika"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekuador"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "Egipto"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Ekuatore Ginea"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "Frantzia"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "Ganbia"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr ""
+msgstr "Alemania"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 msgctxt "CountryInfo"
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr ""
+msgstr "Ginea"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Ginea-Bissau"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 msgctxt "CountryInfo"
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 msgctxt "CountryInfo"
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 msgctxt "CountryInfo"
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr ""
+msgstr "Italia"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
 
 msgctxt "CountryInfo"
 msgid "Japan"
-msgstr ""
+msgstr "Japonia"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr ""
+msgstr "Jordania"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgizistan"
 
 msgctxt "CountryInfo"
 msgid "Laos"
-msgstr ""
+msgstr "Lao Herriaren Errepublika Demokratikoa"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr ""
+msgstr "Letonia"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr ""
+msgstr "Libano"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr ""
+msgstr "Lituania"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxenburgo"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr ""
+msgstr "Mazedonia"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 msgctxt "CountryInfo"
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 msgctxt "CountryInfo"
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Marshall Uharteak"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
-msgstr ""
+msgstr "Maurizio"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr ""
+msgstr "Mikronesiako Estatu Federatuak"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
-msgstr ""
+msgstr "Moldabia"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr ""
+msgstr "Maroko"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozanbike"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 msgctxt "CountryInfo"
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr ""
+msgstr "Herbehereak"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr ""
+msgstr "Zeelanda Berria"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragua"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "Norbegia"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "Palestina"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Ginea Berria"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "Filipinak"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "Polonia"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "Errumania"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "Errusia"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "Saint Kitts eta Nevis"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Santa Luzia"
 
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "Saint Vincent eta Grenadinak"
 
 msgctxt "CountryInfo"
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 msgctxt "CountryInfo"
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "Sao Tome eta Principe"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi Arabia"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 msgctxt "CountryInfo"
 msgid "Serbia"
-msgstr ""
+msgstr "Serbia"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelleak"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leona"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr ""
+msgstr "Eslovakia"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslovenia"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Solomon Uharteak"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr ""
+msgstr "Hegoafrika"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr ""
+msgstr "Espainia"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 msgctxt "CountryInfo"
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr ""
+msgstr "Surinam"
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr ""
+msgstr "Swazilandia"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr ""
+msgstr "Suedia"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr ""
+msgstr "Suitza"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr ""
+msgstr "Siria"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr ""
+msgstr "Tanzania"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr ""
+msgstr "Tailandia"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "Timor-Leste (Ekialdeko Timor)"
 
 msgctxt "CountryInfo"
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 msgctxt "CountryInfo"
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "Trinidad eta Tobago"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
-msgstr ""
+msgstr "Turkia"
 
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 msgctxt "CountryInfo"
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 msgctxt "CountryInfo"
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrainia"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Arabiar Emirerri Batuak"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr ""
+msgstr "Erresuma Batua"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr ""
+msgstr "Estatu Batuak"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguai"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr ""
+msgstr "Vatikano Hiria"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 msgctxt "CountryInfo"
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr ""
+msgstr "Mendebaldeko Sahara"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 msgctxt "CountryInfo"
 msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr ""
+msgstr "Austria"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrein"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopia"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr ""
+msgstr "Finlandia"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr ""
+msgstr "Grezia"
 
 msgctxt "CountryInfo"
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr ""
+msgstr "Hungaria"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr ""
+msgstr "Islandia"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr ""
+msgstr "India"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 msgctxt "CountryInfo"
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr ""
+msgstr "Irlanda"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr ""
+msgstr "Ipar Korea"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr ""
+msgstr "Hego Korea"
 
 msgctxt "CountryInfo"
 msgid "Libya"
-msgstr ""
+msgstr "Libia"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr ""
+msgstr "Maldibak"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr ""
+msgstr "Mexiko"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 msgctxt "CrashReportDialog"
 msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Talka Txosten bat aurkeztu"
 
 msgctxt "CrashReportDialog"
 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 ""
+msgstr "Vidaliak akats bat aurkitu du eta itxi behar izan du"
 
 msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
-msgstr ""
+msgstr "Vidalia berrabiarazi"
 
 msgctxt "CrashReportDialog"
 msgid "Don't Restart"
-msgstr ""
+msgstr "Ez berrabiarazi"
 
 msgctxt "CrashReportDialog"
 msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Ezin izan da Vidalia berrabiarazi"
 
 msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
+msgstr "Ezin izan dugu Vidalia automatikoki berrabiarazi. Mesedez Vidalia eskuz berrabiarazi."
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr ""
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr "Mesedez txartela bete hemen:"
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr ""
+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 ""
+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 "Vidalia garatzaileak arazoa identifikatzen eta konpontzen lagunduko dituen eta bidali dezakezun talka txosten bat sortu da. Aurkeztutako txostenak ez du inolako informazio pertsonalik."
+
+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 "aplikazioak talka egin baino lehenago egiten ari zinenaren deskribapenarekin, talka txostenari dagokion hurrengo fitxategiekin:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
-msgstr ""
+msgstr "Exekutagarriak (*.exe)"
 
 msgctxt "GeneralPage"
 msgid "Select Path to Tor"
-msgstr ""
+msgstr "Aukeratu Torerako bidea"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr ""
+msgstr "Aukeratu Proxy exekutagarria"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
-msgstr ""
+msgstr "Zure Tor exekutagarriaren izena zehaztu behar duzu."
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
-msgstr ""
+msgstr "Abiarazi Vidalia nire sistema abiarazterakoan."
 
 msgctxt "GeneralPage"
 msgid "Browse"
-msgstr ""
+msgstr "Arakatu"
 
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
-msgstr ""
+msgstr "Abiarazi Tor softwarea Vidalia abiarazterakoan"
 
 msgctxt "GeneralPage"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr ""
+msgstr "Proxy Aplikazioa (hautazkoa)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr ""
+msgstr "Proxy aplikazio bat abiarazi Tor abiarazterakoan"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr ""
+msgstr "Proxy aplikazioaren argumentuak:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr ""
+msgstr "Software Eguneraketak"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "Software eguneraketa berriak dauden automatikoki egiaztatu"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "Egiaztatu orain"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "GraphFrame"
 msgid "%1 KB"
-msgstr ""
+msgstr "%1 KB"
 
 msgctxt "GraphFrame"
 msgid "%1 MB"
-msgstr ""
+msgstr "%1 MB"
 
 msgctxt "GraphFrame"
 msgid "%1 GB"
-msgstr ""
+msgstr "%1 GB"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr ""
+msgstr "Jasoa:"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
-msgstr ""
+msgstr "Bidalia:"
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
+msgstr "Emandako XML fitxategia ez da baliozko Contents dokumentua."
 
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
-msgstr ""
+msgstr "Bilaketa dokumentuaren amaierara heldu da"
 
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
-msgstr ""
+msgstr "Bilaketa dokumentuaren hasierara heldu da"
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
-msgstr ""
+msgstr "Testua ez da dokumentuan aurkitu"
 
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
-msgstr ""
+msgstr "%1 emaitza aurkitu dira"
 
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Vidaliaren Laguntza"
 
 msgctxt "HelpBrowser"
 msgid "Back"
-msgstr ""
+msgstr "Atzera"
 
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
-msgstr ""
+msgstr "Aurreko orrira joan (Atzera)"
 
 msgctxt "HelpBrowser"
 msgid "Backspace"
-msgstr ""
+msgstr "Atzera"
 
 msgctxt "HelpBrowser"
 msgid "Forward"
-msgstr ""
+msgstr "Aurrera"
 
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
-msgstr ""
+msgstr "Hurrengo orrira joan (Shift+Atzera)"
 
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
-msgstr ""
+msgstr "Shift+Atzera"
 
 msgctxt "HelpBrowser"
 msgid "Home"
-msgstr ""
+msgstr "Etxea"
 
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
+msgstr "Etxeko orrira joan (Ktrl+H)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
-msgstr ""
+msgstr "Ktrl+H"
 
 msgctxt "HelpBrowser"
 msgid "Find"
-msgstr ""
+msgstr "Bilatu"
 
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
+msgstr "Hitz edo esaldi bat bilatu uneko orrian (Ktrl+F)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ktrl+F"
 
 msgctxt "HelpBrowser"
 msgid "Close"
-msgstr ""
+msgstr "Itxi"
 
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
-msgstr ""
+msgstr "Vidaliaren Laguntza itxi"
 
 msgctxt "HelpBrowser"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "HelpBrowser"
 msgid "Find:"
-msgstr ""
+msgstr "Bilatu:"
 
 msgctxt "HelpBrowser"
 msgid "Find Previous"
-msgstr ""
+msgstr "Aurrekoa bilatu"
 
 msgctxt "HelpBrowser"
 msgid "Find Next"
-msgstr ""
+msgstr "Hurrengoa bilatu"
 
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
-msgstr ""
+msgstr "Letra larriak eta xeheak bereiztu"
 
 msgctxt "HelpBrowser"
 msgid "Whole words only"
-msgstr ""
+msgstr "Hitz osoak bakarrik"
 
 msgctxt "HelpBrowser"
 msgid "Help Topics"
-msgstr ""
+msgstr "Laguntza Gaiak"
 
 msgctxt "HelpBrowser"
 msgid "Contents"
-msgstr ""
+msgstr "Edukiak"
 
 msgctxt "HelpBrowser"
 msgid "Search"
-msgstr ""
+msgstr "Bilaketa"
 
 msgctxt "HelpBrowser"
 msgid "Searching for:"
-msgstr ""
+msgstr "Bilatu:"
 
 msgctxt "HelpBrowser"
 msgid "Found Documents"
-msgstr ""
+msgstr "Aurkitutako dokumentuak"
 
 msgctxt "HelpBrowser"
 msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "Huts laguntza edukiak kargatzerakoan:"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr ""
+msgstr "Kanpo lotura irekitzen"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
+msgstr "Vidaliak aukeratu duzun lotura zure nabigatzaile lehenetsian ireki dezake. Zure nabigatzilea Tor erabiltzeko prest ez badago orduan eskaera ez da anonimoa izango."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
+msgstr "Nahi al duzu Vidaliak lotura zure Web nabigatzailean ireki dezala?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
-msgstr ""
+msgstr "Ezin izan da lotura ireki"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
+msgstr "Vidaliak ezin izan du aukeratu duzun lotura zure Web nabigatzailean ireki. Oraindik ere URLa kopiatu eta zure nabigatzailean itsatsi dezakezu."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
-msgstr ""
+msgstr "Huts laguntza fitxategia irekitzerakoan:"
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr ""
+msgstr "Lizentzia informazioa"
 
 msgctxt "LicenseDialog"
 msgid "License"
-msgstr ""
+msgstr "Lizentzia"
 
 msgctxt "LicenseDialog"
 msgid "Credits"
-msgstr ""
+msgstr "Kredituak"
 
 msgctxt "LogEvent"
 msgid "Debug"
-msgstr ""
+msgstr "Araztu"
 
 msgctxt "LogEvent"
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 msgctxt "LogEvent"
 msgid "Notice"
-msgstr ""
+msgstr "Abisua"
 
 msgctxt "LogEvent"
 msgid "Warning"
-msgstr ""
+msgstr "Oharra"
 
 msgctxt "LogEvent"
 msgid "Error"
-msgstr ""
+msgstr "Akatsa"
 
 msgctxt "LogEvent"
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 msgctxt "LogTreeItem"
 msgid "Debug"
-msgstr ""
+msgstr "Arazi"
 
 msgctxt "LogTreeItem"
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 msgctxt "LogTreeItem"
 msgid "Notice"
-msgstr ""
+msgstr "Abisua"
 
 msgctxt "LogTreeItem"
 msgid "Warning"
-msgstr ""
+msgstr "Oharra"
 
 msgctxt "LogTreeItem"
 msgid "Error"
-msgstr ""
+msgstr "Akatsa"
 
 msgctxt "LogTreeItem"
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr ""
+msgstr "Tor hasi"
 
 msgctxt "MainWindow"
 msgid "Exit"
-msgstr ""
+msgstr "Irten"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr ""
+msgstr "Banda-zabalera grafikoa"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr ""
+msgstr "Mezu erregistroa"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr ""
+msgstr "Sarearen mapa"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr ""
+msgstr "Kontrol-panela"
 
 msgctxt "MainWindow"
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
 msgctxt "MainWindow"
 msgid "About"
-msgstr ""
+msgstr "Honi buruz"
 
 msgctxt "MainWindow"
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr ""
+msgstr "Nortasun berria"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ktrl+T"
 
 msgctxt "MainWindow"
 msgid "Ctrl+B"
-msgstr ""
+msgstr "Ktrl+B"
 
 msgctxt "MainWindow"
 msgid "Ctrl+L"
-msgstr ""
+msgstr "Ktrl+L"
 
 msgctxt "MainWindow"
 msgid "Ctrl+N"
-msgstr ""
+msgstr "Ktrl+N"
 
 msgctxt "MainWindow"
 msgid "Ctrl+?"
-msgstr ""
+msgstr "Ktrl+?"
 
 msgctxt "MainWindow"
 msgid "Ctrl+I"
-msgstr ""
+msgstr "Ktrl+I"
 
 msgctxt "MainWindow"
 msgid "Ctrl+P"
-msgstr ""
+msgstr "Ktrl+P"
 
 msgctxt "MainWindow"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 msgctxt "MainWindow"
 msgid "View"
-msgstr ""
+msgstr "Ikusi"
 
 msgctxt "MainWindow"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Vidaliaren Laguntza"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr ""
+msgstr "Huts web nabigatzailea abiarazterakoan"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
+msgstr "Vidaliak ezin izan du konfiguratutako web nabigatzailea abiarazi"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr ""
+msgstr "Huts IM bezeroa abiarazterakoan"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
+msgstr "Vidaliak ezin izan du konfiguratutako IM bezeroa abiarazi"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
-msgstr ""
+msgstr "Huts proxy zerbitzaria abiarazterakoan"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
+msgstr "Vidaliak ezin izan du konfiguratutako proxy zerbitzaria abiarazi"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr ""
+msgstr "Errele direktorio batera konektatzen"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr ""
+msgstr "Enkriptatutako direktorio batera konexioa ezartzen"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
-msgstr ""
+msgstr "Sarearen egoera eskuratzen"
 
 msgctxt "MainWindow"
 msgid "Loading network status"
-msgstr ""
+msgstr "Sarearen egoera kargatzen"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr ""
+msgstr "Aginpide ziurtagiriak kargatzen"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr ""
+msgstr "Errele informazioa eskatzen"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr ""
+msgstr "Errele informazioa kargatzen"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr ""
+msgstr "Tor sarera konektatzen"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
-msgstr ""
+msgstr "Tor zirkuitu bat ezartzen"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
+msgstr "Tor sarera konektatuta!"
 
 msgctxt "MainWindow"
 msgid "miscellaneous"
-msgstr ""
+msgstr "hainbat"
 
 msgctxt "MainWindow"
 msgid "identity mismatch"
-msgstr ""
+msgstr "nortasuna ez dator bat"
 
 msgctxt "MainWindow"
 msgid "done"
-msgstr ""
+msgstr "eginda"
 
 msgctxt "MainWindow"
 msgid "connection refused"
-msgstr ""
+msgstr "konexioa ukatua"
 
 msgctxt "MainWindow"
 msgid "connection timeout"
-msgstr ""
+msgstr "konexioa denboraz kanpo"
 
 msgctxt "MainWindow"
 msgid "read/write error"
-msgstr ""
+msgstr "irakurketa/idazketa akatsa"
 
 msgctxt "MainWindow"
 msgid "no route to host"
-msgstr ""
+msgstr "ez dago biderik ostalarira"
 
 msgctxt "MainWindow"
 msgid "insufficient resources"
-msgstr ""
+msgstr "baliabideak ez dira nahikoak"
 
 msgctxt "MainWindow"
 msgid "unknown"
-msgstr ""
+msgstr "ezezaguna"
 
 msgctxt "MainWindow"
 msgid "Tor is not running"
-msgstr ""
+msgstr "Tor ez da exekutatzen ari"
 
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
-msgstr ""
+msgstr "Tor itzaltzen ari da"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr ""
+msgstr "Tor orain gelditu"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr ""
+msgstr "Tor gelditu"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
-msgstr ""
+msgstr "Tor softwarea abiarazten"
 
 msgctxt "MainWindow"
 msgid "Starting Tor"
-msgstr ""
+msgstr "Tor abiarazten"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
-msgstr ""
+msgstr "Huts Tor abiarazterakoan"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
+msgstr "Vidaliak ezin izan du Tor abiarazi. Egiaztatu zure ezarpenetan zure Tor exekutagarriaren izen eta kokaleku zuzenak zehaztu direla."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
-msgstr ""
+msgstr "Torera konektatzen"
 
 msgctxt "MainWindow"
 msgid "Connection Error"
-msgstr ""
+msgstr "Konexio akatsa"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr ""
+msgstr "Erreleatzea Gaiturik dago"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
-msgstr ""
+msgstr "Huts itzaltzerakoan"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
-msgstr ""
+msgstr "Vidaliak ezin izan du Tor softwarea gelditu."
 
 msgctxt "MainWindow"
 msgid "Unexpected Error"
-msgstr ""
+msgstr "Ustekabeko akatsa"
 
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
-msgstr ""
+msgstr "Torera autentifikatzen"
 
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
-msgstr ""
+msgstr "Cookie autentifikazioa beharrezkoa"
 
 msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
+msgstr "Tor softwareak Vidalia behar du autentifikazio cookie baten edukiak bidaltzeko, baina Vidaliak ezin izan du bat ere ez aurkitu."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
+msgstr "'control_auth_cookie' zuk zeuk bilatu nahiko al zenuke?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
-msgstr ""
+msgstr "Datu direktorioa"
 
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
-msgstr ""
+msgstr "Kontrol Cookie-a (control_auth_cookie)"
 
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
-msgstr ""
+msgstr "Huts Gertaerak erregistratzerakoan"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
+msgstr "Vidaliak ezin izan ditu gertaera batzuk erregistratu. Baliteke Vidaliaren ezaugarri asko erabilgarri ez egotea."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
-msgstr ""
+msgstr "Autentifikazio akatsa"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
+msgstr "Vidaliak ezin izan du Tor softwarera autentifikatu. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
+msgstr "Mesedez egiaztatu zure kontrol portu autentifikazio ezarpenak."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
-msgstr ""
+msgstr "Tor eguneraketa eskuragarri"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
+msgstr "Orain instalatuta duzun Tor bertsioa zaharkituta dago eta bere erabilpena ez da gehiago gomendatzen. Mesedez bisitatu Tor webgunea azken bertsioa eskuratzeko."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
-msgstr ""
+msgstr "Tor webgunea: %1"
 
 msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
+msgstr "Ondorengo konexio guztiak aurrekoen itxura ezberdina hartuko dute."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
-msgstr ""
+msgstr "Huts nortasun berria sortzerakoan"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
-msgstr ""
+msgstr "Huts Portu Jarraipenean"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
+msgstr "Vidaliak ezin izan du Portu Jarraipen automatikoa konfiguratu."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
-msgstr ""
+msgstr "Vidalia Kontrol-panela"
 
 msgctxt "MainWindow"
 msgid "Status"
-msgstr ""
+msgstr "Egoera"
 
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
-msgstr ""
+msgstr "Vidalia lasterbideak"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr ""
+msgstr "Erreleatzea konfiguratu"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
-msgstr ""
+msgstr "Errele bat konfiguratu eta lagundu sarea hazten"
 
 msgctxt "MainWindow"
 msgid "View the Network"
-msgstr ""
+msgstr "Sarea ikusi"
 
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
-msgstr ""
+msgstr "Tor sarearen mapa bat ikusi"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr ""
+msgstr "Nortasun berri bat erabili"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
-msgstr ""
+msgstr "Ondorengo konexioei berriak direlaren itxura eman"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr ""
+msgstr "Ikusi azken banda-zabaleraren erabilera"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr ""
+msgstr "Ikusi mezu erregistroaren historia"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
-msgstr ""
+msgstr "Ikusi laguntza dokumentazioa"
 
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
-msgstr ""
+msgstr "Vidalia Konfiguratu"
 
 msgctxt "MainWindow"
 msgid "View version and license information"
-msgstr ""
+msgstr "Ikusi bertsio eta lizentzia informazioa"
 
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
-msgstr ""
+msgstr "Vidaliatik irten"
 
 msgctxt "MainWindow"
 msgid "Show this window on startup"
-msgstr ""
+msgstr "Lehio hau abioan erakutsi"
 
 msgctxt "MainWindow"
 msgid "Hide"
-msgstr ""
+msgstr "Ezkutatu"
 
 msgctxt "MainWindow"
 msgid "Hide this window"
-msgstr ""
+msgstr "Lehio hau ezkutatu"
 
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
-msgstr ""
+msgstr "Huts pasahitza berrezartzea"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
+msgstr "Vidalia Toren kontrol pasahitza berrezartzen saiatu da, baina ezin izan du Tor softwarea berrabiarazi. Mesedez begiratu zure Ataza Kudeatzailea beste Tor prozesurik martxan ez dagoela egiaztatzeko."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
+msgstr "Orain instalatuta duzun Tor bertsioa zaharkituta dago edo bere erabilpena ez da gehiago gomendatzen."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
+msgstr "Instalatzeko pakete berriren bat eskuragarri dagoen egiaztatu nahiko al zenuke?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
-msgstr ""
+msgstr "Arrisku handiko konexioa"
 
 msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
+msgstr "Torek zure konexioa automatikoki itxi du zure anonimotasuna babesteko."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
-msgstr ""
+msgstr "Eguneraketak huts egin du"
 
 msgctxt "MainWindow"
 msgid "Your software is up to date"
-msgstr ""
+msgstr "Zure softwarea eguneratuta dago"
 
 msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
+msgstr "Oraintxe bertan ez dago Tor software pakete berririk zure ordenagailuarentzako."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
-msgstr ""
+msgstr "Instalazioak huts egin du"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
+msgstr "Vidaliak ezin izan ditu zure software eguneraketak instalatu."
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
+msgstr "Hurrengo akatsa gertatu da:"
 
 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."
-msgstr ""
+msgstr "Konexio honen bitartez bidalitako edozer kontrola daiteke. Mesedez egiaztatu zure aplikazioaren konfigurazioa eta enkriptatutako protokoloak bakarrik erabili, SSL bezala, ahal izanez gero."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "%1 etik %2 ra torrc abio-uhaltzen"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(ziurrenik Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(ziurrenik email bezero bat)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
-msgstr ""
+msgstr "huts egin du (%1)"
 
 msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
+msgstr "Zure errelea itzaltzen ari da orain.\nSakatu 'Gelditu' berriz zure errelea orain gelditzeko."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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?"
-msgstr ""
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidaliak ez daki nola Tori hitzegin fitxategi honetara ezin daitekeelako sartu: %1\n\nHemen duzu azken akats mezua:\n%2"
 
 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."
-msgstr ""
+"See the Advanced Message Log for more information."
+msgstr "Badirudi Tor Vidaliak hasi duenetik gelditu dela.\n\nIkusi Mezu Erregistro Aurreratua informazioa gehiago lortzeko."
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Orain errele bat exekutatzen ari zara. Zure errelea gelditzeak bezeroen edozein konexio irekiak etetea ekarriko du.\n\nGraziaz itzali eta bezeroei errele berri bat bilatzeko denbora eman nahiko al zenieke? "
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ""
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidaliak Tor softwarea ustekabean irten dela detektatu du.\n\nMesedez begiratu mezu erregistroan azkeneko ohar edo akats mezuak."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
-msgstr ""
+msgstr "Huts Filtroa ezartzerakoan"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
+msgstr "Vidaliak ezin izan ditu Toren saio gertaerak erregistratu."
 
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
-msgstr ""
+msgstr "Huts Erregistro Fitxategia irekitzerakoan"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
-msgstr ""
+msgstr "Vidaliak ezin izan du zehaztutako erregistro fitxategia ireki."
 
 msgctxt "MessageLog"
 msgid "Log Filename Required"
-msgstr ""
+msgstr "Erregistro Fitxategiaren izena beharrezkoa"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
+msgstr "Fitxategi izen bat idatzi behar duzu erregistro mezuak fitxategi batean gordetzeko."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
-msgstr ""
+msgstr "Aukeratu Erregistro Fitxategia"
 
 msgctxt "MessageLog"
 msgid "Save Log Messages"
-msgstr ""
+msgstr "Gorde Erregistro Mezuak"
 
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
-msgstr ""
+msgstr "Testu Fitxategiak (*.txt)"
 
 msgctxt "MessageLog"
 msgid "Vidalia"
-msgstr ""
+msgstr "Vidalia"
 
 msgctxt "MessageLog"
 msgid "Find in Message Log"
-msgstr ""
+msgstr "Bilatu Mezu Erregistroan"
 
 msgctxt "MessageLog"
 msgid "Find:"
-msgstr ""
+msgstr "Bilatu:"
 
 msgctxt "MessageLog"
 msgid "Not Found"
-msgstr ""
+msgstr "Ez da aurkitu"
 
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
-msgstr ""
+msgstr "Bilaketak 0 emaitza aurkitu ditu."
 
 msgctxt "MessageLog"
 msgid "Message Log"
-msgstr ""
+msgstr "Mezu Erregistroa"
 
 msgctxt "MessageLog"
 msgid "Message Filters..."
-msgstr ""
+msgstr "Mezu Filtroak..."
 
 msgctxt "MessageLog"
 msgid "Set message filters"
-msgstr ""
+msgstr "Mezu filtroak ezarri"
 
 msgctxt "MessageLog"
 msgid "History Size..."
-msgstr ""
+msgstr "Historiaren tamaina"
 
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
-msgstr ""
+msgstr "Erakutsi behar diren gehienezko mezu kopurua ezarri."
 
 msgctxt "MessageLog"
 msgid "Clear"
-msgstr ""
+msgstr "Garbitu"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
+msgstr "Mezu Erregistrotik mezu guztiak garbitu (Ktrl+E)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
-msgstr ""
+msgstr "Ktrl+E"
 
 msgctxt "MessageLog"
 msgid "Copy"
-msgstr ""
+msgstr "Kopiatu"
 
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr ""
+msgstr "Aukeratutako mezuak arbelean kopiatu (Ktrl+C)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+C"
-msgstr ""
+msgstr "Ktrl+C"
 
 msgctxt "MessageLog"
 msgid "Select All"
-msgstr ""
+msgstr "Hautatu dena"
 
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
-msgstr ""
+msgstr "Mezu guztiak hautatu (Ktrl+A)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+A"
-msgstr ""
+msgstr "Ktrl+A"
 
 msgctxt "MessageLog"
 msgid "Save All"
-msgstr ""
+msgstr "Dena gorde"
 
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
-msgstr ""
+msgstr "Mezu guztiak fitxategi batean gorde"
 
 msgctxt "MessageLog"
 msgid "Save Selected"
-msgstr ""
+msgstr "Aukeratutakoak grode"
 
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
-msgstr ""
+msgstr "Aukeratutako mezuak fitxategi batean gorde"
 
 msgctxt "MessageLog"
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
-msgstr ""
+msgstr "Mezu Erregistro Ezarpenak egokitu"
 
 msgctxt "MessageLog"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ktrl+T"
 
 msgctxt "MessageLog"
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
 
 msgctxt "MessageLog"
 msgid "Show the help browser"
-msgstr ""
+msgstr "Laguntza arakatzailea erakutsi"
 
 msgctxt "MessageLog"
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 msgctxt "MessageLog"
 msgid "Close"
-msgstr ""
+msgstr "Itxi"
 
 msgctxt "MessageLog"
 msgid "Close the Message Log"
-msgstr ""
+msgstr "Mezu Erregistroa itxi"
 
 msgctxt "MessageLog"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "MessageLog"
 msgid "Find"
-msgstr ""
+msgstr "Bilatu"
 
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
+msgstr "Bilaketa testua duten mezu guztiak bilatu (Ktrl+F)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ktrl+F"
 
 msgctxt "MessageLog"
 msgid "Time"
-msgstr ""
+msgstr "Data"
 
 msgctxt "MessageLog"
 msgid "Type"
-msgstr ""
+msgstr "Mota"
 
 msgctxt "MessageLog"
 msgid "Message"
-msgstr ""
+msgstr "Mezua"
 
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
-msgstr ""
+msgstr "Uneko Mezu Erregistro ezarpenak gorde"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
-msgstr ""
+msgstr "Ezarpenak gorde"
 
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
-msgstr ""
+msgstr "Ezarpenei egindako aldaketak bertan behera uzten ditu"
 
 msgctxt "MessageLog"
 msgid "Cancel"
-msgstr ""
+msgstr "Utzi"
 
 msgctxt "MessageLog"
 msgid "Message Filter"
-msgstr ""
+msgstr "Mezu Filtroa"
 
 msgctxt "MessageLog"
 msgid "Error"
-msgstr ""
+msgstr "Akatsa"
 
 msgctxt "MessageLog"
 msgid "Warning"
-msgstr ""
+msgstr "Oharra"
 
 msgctxt "MessageLog"
 msgid "Notice"
-msgstr ""
+msgstr "Abisua"
 
 msgctxt "MessageLog"
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
 msgctxt "MessageLog"
 msgid "Debug"
-msgstr ""
+msgstr "Arazi"
 
 msgctxt "MessageLog"
 msgid "Message Log History"
-msgstr ""
+msgstr "Mezu Erregistroaren historia"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr ""
+msgstr "Mezu erregistroaren lehioan erakutsi behar diren mezu kopurua"
 
 msgctxt "MessageLog"
 msgid "messages"
-msgstr ""
+msgstr "mezu"
 
 msgctxt "MessageLog"
 msgid "Browse"
-msgstr ""
+msgstr "Arakatu"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
+msgstr "Erregistro mezu berriak fitxategi batean automatikoki gordetzea gaitu"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
-msgstr ""
+msgstr "Erregistro mezua berriak fitxategi batean automatikoki gorde"
 
 msgctxt "MessageLog"
 msgid "Basic"
-msgstr ""
+msgstr "Basikoa"
 
 msgctxt "MessageLog"
 msgid "Tor Status"
-msgstr ""
+msgstr "Tor Egoera"
 
 msgctxt "MessageLog"
 msgid "Advanced"
-msgstr ""
+msgstr "Aurreratua"
 
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
-msgstr ""
+msgstr "Beti gorde Erregistro Mezu berriak "
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
+msgstr "Zerbait oso gaizki joan denean eta Torek \njarraitu ezin duenean agertzen diren mezuak."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
+msgstr "Torekin zerbait gaizki joan denean \nbakarrik agertzen diren mezuak."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2388,817 +2427,813 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
+msgstr "Tor eragiketa normalaren bitartean\ngutxitan agertu eta akats bezala \nhartzen ez diren mezuak, baina\nagian arreta jartzekoak."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
+msgstr "Tor eragiketa normalaren bitartean\naskotan agertzen diren mezuak."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
+msgstr "Tor garatzaileentzat gehienbat\nzuzendutako mezuak."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
+msgstr "Ezin da fitxategia idatzi %1\n\n%2"
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
-msgstr ""
+msgstr "Tor Sarearen Mapa"
 
 msgctxt "NetViewer"
 msgid "Refresh"
-msgstr ""
+msgstr "Birkargatu"
 
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
-msgstr ""
+msgstr "Tor errele eta konexio zerrenda birkargatu"
 
 msgctxt "NetViewer"
 msgid "Ctrl+R"
-msgstr ""
+msgstr "Ktrl+R"
 
 msgctxt "NetViewer"
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
 
 msgctxt "NetViewer"
 msgid "Show the network map help"
-msgstr ""
+msgstr "Erakutsi sarearen maparen laguntza"
 
 msgctxt "NetViewer"
 msgid "Show network map help"
-msgstr ""
+msgstr "Erakutsi sare maparen laguntza"
 
 msgctxt "NetViewer"
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 msgctxt "NetViewer"
 msgid "Close"
-msgstr ""
+msgstr "Itxi"
 
 msgctxt "NetViewer"
 msgid "Close the network map"
-msgstr ""
+msgstr "Sarearen mapa itxi"
 
 msgctxt "NetViewer"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "NetViewer"
 msgid "Zoom In"
-msgstr ""
+msgstr "Zoom egin"
 
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
-msgstr ""
+msgstr "Zoom egin sarearen mapan"
 
 msgctxt "NetViewer"
 msgid "+"
-msgstr ""
+msgstr "+"
 
 msgctxt "NetViewer"
 msgid "Zoom Out"
-msgstr ""
+msgstr "Zooma kendu"
 
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
-msgstr ""
+msgstr "Zooma kendu sarearen mapatik"
 
 msgctxt "NetViewer"
 msgid "-"
-msgstr ""
+msgstr "-"
 
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
-msgstr ""
+msgstr "Neurrira zoom egin"
 
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
+msgstr "Unean erakutsitako zirkuitu guztien neurrira zoom egin"
 
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
-msgstr ""
+msgstr "Ktrl+Z"
 
 msgctxt "NetViewer"
 msgid "Relay Not Found"
-msgstr ""
+msgstr "Ez da errelea aurkitu"
 
 msgctxt "NetViewer"
 msgid "No details on the selected relay are available."
-msgstr ""
+msgstr "Aukeratutako errelearen inguruan ez dago xehetasunik."
 
 msgctxt "NetViewer"
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 msgctxt "NetViewer"
 msgid "Full Screen"
-msgstr ""
+msgstr "Pantaila osoa"
 
 msgctxt "NetViewer"
 msgid "View the network map as a full screen window"
-msgstr ""
+msgstr "Ikusi sarearen mapa pantaila osoko lehio bat bezala"
 
 msgctxt "NetViewer"
 msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
+msgstr "Ktrl+F"
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
-msgstr ""
+msgstr "Kopiatu (Ktrl+C)"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
+msgstr "Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
+msgstr "Zure Firewallak konektatzea baimentzen dizun portu bat edo gehiago zehaztu behar duzu."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
-msgstr ""
+msgstr "'%1' ez da portu zenbaki baliogarria."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
+msgstr "Zure tokiko sareak Internetera konektatzeko proxy bat behar duen egiaztatu."
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
-msgstr ""
+msgstr "Proxy bat erabiltzen dut Internetera sartzeko."
 
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
-msgstr ""
+msgstr "Proxy Ezarpenak"
 
 msgctxt "NetworkPage"
 msgid "Username:"
-msgstr ""
+msgstr "Erabiltzaile izena:"
 
 msgctxt "NetworkPage"
 msgid "Password:"
-msgstr ""
+msgstr "Pasahitza:"
 
 msgctxt "NetworkPage"
 msgid "Port:"
-msgstr ""
+msgstr "Portua:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
+msgstr "Bakarrik zure Firewallak onartutako portuak erabiliz erreleetara konektatzeko gaitu"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr ""
+msgstr "Nire Firewallak bakarrik portu zehatz batzuetara konektatzea baimentzet dit"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
-msgstr ""
+msgstr "Firewall Ezarpenak"
 
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
-msgstr ""
+msgstr "Baimendutako Portuak:"
 
 msgctxt "NetworkPage"
 msgid "80, 443"
-msgstr ""
+msgstr "80, 443"
 
 msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
+msgstr "Direktorio eskaerak enkriptatzeko eta, aukeran, Tor sarera sartzeko zubi erreleak erabiltzeko gaitu"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
-msgstr ""
+msgstr "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
-msgstr ""
+msgstr "Zubi Ezarpenak"
 
 msgctxt "NetworkPage"
 msgid "Add a Bridge:"
-msgstr ""
+msgstr "Zubi bat gehitu:"
 
 msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
-msgstr ""
+msgstr "Aukeratutako zubiak zerrendatik kendu"
 
 msgctxt "NetworkPage"
 msgid "Copy the selected bridges to the clipboard"
-msgstr ""
+msgstr "Aukeratutako zubiak arbelera kopiatu"
 
 msgctxt "NetworkPage"
 msgid "Find Bridges Now"
-msgstr ""
+msgstr "Zubiak bilatu orain"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Zein beste modutan aurki ditzaket zubiak?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Nola aurki ditzaket zubiak?</a>"
 
 msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
+msgstr "Ez dago orain zubi eskuragarririk. Momentu bat itxaron dezakezu eta berriz saiatu, edo zubi berriak aurkitzeko beste era bat saiatu."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
+msgstr "Sakatu Laguntza zubi berriak aurkitzeko metodo berriak ikusteko."
 
 msgctxt "NetworkPage"
 msgid "Address:"
-msgstr ""
+msgstr "Helbidea:"
 
 msgctxt "NetworkPage"
 msgid "Type:"
-msgstr ""
+msgstr "Mota:"
 
 msgctxt "NetworkPage"
 msgid "You must select the proxy type."
-msgstr ""
+msgstr "Proxy mota hautatu behar duzu."
 
 msgctxt "NetworkPage"
 msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
 
 msgctxt "NetworkPage"
 msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
+msgid "You must specify one or more bridges."
+msgstr "Zubi bat edo gehiago zehaztu behar duzu."
 
 msgctxt "Policy"
 msgid "accept"
-msgstr ""
+msgstr "onartu"
 
 msgctxt "Policy"
 msgid "reject"
-msgstr ""
+msgstr "ezetsi"
 
 msgctxt "RouterDescriptor"
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
-msgstr ""
+msgstr "Hibernatzen"
 
 msgctxt "RouterDescriptor"
 msgid "Offline"
-msgstr ""
+msgstr "Lineaz kanpo"
 
 msgctxt "RouterDescriptorView"
 msgid "Location:"
-msgstr ""
+msgstr "Kokalekua:"
 
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
-msgstr ""
+msgstr "IP Helbidea:"
 
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
-msgstr ""
+msgstr "Plataforma:"
 
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Banda-zabalera:"
 
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
-msgstr ""
+msgstr "Jarduera denbora"
 
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
-msgstr ""
+msgstr "Azken eguneratzea:"
 
 msgctxt "RouterDescriptorView"
 msgid "Copy"
-msgstr ""
+msgstr "Kopiatu"
 
 msgctxt "RouterInfoDialog"
 msgid "Hibernating"
-msgstr ""
+msgstr "Hibernatzen"
 
 msgctxt "RouterInfoDialog"
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 msgctxt "RouterInfoDialog"
 msgid "Offline"
-msgstr ""
+msgstr "Lineaz kanpo"
 
 msgctxt "RouterInfoDialog"
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 msgctxt "RouterInfoDialog"
 msgid "Relay Details"
-msgstr ""
+msgstr "Errele xehetasunak"
 
 msgctxt "RouterInfoDialog"
 msgid "Summary"
-msgstr ""
+msgstr "Laburpena"
 
 msgctxt "RouterInfoDialog"
 msgid "Name:"
-msgstr ""
+msgstr "Izena:"
 
 msgctxt "RouterInfoDialog"
 msgid "Status:"
-msgstr ""
+msgstr "Egoera:"
 
 msgctxt "RouterInfoDialog"
 msgid "Location:"
-msgstr ""
+msgstr "Kokalekua:"
 
 msgctxt "RouterInfoDialog"
 msgid "IP Address:"
-msgstr ""
+msgstr "IP helbidea:"
 
 msgctxt "RouterInfoDialog"
 msgid "Platform:"
-msgstr ""
+msgstr "Plataforma:"
 
 msgctxt "RouterInfoDialog"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Banda-zabalera:"
 
 msgctxt "RouterInfoDialog"
 msgid "Uptime:"
-msgstr ""
+msgstr "Jarduera denbora"
 
 msgctxt "RouterInfoDialog"
 msgid "Contact:"
-msgstr ""
+msgstr "Harremanetarako:"
 
 msgctxt "RouterInfoDialog"
 msgid "Last Updated:"
-msgstr ""
+msgstr "Azken eguneratzea:"
 
 msgctxt "RouterInfoDialog"
 msgid "Descriptor"
-msgstr ""
+msgstr "Deskriptorea"
 
 msgctxt "RouterListItem"
 msgid "Offline"
-msgstr ""
+msgstr "Lineaz kanpo"
 
 msgctxt "RouterListItem"
 msgid "Hibernating"
-msgstr ""
+msgstr "Hibernatzen"
 
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "RouterListWidget"
 msgid "Relay"
-msgstr ""
+msgstr "Errelea"
 
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
-msgstr ""
+msgstr "Errelera zoom egin"
 
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
-msgstr ""
+msgstr "%1 errele online"
 
 msgctxt "RouterListWidget"
 msgid "Copy"
-msgstr ""
+msgstr "Kopiatu"
 
 msgctxt "RouterListWidget"
 msgid "Nickname"
-msgstr ""
+msgstr "Ezizena"
 
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
-msgstr ""
+msgstr "Hatz-marka"
 
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
-msgstr ""
+msgstr "Zubi euskarria ez dago erabilgarri"
 
 msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
+msgstr "Tor erabiltzaile zentsuratuentzako zubi errele gisa konfiguratu duzu, baina zure Tor bertsioak ez ditu zubiak onartzen."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
+msgstr "Mesedez eguneratu zure Tor softwarea edo Tor konfiguratu Tor errele arrunt bat bezala jardun dadin."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
-msgstr ""
+msgstr "Zure zubi errelea ez dabil exekutatzen ari."
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr ""
+msgstr "Gutxienez errele ezizen eta portua zehaztu behar dituzu."
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
+msgstr "Bezero bezala exekutatu"
 
 msgctxt "ServerPage"
 msgid "Relay Port:"
-msgstr ""
+msgstr "Errele Portua:"
 
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
-msgstr ""
+msgstr "Gaitu errele direktorioa ispilatzeko"
 
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
-msgstr ""
+msgstr "Saiatu portu jarraipena automatikoki konfiguratzen"
 
 msgctxt "ServerPage"
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
-msgstr ""
+msgstr "Erakutsi laguntza gaiak portu jarraipenean"
 
 msgctxt "ServerPage"
 msgid "Directory Port:"
-msgstr ""
+msgstr "Portu Direktorioa:"
 
 msgctxt "ServerPage"
 msgid "Directory Port Number"
-msgstr ""
+msgstr "Portu Direktorio zenbakia"
 
 msgctxt "ServerPage"
 msgid "Contact Info:"
-msgstr ""
+msgstr "Harremanetarako:"
 
 msgctxt "ServerPage"
 msgid "Name of your relay"
-msgstr ""
+msgstr "Izena eman zure erreleari"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
+msgstr "Erabiltzaile eta beste erreleak zure errelearekin komunikatzeko portua"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
-msgstr ""
+msgstr "Ezizena:"
 
 msgctxt "ServerPage"
 msgid "Basic Settings"
-msgstr ""
+msgstr "Oinarrizko Ezarpenak"
 
 msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
+msgstr "Deskarga abiadura bizkorra baina igoera motela duten Internet konexioentzako, mesedez zerrendatu zure igoera abiadura hemen."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
-msgstr ""
+msgstr "Kable/DSL 256 Kbps"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
-msgstr ""
+msgstr "Kable/DSL 512 Kbps"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
-msgstr ""
+msgstr "Kable/DSL 768 Kbps"
 
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr ""
+msgstr "T1/Kable/DSL 1.5 Mbps"
 
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
-msgstr ""
+msgstr "> 1.5 Mbps"
 
 msgctxt "ServerPage"
 msgid "Custom"
-msgstr ""
+msgstr "Pertsonalizatua"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
+msgstr "Hautatu zure Internet konexioarekin antza handien duen aukera"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
-msgstr ""
+msgstr "Erakutsi laguntza gaiak banda-zabalera tasa mugetan"
 
 msgctxt "ServerPage"
 msgid "Average Rate"
-msgstr ""
+msgstr "Batez besteko tasa"
 
 msgctxt "ServerPage"
 msgid "Long-term average bandwidth limit"
-msgstr ""
+msgstr "Epe luzeko batez besteko banda-zabaleraren muga"
 
 msgctxt "ServerPage"
 msgid "KB/s"
-msgstr ""
+msgstr "KB/s"
 
 msgctxt "ServerPage"
 msgid "Maximum Rate"
-msgstr ""
+msgstr "Gehienezko Tasa"
 
 msgctxt "ServerPage"
 msgid "Peak bandwidth rate limit"
-msgstr ""
+msgstr "Banda-zabalera tasa mugaren gailurra"
 
 msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
+msgstr "Zure gehienezko banda-zabalera muga zure batez besteko banda-zabalera mugaren berdina edo handiago izan behar du. Bi balioak gutxienez 20 KB/s-koak izan behar dira."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Banda-zabaleraren mugak"
 
 msgctxt "ServerPage"
 msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
+msgstr "6660 - 6669 eta 6697 portuak"
 
 msgctxt "ServerPage"
 msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "Internet Errele Txata (IRC ingeleraz)"
 
 msgctxt "ServerPage"
 msgid "Ports 110, 143, 993 and 995"
-msgstr ""
+msgstr "110, 143, 993 eta 995 portuak"
 
 msgctxt "ServerPage"
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "Posta eskuratu (POP, IMAP)"
 
 msgctxt "ServerPage"
 msgid "Ports unspecified by other checkboxes"
-msgstr ""
+msgstr "Beste egiaztatze-kutxak zehaztugabeko portuak"
 
 msgctxt "ServerPage"
 msgid "Misc Other Services"
-msgstr ""
+msgstr "Beste Zerbitzuak"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
+msgstr "706, 1863, 5050, 5190, 5222, 5223, 8300 eta 8888 portuak"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "Berehalako Mezularitza (IM ingeleraz)"
 
 msgctxt "ServerPage"
 msgid "Port 443"
-msgstr ""
+msgstr "443 portua"
 
 msgctxt "ServerPage"
 msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "Webgune seguruak (SSL ingeleraz)"
 
 msgctxt "ServerPage"
 msgid "Port 80"
-msgstr ""
+msgstr "80 portua"
 
 msgctxt "ServerPage"
 msgid "Websites"
-msgstr ""
+msgstr "Webguneak"
 
 msgctxt "ServerPage"
 msgid "Show help topic on exit policies"
-msgstr ""
+msgstr "Erakutsi laguntza gaiak irteera politiken inguruan"
 
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
+msgstr "Erabiltzaileek Interneteko zein baliabideetara sartu ahal izango dute zure erreletik?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
+msgstr "Torek oraindik mezu irteera eta fitxategi elkarbanatze aplikazio batzuk blokeatuko ditu spama eta beste gehiegikeri batzuk murrizteko."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
-msgstr ""
+msgstr "Irteera Politikak"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
+msgstr "Baimendu besteei zure zubira sartzen lerro hau emanez:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
+msgstr "Hau da jendeari eman diezaiokezun zure zubi errelearen identifikazioa"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
+msgstr "Kopiatu zure zubi errelearen identifikazioa arbelera"
 
 msgctxt "ServerPage"
 msgid "No Recent Usage"
-msgstr ""
+msgstr "Ez da azken aldian erabili"
 
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "Zure errelea ez du bezerorik erabili azken aldian"
 
 msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
+msgstr "Utzi zure errelea exekutatzen bezeroek errazago aurkitu eta erabil dezaten."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
-msgstr ""
+msgstr "Zubi historia"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
+msgstr "Vidaliak ezin izan du zure zubien erabilera historia eskuratu."
 
 msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
+msgstr "Torek gaizki formateatutako erantzuna itzuli du Vidaliak zure zubien erabilera historia eskatu duenean."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
-msgstr ""
+msgstr "Itzulitako erantzuna hau da: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
+msgstr "Lagundu zentsuratutako erabiltzaileak Tor sarera heltzen"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeUsage\">Nork erabili du nire zubia?</a>"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Zer da hau?</a>"
 
 msgctxt "ServerPage"
 msgid "Automatically distribute my bridge address"
-msgstr ""
+msgstr "Nire zubi helbidea automatikoki banatu"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Tor sarearentzako trafikoa erreleatu (irteera errelea)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Tor sarearen barruan trafikoa erreleatu (ez-irteera errelea)"
 
 msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
-msgstr ""
+msgstr "Errele Direktorioa ispilatu"
 
 msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
+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 ""
+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 ""
+msgstr "Mesedez konfigura ezazu gutxienez zerbitzu direktorio bat eta portu birtual bat gorde nahi duzun zerbitzu bakoitzerako. Kendu besteak."
 
 msgctxt "ServicePage"
 msgid "Error"
-msgstr ""
+msgstr "Akatsa"
 
 msgctxt "ServicePage"
 msgid "Please select a Service."
-msgstr ""
+msgstr "Mesedez Zerbitzu bat aukera ezazu."
 
 msgctxt "ServicePage"
 msgid "Select Service Directory"
-msgstr ""
+msgstr "Aukeratu Zerbitzu Direktorioa"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
+msgstr "Portu Birtualak bakarrik portu zenbaki baliogarriak izan ditzake [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
+msgstr "Helburuak bakarrik helbideak eduki ditzake:portua, helbidea, edo portua."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
-msgstr ""
+msgstr "Beste zerbitzuren batek direktorioa erabiltzen ari da jadanik."
 
 msgctxt "ServicePage"
 msgid "Form"
-msgstr ""
+msgstr "Inprimaki"
 
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
-msgstr ""
+msgstr "Emandako Ezkutuko Zerbitzuak"
 
 msgctxt "ServicePage"
 msgid "Onion Address"
-msgstr ""
+msgstr "Tipula Helbidea"
 
 msgctxt "ServicePage"
 msgid "Virtual Port"
-msgstr ""
+msgstr "Portu Birtuala"
 
 msgctxt "ServicePage"
 msgid "Target"
-msgstr ""
+msgstr "Helburua"
 
 msgctxt "ServicePage"
 msgid "Directory Path"
-msgstr ""
+msgstr "Direktorioaren Bidea"
 
 msgctxt "ServicePage"
 msgid "Enabled"
-msgstr ""
+msgstr "Gaitua"
 
 msgctxt "ServicePage"
 msgid "Add new service to list"
-msgstr ""
+msgstr "Zerrendara zerbitzu berri bat gehitu"
 
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
-msgstr ""
+msgstr "Aukeratutako zerbitzua zerrendatik kendu"
 
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
-msgstr ""
+msgstr "Kopiatu aukeratutako zerbitzuaren tipula helbidea arbelera"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
+msgstr "Arakatu fitxategi sistema lokalean eta hautatu direktorio bat aukeratutako zerbitzuarentzat"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
-msgstr ""
+msgstr "Torek sortua"
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Arbelera kopiatu"
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Tor Softwarea Exekutatzen ari da"
 
 msgctxt "StatusEventWidget"
 msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Orain Tor softwarearen \"%1\" bertsioa exekutatzen zabiltza."
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Tor Softwarea es dabil Exekutatzen ari"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
+msgstr "Sakatu \"Tor hasi\" Vidalia Kontrol-panelan Tor softwarea berrabiarazteko. Tor ustekabean irten bada, aukeratu \"Aurreratua\" fitxa goikaldean gertatu izan daitekeen arazoen inguruko infomazioa lortzeko."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3206,7 +3241,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
+msgstr "Orain Tor softwarearen \"%1\" bertsioa erabiltzen ari zara, gehiago gomendatzen ez dena. Mesedez eguneratu softwarearen bertsio gaurkotuenera, segurtasun, fidagarritasun eta errendimendu konponketa garrantzitsuak ekar ditzakeena."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3214,31 +3249,31 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
+msgstr "Orain Tor softwarearen \"%1\" bertsioa erabiltzen ari zara, agian uneko Tor sarearekin gehiago funtzionatuko ez duena. Mesedez eguneratu softwarearen bertsio gaurkotuenera, segurtasun, fidagarritasun eta errendimendu konponketa garrantzitsuak ekar ditzakeena."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Zure Tor softwarea zaharkituta dago"
 
 msgctxt "StatusEventWidget"
 msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Tor sarera konektatuta"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
+msgstr "Tor sarearekin konexio bat ezartzea arrakastaz lortu dugu. Orain zure aplikazioak konfigura ditzakezu Internet anonimoki erabiltzeko."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor Softwarearen akatsa"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
+msgstr "Tor softwareak barne akats bat aurkitu du. Mesedez bidali hurrengo akats mezua Tor garatzaileei bugs.torproject.org helbidera: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3246,7 +3281,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "Torek zure ordenagailuaren erlojua\"%2\" jatorriarekiko %1 segundu atzeratuta egon daitekeela zehaztu du. Zure erlojua zuzen ez badago, Torek ezingo du funtzionatu. Mesedez egiaztatu zure ordenagailuak ordu zuzena erakusten duela."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3254,11 +3289,11 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "Torek zure ordenagailuaren erlojua\"%2\" jatorriarekiko %1 segundu aurreratuta egon daitekeela zehaztu du. Zure erlojua zuzen ez badago, Torek ezingo du funtzionatu. Mesedez egiaztatu zure ordenagailuak ordu zuzena erakusten duela."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Zure ordenagailuaren erlojua oker egon daiteke agian arrisku handia sortuz"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3266,18 +3301,18 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
+msgstr "Baliteke zure ordenagailuko aplikazioren bat Tor bidez enkriptatu gabeko konexio bat egiten saiatu izana %1 portura. Tor sarean zehar enkriptatu gabeko informazioa bidaltzea arriskutsua da eta ez da gomendagarria. Zure babeserako, Torek automatikoki konexio hau itxi du."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
+msgstr "Baliteke zure ordenagailuko aplikazioren bat Tor bidez enkriptatu gabeko konexio bat egiten saiatu izana %1 portura. Tor sarean zehar enkriptatu gabeko informazioa bidaltzea arriskutsua da eta ez da gomendagarria."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Arrisku handia izan dezakeen konexioa!"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3285,81 +3320,81 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
+msgstr "Zure aplikazioren bat konexio bat ezarri dut Tor sarearen bitartez \"%1\"ra zure kokapenari buruzko informazioa arriskuan jar dezakeen protokolo bat erabiliz. Mesedez ziurtatu zure aplikazioak bakarrik SOCKS4a edo SOCKS5 urruneko ostalari-izen bereizmenarekin erabiltzeko konfiguratuta daudela."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "SOCKS protokolo ezezaguna"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
+msgstr "Zure aplikazioren bat Tor bidezko konexio bat ezartzen saiatu da Torek ulertzen ez duen protokolobaten bitartez. Mesedez ziurtatu zure aplikazioak bakarrik SOCKS4a edo SOCKS5 urruneko ostalari-izen bereizmenarekin erabiltzeko konfiguratuta daudela."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "Ostalari-izen helmuga baliogabea"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
+msgstr "Zure aplikazioren bat Tor bidezko konexio bat ezartzen saiatu da \"%1\"ra, baina Torek ez du ostalari-izen baliogarri bezala igartzen. Mesedez egiaztatu zure aplikazioen konfigurazioa."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
-msgstr ""
+msgstr "Kanpo IP Helbidea aldatua"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
+msgstr "Torek zure errelearen IP helbide publikoa orain %1%2 dela zehaztu du. Horrela ez bada, mesedez kontuan hartu 'Helbidea' aukera ezartzen zure errele konfigurazioan."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "DNS bahiketa detektatua"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
+msgstr "Torek zure DNS hornitzaileak existitzen ez diren domeinuetara erantzun faltsuak eskaintzen ari dela detektatu du. ISP eta beste DNS hornitzaile batzuk, OpenDNS bezala, hau egiteagatik ezagunak dira euren bilaketa eta publizitatea erakusteko."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
+msgstr "Torek zure DNS hornitzaileak oso ezagunak diren domeinuetara erantzun faltsuak eskaintzen ari dela detektatu du. Bezeroak DNS erantzun zehatzak eskuratzeko Tor sarearen erreletaz fidatzen direnez, zure errelea ez da irteera errele bezala konfiguratuko."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Zerbitzari Portu Iritsgarritasuna egiaztatzen"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
+msgstr "Torek zure errelearen zerbitzari portua Tor saretik bere burura %1:%2 en konektatzen iritsgarria den hala ez egiaztatzen saiatzen ari da. Froga honek minutu asko iraun dezake."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Zerbitzari Portu Iritsgarritasun froga arrakastatsua!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "Zure errelearen zerbitzari portua Tor saretik iritsgarria da!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Zerbitzari Portu Iritsgarritasun frogak huts egin du"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3367,30 +3402,30 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
+msgstr "Zure errele zerbitzaria ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta zerbitzari portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Direktorio Portu Iritsgarritasuna egiaztatzen"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
+msgstr "Torek zure errelearen direktorio portua Tor saretik bere burura %1:%2 en konektatzen iritsgarria den hala ez egiaztatzen saiatzen ari da. Froga honek minutu asko iraun dezake."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Direktorio Portu Iritsgarritasun froga arrakastatsua!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "Zure errelearen direktorio portua Tor saretik iritsgarria da!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Direktorio Portu Iritsgarritasun frogak huts egin du"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3398,21 +3433,21 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
+msgstr "Zure errele direktorioa ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta direktorio portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Errele Deskriptorea baztertua"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
+msgstr "Zure errele deskriptorea, bezeroak zure errelera konektatzea baimentzen duena, direktorio zerbitzariak baztertu du hemen %1:%2. Emandako arrazoia hau izan da: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
-msgstr ""
+msgstr "Zure Errelea Online dago"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3420,399 +3455,393 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
+msgstr "Zure errelea orain online dago eta Tor bezeroek erabil dezaten prest. Orduak aurrera joan ahala sare trafikoak gora egiten duela ikusi beharko zenuke Banda-zabalera Grafikoan bezero gehiagok zure erreleari buruz ikasten duten einean. Eskerrik asko Tor sareari laguntza emateagatik!"
 
 msgctxt "Stream"
 msgid "New"
-msgstr ""
+msgstr "Berria"
 
 msgctxt "Stream"
 msgid "Resolving"
-msgstr ""
+msgstr "Konpontzen"
 
 msgctxt "Stream"
 msgid "Connecting"
-msgstr ""
+msgstr "Konektatzen"
 
 msgctxt "Stream"
 msgid "Open"
-msgstr ""
+msgstr "Ireki"
 
 msgctxt "Stream"
 msgid "Failed"
-msgstr ""
+msgstr "Huts egin du"
 
 msgctxt "Stream"
 msgid "Closed"
-msgstr ""
+msgstr "Itxita"
 
 msgctxt "Stream"
 msgid "Retrying"
-msgstr ""
+msgstr "Berriz saiatzen"
 
 msgctxt "Stream"
 msgid "Remapped"
-msgstr ""
+msgstr "Berriz mapeatuta"
 
 msgctxt "Stream"
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
-msgstr ""
+msgstr "%1 prozesuak huts egin du gelditzerakoan. [%2]"
 
 msgctxt "TorService"
 msgid "The Tor service is not installed."
-msgstr ""
+msgstr "Tor zerbitzua ez dago instalatuta."
 
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
-msgstr ""
+msgstr "Ezin izan da Tor zerbitzua hasi"
 
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
-msgstr ""
+msgstr "Huts kontrol pasahitza egiaztatzerakoan"
 
 msgctxt "TorrcDialog"
 msgid "Editing torrc"
-msgstr ""
+msgstr "torrc editatzen"
 
 msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
+msgstr "Ezarpenak gorde. Ezgaituta badago oraingo Tor instantziari bakarrik aplikatuko zaizkio ezarpenak."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
-msgstr ""
+msgstr "Ebaki"
 
 msgctxt "TorrcDialog"
 msgid "Copy"
-msgstr ""
+msgstr "Kopiatu"
 
 msgctxt "TorrcDialog"
 msgid "Paste"
-msgstr ""
+msgstr "Itsatsi"
 
 msgctxt "TorrcDialog"
 msgid "Undo"
-msgstr ""
+msgstr "Desegin"
 
 msgctxt "TorrcDialog"
 msgid "Redo"
-msgstr ""
+msgstr "Berregin"
 
 msgctxt "TorrcDialog"
 msgid "Select All"
-msgstr ""
+msgstr "Hautatu dena"
 
 msgctxt "TorrcDialog"
 msgid "Apply all"
-msgstr ""
+msgstr "Aplikatu dena"
 
 msgctxt "TorrcDialog"
 msgid "Apply selection only"
-msgstr ""
+msgstr "Aukeratutakoa bakarrik aplikatu"
 
 msgctxt "TorrcDialog"
 msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Huts Torera konektatzen"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
+msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Aplikatu dena\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Huts %1 lerroan: \"%2\""
 
 msgctxt "TorrcDialog"
 msgid "Error"
-msgstr ""
+msgstr "Akatsa"
 
 msgctxt "TorrcDialog"
 msgid "An error ocurred while opening torrc file"
-msgstr ""
+msgstr "Akats bat gertatu da torrc fitxategia irekitzerakoan"
 
 msgctxt "UPNPControl"
 msgid "Success"
-msgstr ""
+msgstr "Arrakasta"
 
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Ez dira UPnP-gaituriko gailuak aurkitu"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
+msgstr "Ez dira UPnP-gaituriko Internet atebide baliogarririk aurkitu"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
-msgstr ""
+msgstr "WASAStartupek huts egin du"
 
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
-msgstr ""
+msgstr "Huts mapeatze portu bat gehitzerakoan"
 
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
-msgstr ""
+msgstr "Huts mapeatze portu bat eskuratzerakoan"
 
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
-msgstr ""
+msgstr "Huts mapeatze portu bat kentzerakoan"
 
 msgctxt "UPNPControl"
 msgid "Unknown error"
-msgstr ""
+msgstr "Akats ezezaguna"
 
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
-msgstr ""
+msgstr "UPnP-gaituriko gailuak bilatzen"
 
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
-msgstr ""
+msgstr "Mapeatze portu direktorioa eguneratzen"
 
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
-msgstr ""
+msgstr "Mapeatze portu errelea eguneratzen"
 
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
-msgstr ""
+msgstr "Froga arrakastaz burutu da!"
 
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
-msgstr ""
+msgstr "UPnP onarpena frogatzen"
 
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
-msgstr ""
+msgstr "Universal Plug & Play onarpena frogatzen"
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
+msgstr "Vidaliak ezin izan du eskuragarri egon daitezkeen software eguneraketak begiratu '%1' ezin izan duelako aurkitu."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
+msgstr "Vidaliak ezin izan du eskuragarri egon daitezkeen software eguneraketak begiratu Toren eguneraketa prozesua ustekabean irten delako."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
-msgstr ""
+msgstr "Eskuragarri egon daitezkeen eguneraketen bila..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Hide"
-msgstr ""
+msgstr "Ezkutatu"
 
 msgctxt "UpdateProgressDialog"
 msgid "Downloading updates..."
-msgstr ""
+msgstr "Eguneraketak deskargatzen..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Installing updated software..."
-msgstr ""
+msgstr "Eguneratutako softwarea instalatzen..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "Eginda! Zure softwarea eguneratuta dago."
 
 msgctxt "UpdateProgressDialog"
 msgid "OK"
-msgstr ""
+msgstr "Ados"
 
 msgctxt "UpdateProgressDialog"
 msgid "Software Updates"
-msgstr ""
+msgstr "Software Eguneraketak"
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for updates..."
-msgstr ""
+msgstr "Eguneraketak bilatzen..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Cancel"
-msgstr ""
+msgstr "Utzi"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Software Updates Available"
-msgstr ""
+msgstr "Software Eguneraketak eskuragarri"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Remind Me Later"
-msgstr ""
+msgstr "Beranduago gogora nazazu"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Install"
-msgstr ""
+msgstr "Instalatu"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
+msgstr "Hurrengo software eguneraketa paketeak instalatzeko prest daude:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
-msgstr ""
+msgstr "Paketea"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Version"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
+msgstr "Bertsioa"
 
 msgctxt "VMessageBox"
 msgid "OK"
-msgstr ""
+msgstr "Ados"
 
 msgctxt "VMessageBox"
 msgid "Cancel"
-msgstr ""
+msgstr "Utzi"
 
 msgctxt "VMessageBox"
 msgid "Yes"
-msgstr ""
+msgstr "Bai"
 
 msgctxt "VMessageBox"
 msgid "No"
-msgstr ""
+msgstr "Ez"
 
 msgctxt "VMessageBox"
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
 
 msgctxt "VMessageBox"
 msgid "Retry"
-msgstr ""
+msgstr "Berriz saiatu"
 
 msgctxt "VMessageBox"
 msgid "Show Log"
-msgstr ""
+msgstr "Erakutsi erregistroa"
 
 msgctxt "VMessageBox"
 msgid "Show Settings"
-msgstr ""
+msgstr "Erakutsi Ezarpenak"
 
 msgctxt "VMessageBox"
 msgid "Continue"
-msgstr ""
+msgstr "Jarraitu"
 
 msgctxt "VMessageBox"
 msgid "Quit"
-msgstr ""
+msgstr "Irten"
 
 msgctxt "VMessageBox"
 msgid "Browse"
-msgstr ""
+msgstr "Arakatu"
 
 msgctxt "Vidalia"
 msgid "Invalid Argument"
-msgstr ""
+msgstr "Baliogabeko argumentua"
 
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
-msgstr ""
+msgstr "Vidalia martxan da dagoeneko"
 
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
-msgstr ""
+msgstr "Erabilera mezu hau erakusten du eta irtetzen da."
 
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
-msgstr ""
+msgstr "Grodetako Vidalia ezarpen GUZTIAK berrezartzen ditu."
 
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
+msgstr "Vidaliak datu fitxategientzako erabiltzen duen direktorioa ezartzen du."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
+msgstr "Vidaliaren pidfitxategiaren izena eta kokalekua ezartzen ditu."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
+msgstr "Vidaliaren erregistro-fitxategiaren izena eta kokalekua ezartzen ditu."
 
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
+msgstr "Vidaliaren erregistroaren aditztasun maila ezartzen du."
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
-msgstr ""
+msgstr "Vidaliaren interfaze estiloa ezartzen du."
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
-msgstr ""
+msgstr "Vidaliaren hizkuntza ezartzen du."
 
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
-msgstr ""
+msgstr "Vidaliaren Erabilera Informazioa"
 
 msgctxt "Vidalia"
 msgid "Unable to open log file '%1': %2"
-msgstr ""
+msgstr "Ezin izan da '%1' erregistro fitxategia ireki: %2"
+
+msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr "Parametroarentzako beharrezko balioa:"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Zehaztutako hizkuntza kodea baliogabekoa da:"
 
 msgctxt "Vidalia"
 msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Zehaztutako GUI estiloa baliogabekoa da:"
 
 msgctxt "Vidalia"
 msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Zehaztutako erregistro maila baliogabekoa da:"
 
 msgctxt "Vidalia"
 msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
+msgstr "Litekeena da Vidaliaren beste prozesu bat dagoeneko martxan egotea. Benetan Vidaliaren beste prozesu bat martxan ez badago, jarraitzea aukera dezakezu.\n\nVidalia abiarazten jarratu nahiko al zenuke?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
-msgstr ""
+msgstr "%1 segundu"
 
 msgctxt "stringutil.h"
 msgid "%1 B/s"
-msgstr ""
+msgstr "%1 B/s"
 
 msgctxt "stringutil.h"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "stringutil.h"
 msgid "%1 MB/s"
-msgstr ""
+msgstr "%1 MB/s"
 
 msgctxt "stringutil.h"
 msgid "%1 GB/s"
-msgstr ""
+msgstr "%1 GB/s"
 
 msgctxt "stringutil.h"
 msgid "%1 days"
-msgstr ""
+msgstr "%1 egun"
 
 msgctxt "stringutil.h"
 msgid "%1 hours"
-msgstr ""
+msgstr "%1 ordu"
 
 msgctxt "stringutil.h"
 msgid "%1 mins"
-msgstr ""
-
-
+msgstr "%1 minutu"
diff --git a/src/vidalia/i18n/po/fa/qt_fa.po b/src/vidalia/i18n/po/fa/qt_fa.po
index 90e34f4..b58e15a 100644
--- a/src/vidalia/i18n/po/fa/qt_fa.po
+++ b/src/vidalia/i18n/po/fa/qt_fa.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 Ù?Ù? اÙ?Ù?Ù?Ù? Ù?Ù?جÙ?د است\n"
-"Ø¢Ù?ا Ù?Ù? Ø®Ù?اÙ?Ù?د Ø¢Ù?را جاÙ?گزÙ?Ù? Ù?Ù?Ù?دØ?"
+msgstr "%1 Ù?Ù? اÙ?Ù?Ù?Ù? Ù?Ù?جÙ?د است\nØ¢Ù?ا Ù?Ù? Ø®Ù?اÙ?Ù?د Ø¢Ù?را جاÙ?گزÙ?Ù? Ù?Ù?Ù?دØ?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Ù?اÙ?Ù? Ù¾Ù?دا Ù?شد\n"
-"Ù?Ø·Ù?ا Ú©Ù?ترÙ? Ú©Ù?Ù?د Ù?اÙ? Ù?اÙ?Ù? درست دادÙ? شدÙ? است."
+msgstr "%1\nÙ?اÙ?Ù? Ù¾Ù?دا Ù?شد\nÙ?Ø·Ù?ا Ú©Ù?ترÙ? Ú©Ù?Ù?د Ù?اÙ? Ù?اÙ?Ù? درست دادÙ? شدÙ? است."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"آدرس صحÙ?Ø­ Ù?Ù?ست.\n"
-"Ù?Ø·Ù?ا Ú©Ù?ترÙ? Ú©Ù?Ù?د Ù?اÙ? Ù¾Ù?Ø´Ù? درست دادÙ? شدÙ? است."
+msgstr "%1\nآدرس صحÙ?Ø­ Ù?Ù?ست.\nÙ?Ø·Ù?ا Ú©Ù?ترÙ? Ú©Ù?Ù?د Ù?اÙ? Ù¾Ù?Ø´Ù? درست دادÙ? شدÙ? است."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' Ù?حاÙ?ظت شدÙ? است.\n"
-"Ø¢Ù?ا Ù?Ù?Ø®Ù?اÙ?Ù?د بÙ?ر حاÙ? Ø¢Ù?را پاÙ? Ù?Ù?Ù?د"
+msgstr "'%1' Ù?حاÙ?ظت شدÙ? است.\nØ¢Ù?ا Ù?Ù?Ø®Ù?اÙ?Ù?د بÙ?ر حاÙ? Ø¢Ù?را پاÙ? Ù?Ù?Ù?د"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b> Ù?Ù?Ù? تÙ?اÙ?د استÙ?ادÙ? Ø´Ù?د\"%1\"Ù?اÙ? .</b><p>Ù?Ø·Ù?ا! Ù?اÙ? دÙ?گرÙ? اÙ?تخاب Ù?Ù?Ù?د با "
-"حرÙ?Ù? Ù?Ù?تر ."
+msgstr "<b> Ù?Ù?Ù? تÙ?اÙ?د استÙ?ادÙ? Ø´Ù?د\"%1\"Ù?اÙ? .</b><p>Ù?Ø·Ù?ا! Ù?اÙ? دÙ?گرÙ? اÙ?تخاب Ù?Ù?Ù?د با حرÙ?Ù? Ù?Ù?تر ."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 Ù?Ù?Ù?Ù? باÙ?ت"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 باÙ?ت"
-
-
diff --git a/src/vidalia/i18n/po/fa/vidalia_fa.po b/src/vidalia/i18n/po/fa/vidalia_fa.po
index 0ef8084..4a8aec2 100644
--- a/src/vidalia/i18n/po/fa/vidalia_fa.po
+++ b/src/vidalia/i18n/po/fa/vidalia_fa.po
@@ -4,12 +4,14 @@
 #   <green.dove1388@xxxxxxxxx>, 2011.
 # martin luther king <sabztunnel@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <slander_mo@xxxxxxxxxxx>, 2012.
+#   <s.sampad@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-03 10:08+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-16 09:48+0000\n"
 "Last-Translator: Ardeshir <ardeshir@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -46,8 +48,7 @@ msgstr "'%1' Û?Ú© آدرس IP Ù?عتبر Ù?Û?ست"
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Ø´Ù?ا احراز Ù?Ù?Û?ت بر اساس اسÙ? رÙ?ز را اÙ?تخاب کردÛ?دØ? اÙ?ا اسÙ? رÙ?ز را Ù?شخص Ù?کردÛ?د."
+msgstr "Ø´Ù?ا احراز Ù?Ù?Û?ت بر اساس اسÙ? رÙ?ز را اÙ?تخاب کردÛ?دØ? اÙ?ا اسÙ? رÙ?ز را Ù?شخص Ù?کردÛ?د."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -143,11 +144,11 @@ msgstr "اÙ?تخاب کردÙ? Ù?Ù?رست جÙ?ت ذخÛ?رÙ? دادÙ? Ù?ا برا
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr "Ú©Ù?ترÙ? Ù¾Ù?Ù? تÙ?ر"
+msgstr "Ú©Ù?ترÙ? Ù¾Ù?Ù? تÙ?ر"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
-msgstr "Use TCP connection (ControlPort)"
+msgstr "از ارتباط TCP استÙ?ادÙ? Ú©Ù? (ControlPort)"
 
 msgctxt "AdvancedPage"
 msgid "Path:"
@@ -167,23 +168,19 @@ msgstr "تÙ?جÙ? : اÛ?Ù? torrc بارگذارÛ? شدÙ? Ù?عÙ?Û? را Ù?Û?راÛ?
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket path doesn't exist."
+msgstr "Ù?سÛ?ر ControlSocket Ù?جÙ?د Ù?دارد"
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
+msgstr "The specified Tor configuration file location contains characters that cannot be represented in your system's current 8-bit character encoding."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"تعÛ?Û?Ù? Ù?Ø­Ù? داÛ?رکتÙ?رÛ? Tor را دادÙ? شاÙ?Ù? کاراکتر است Ú©Ù? Ù?Û? تÙ?اÙ?د در سÛ?ستÙ? Ø®Ù?د "
-"رÙ?زگذارÛ? کاراکتر در حاÙ? حاضر 8 - بÛ?ت Ù?شاÙ? دادÙ? Ù?Ù?Û?Ø´Ù?د."
+msgstr "تعÛ?Û?Ù? Ù?Ø­Ù? داÛ?رکتÙ?رÛ? Tor را دادÙ? شاÙ?Ù? کاراکتر است Ú©Ù? Ù?Û? تÙ?اÙ?د در سÛ?ستÙ? Ø®Ù?د رÙ?زگذارÛ? کاراکتر در حاÙ? حاضر 8 - بÛ?ت Ù?شاÙ? دادÙ? Ù?Ù?Û?Ø´Ù?د."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -191,7 +188,7 @@ msgstr "Ù?شدار"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Ø´Ù?ا Ù?سÛ?ر torrc تغÛ?Û?ر دادÙ? اÛ?دØ? Ø¢Û?ا Ù?Û? Ø®Ù?اÙ?Û?د تÙ?ر را رÛ?ستارت Ú©Ù?Û?دØ?"
+msgstr "Ø´Ù?ا Ù?سÛ?ر torrc تغÛ?Û?ر دادÙ? اÛ?دØ? Ø¢Û?ا Ù?Û? Ø®Ù?اÙ?Û?د تÙ?ر را رÛ?ستارت Ú©Ù?Û?دØ?"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
@@ -199,21 +196,25 @@ msgstr "Tor Configuration File (torrc);;All Files (*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr "اÙ?تخاب Ù?اÛ?Ù? بÙ? Ù?سÛ?ر سÙ?کت از Tor استÙ?ادÙ? Ú©Ù?Û?د"
+msgstr "Û?Ú© Ù?اÛ?Ù? براÛ? استÙ?ادÙ? Ù?سÛ?رÙ? سÙ?کتÙ? تÙ?ر اÙ?تخاب Ú©Ù?Û?د"
 
 msgctxt "AdvancedPage"
 msgid "Configure ControlPort automatically"
-msgstr "Ù¾Ù?رتÙ? Ú©Ù?ترÙ? را بصÙ?رت Ø®Ù?دکار Ù¾Û?کربÙ?دÛ? Ú©Ù?"
+msgstr "ControlPort را بصÙ?رت Ø®Ù?دکار Ù¾Û?کربÙ?دÛ? Ú©Ù?"
+
+msgctxt "AdvancedPage"
+msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Ø´Ù?ا گزÛ?Ù?Ù? تÙ?ظÛ?Ù?ات Ø®Ù?دکار را براÛ? ControlPort اÙ?تخاب کردÙ? اÛ?دØ? Ù?Ù?Û? Ù?Û?Ú? داÛ?رکتÙ?رÛ? دادÙ? اÛ? اراÛ?Ù? Ù?کردÛ?د. Ù?Ø·Ù?Ù? Û?Ú©Û? اضاÙ?Ù? Ú©Ù?Û?د Ù? Û?ا گزÛ?Ù?Ù? تÙ?ظÛ?Ù? Ø®Ù?دکار ControlPort را غÛ?رÙ?عاÙ? Ú©Ù?Û?د."
 
 msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست سرÙ?Û?س تÙ?ر را حذÙ? Ú©Ù?د.â??\n"
-"â??\n"
-"شاÛ?د Ù?ازÙ? باشد بÙ? Ø·Ù?ر دستÛ? Ø¢Ù? را حذÙ? Ú©Ù?Û?د"
+msgstr "Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست سرÙ?Û?س تÙ?ر را حذÙ? Ú©Ù?د.â??\nâ??\nشاÛ?د Ù?ازÙ? باشد بÙ? Ø·Ù?ر دستÛ? Ø¢Ù? را حذÙ? Ú©Ù?Û?د"
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -235,6 +236,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 "(Ù¾Û?Ø´ Ù?رض)Dock Icon Ù?  Tray Icon Ù?Ù?اÛ?Ø´"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Ù?Ø®Ù?Û? کردÙ? Tray Icon"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Ù?Ø®Ù?Û? کردÙ? Dock Icon"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "از زÙ?اÙ?:"
@@ -329,9 +347,7 @@ msgstr "# Ú©Ù?اÛ?Ù?ت Ù?ا"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"از تارÛ?Ø® â?ª%1â?¬ Ú©Ù?اÛ?Ù?ت Ù?اÛ?Û? از Ú©Ø´Ù?رÙ?اÛ? زÛ?ر از بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا استÙ?ادÙ? "
-"کردÙ?â??اÙ?د"
+msgstr "از تارÛ?Ø® â?ª%1â?¬ Ú©Ù?اÛ?Ù?ت Ù?اÛ?Û? از Ú©Ø´Ù?رÙ?اÛ? زÛ?ر از بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا استÙ?ادÙ? کردÙ?â??اÙ?د"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -457,9 +473,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Ù?Ù?داÙ?Ù?ا بÙ? Û?Ú© تÙ?ر Ú©Ù? Ù?Ù? اکÙ?Ù?Ù? درحاÙ? اجراست Ù? بÙ? رÙ?ز عبÙ?ر Ù?Û?از دارد Ù?تصÙ? شدÙ? "
-"است. Ù?Ø·Ù?Ù? رÙ?ز عبÙ?ر را Ù?ارد Ù?Ù?Ù?د"
+msgstr "Ù?Ù?داÙ?Ù?ا بÙ? Û?Ú© تÙ?ر Ú©Ù? Ù?Ù? اکÙ?Ù?Ù? درحاÙ? اجراست Ù? بÙ? رÙ?ز عبÙ?ر Ù?Û?از دارد Ù?تصÙ? شدÙ? است. Ù?Ø·Ù?Ù? رÙ?ز عبÙ?ر را Ù?ارد Ù?Ù?Ù?د"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1297,9 +1311,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Ù?ا Ù?تÙ?اÙ?ستÛ?Ù? بÙ? Ø·Ù?ر Ø®Ù?دکار Ù?Û?داÙ?Û?ا راÙ? اÙ?دازÛ? Ù?جدد Ú©Ù?Û?Ù?. Ù?Ø·Ù?ا Ù?Û?داÙ?Û?ا بÙ? "
-"صÙ?رت دستÛ? رÛ?ستارت Ú©Ù?Û?د."
+msgstr "Ù?ا Ù?تÙ?اÙ?ستÛ?Ù? بÙ? Ø·Ù?ر Ø®Ù?دکار Ù?Û?داÙ?Û?ا راÙ? اÙ?دازÛ? Ù?جدد Ú©Ù?Û?Ù?. Ù?Ø·Ù?ا Ù?Û?داÙ?Û?ا بÙ? صÙ?رت دستÛ? رÛ?ستارت Ú©Ù?Û?د."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1309,27 +1321,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"گزارش از کار اÙ?تادÙ? Ù?رÙ? اÙ?زار Ø¢Ù?ادÙ? شدÙ? Ù? Ø´Ù?ا Ù?Û?تÙ?اÙ?Û?د Ø¢Ù? را براÛ? Ú©Ù?Ú© بÙ? "
-"Ø´Ù?اساÛ?Û? Ù? Ø­Ù? Ù?Ø´Ú©Ù? بÙ? تÙ?سعÙ? دÙ?Ù?دگاÙ? Ù?Û?داÙ?Û?ا ارساÙ? Ú©Ù?Û?د. گزارش ثبت شدÙ? حاÙ?Û? "
-"Ù?Û?Ú?Ú¯Ù?Ù?Ù? اطÙ?اعات Ù?Ù?Û?تÛ? شخصÛ? Ù?Û?ست."
+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 ""
-"با شرحÛ? از Ø¢Ù?Ú?Ù? Ù?بÙ? ازکار اÙ?تادÙ? Ù?رÙ? اÙ?زار اÙ?جاÙ? Ù?Û?â??دادÛ?دØ? بÙ?Ù?راÙ? Ù?اÛ?Ù?Ù?اÛ? "
-"Ù?ربÙ?Ø· بÙ? گزارش از کار اÙ?تادÙ?:"
+msgstr "با شرحÛ? از Ø¢Ù?Ú?Ù? Ù?بÙ? ازکار اÙ?تادÙ? Ù?رÙ? اÙ?زار اÙ?جاÙ? Ù?Û?â??دادÛ?دØ? بÙ?Ù?راÙ? Ù?اÛ?Ù?Ù?اÛ? Ù?ربÙ?Ø· بÙ? گزارش از کار اÙ?تادÙ?:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1548,10 +1553,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?Û? تÙ?اÙ?د Ù¾Û?Ù?Ù?دÛ? را Ú©Ù? اÙ?تخاب کردÛ?د در Ù?رÙ?رگر Ù¾Û?Ø´ Ù?رض تاÙ? بازکÙ?د. اگر"
-" Ù?رÙ?رگرتاÙ? براÛ? استÙ?ادÙ? از تÙ?ر Ù¾Û?کربÙ?دÛ? Ù?شدÙ?Ø? Ù?Ù?Û?تتاÙ? در Ù?Ù?گاÙ? درخÙ?است Ù?Ø®Ù?Û? "
-"Ù?Ø®Ù?اÙ?د بÙ?د."
+msgstr "Ù?Û?داÙ?Û?ا Ù?Û? تÙ?اÙ?د Ù¾Û?Ù?Ù?دÛ? را Ú©Ù? اÙ?تخاب کردÛ?د در Ù?رÙ?رگر Ù¾Û?Ø´ Ù?رض تاÙ? بازکÙ?د. اگر Ù?رÙ?رگرتاÙ? براÛ? استÙ?ادÙ? از تÙ?ر Ù¾Û?کربÙ?دÛ? Ù?شدÙ?Ø? Ù?Ù?Û?تتاÙ? در Ù?Ù?گاÙ? درخÙ?است Ù?Ø®Ù?Û? Ù?Ø®Ù?اÙ?د بÙ?د."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1565,9 +1567,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست Ù¾Û?Ù?Ù?د اÙ?تخاب شدÙ? را در Ù?رÙ?رگر Ù?ب بازکÙ?د. Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د Ù?شاÙ?Û?"
-" Ù?ب را Ú©Ù¾Û? کردÙ? Ù? Ø¢Ù? را در Ù?رÙ?رگرتاÙ? بÚ?سباÙ?Û?د."
+msgstr "Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست Ù¾Û?Ù?Ù?د اÙ?تخاب شدÙ? را در Ù?رÙ?رگر Ù?ب بازکÙ?د. Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د Ù?شاÙ?Û? Ù?ب را Ú©Ù¾Û? کردÙ? Ù? Ø¢Ù? را در Ù?رÙ?رگرتاÙ? بÚ?سباÙ?Û?د."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1778,10 +1778,6 @@ msgid "Connected to the Tor network!"
 msgstr "Ù?صÙ? شدÙ? بÙ? شبکÙ? تÙ?ر"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ù?ضعÛ?ت آغاز Ù?اÙ?شخص"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "Ú¯Ù?Ù?اگÙ?Ù?"
 
@@ -1849,9 +1845,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست تÙ?ر را راÙ?â??اÙ?دازÛ? Ú©Ù?د. تÙ?ظÛ?Ù?ات Ø®Ù?د را دÙ?بارÙ? بررسÛ? Ú©Ù?Û?د تا "
-"Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د Ù?سÛ?ر Ù?اÛ?Ù? اجراÛ?Û? تر را درست Ù?شخص کردÙ?â??اÛ?د."
+msgstr "Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست تÙ?ر را راÙ?â??اÙ?دازÛ? Ú©Ù?د. تÙ?ظÛ?Ù?ات Ø®Ù?د را دÙ?بارÙ? بررسÛ? Ú©Ù?Û?د تا Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د Ù?سÛ?ر Ù?اÛ?Ù? اجراÛ?Û? تر را درست Ù?شخص کردÙ?â??اÛ?د."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1889,9 +1883,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Ù?رÙ? اÙ?زار تÙ?ر Ù?Û?از بÙ? ارساÙ? Ù?حتÙ?Û?ات Û?Ú© Ú©Ù?Ú©Û? احراز Ù?Ù?Û?ت بÙ?سÛ?Ù?Ù? Ù?Û?داÙ?Û?ا دارد "
-"اÙ?ا Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست Ø¢Ù? را Ù¾Û?دا Ú©Ù?د."
+msgstr "Ù?رÙ? اÙ?زار تÙ?ر Ù?Û?از بÙ? ارساÙ? Ù?حتÙ?Û?ات Û?Ú© Ú©Ù?Ú©Û? احراز Ù?Ù?Û?ت بÙ?سÛ?Ù?Ù? Ù?Û?داÙ?Û?ا دارد اÙ?ا Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست Ø¢Ù? را Ù¾Û?دا Ú©Ù?د."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1913,9 +1905,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست Ø®Ù?د را براÛ? برخÛ? از رÙ?Û?دادÙ?ا ثبت Ú©Ù?د. بسÛ?ارÛ? از خصÙ?صÛ?ات "
-"Ù?Û?داÙ?Û?ا Ù?Ù?Ú©Ù? است Ú©Ù? Ù?عاÙ? Ù?باشÙ?د."
+msgstr "Ù?Û?داÙ?Û?ا Ù?تÙ?اÙ?ست Ø®Ù?د را براÛ? برخÛ? از رÙ?Û?دادÙ?ا ثبت Ú©Ù?د. بسÛ?ارÛ? از خصÙ?صÛ?ات Ù?Û?داÙ?Û?ا Ù?Ù?Ú©Ù? است Ú©Ù? Ù?عاÙ? Ù?باشÙ?د."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1937,9 +1927,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Ù?سخÙ? Ù?صب شدÙ? تÙ?ر Ù?دÛ?Ù?Û? است Ù? دÛ?گر تÙ?صÛ?Ù? Ù?Ù?Û?Ø´Ù?د. Ø®Ù?اÙ?Ø´Ù?Ù?د است بÙ? ساÛ?ت تÙ?ر "
-"رÙ?تÙ? Ù? آخرÛ?Ù? Ù?سخÙ? را بارگذارÛ? Ú©Ù?Û?د."
+msgstr "Ù?سخÙ? Ù?صب شدÙ? تÙ?ر Ù?دÛ?Ù?Û? است Ù? دÛ?گر تÙ?صÛ?Ù? Ù?Ù?Û?Ø´Ù?د. Ø®Ù?اÙ?Ø´Ù?Ù?د است بÙ? ساÛ?ت تÙ?ر رÙ?تÙ? Ù? آخرÛ?Ù? Ù?سخÙ? را بارگذارÛ? Ú©Ù?Û?د."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1949,8 +1937,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"تÙ?اÙ? اتصاÙ?ات بعدÛ? بÙ? صÙ?رت Ù?تÙ?اÙ?ت از اتصاÙ?ات Ù?بÙ?Û? Ù?Ù?اÛ?Ø´ دادÙ? Ø®Ù?اÙ?Ù?د شد."
+msgstr "تÙ?اÙ? اتصاÙ?ات بعدÛ? بÙ? صÙ?رت Ù?تÙ?اÙ?ت از اتصاÙ?ات Ù?بÙ?Û? Ù?Ù?اÛ?Ø´ دادÙ? Ø®Ù?اÙ?Ù?د شد."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2045,18 +2032,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Ù?Ù?داÙ?Ù?ا در حاÙ? تÙ?اش براÛ? تعÙ?Ù?ض Ú©Ù?Ù?Ù? عبÙ?ر تر است Ø? اÙ?ا Ù?ادر بÙ? راÙ? اÙ?دازÛ? "
-"Ù?جدد Ù?رÙ? اÙ?زار تر Ù?Ù?ست.Ù?Ø·Ù?ا Ù?Ù?ار Ù?ظÙ?Ù?Ù?(Task manager)راÚ?Ù? Ù?Ù?Ù?د تا Ù?Ù?Ú? برÙ?اÙ?Ù? "
-"تÙ?ر در حاÙ? اجرا Ù?باشد."
+msgstr "Ù?Ù?داÙ?Ù?ا در حاÙ? تÙ?اش براÛ? تعÙ?Ù?ض Ú©Ù?Ù?Ù? عبÙ?ر تر است Ø? اÙ?ا Ù?ادر بÙ? راÙ? اÙ?دازÛ? Ù?جدد Ù?رÙ? اÙ?زار تر Ù?Ù?ست.Ù?Ø·Ù?ا Ù?Ù?ار Ù?ظÙ?Ù?Ù?(Task manager)راÚ?Ù? Ù?Ù?Ù?د تا Ù?Ù?Ú? برÙ?اÙ?Ù? تÙ?ر در حاÙ? اجرا Ù?باشد."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Ù?سخÙ? Ù?صب شدÙ? تÙ?ر Ù?دÛ?Ù?Û? است Ù? دÛ?گر تÙ?صÛ?Ù? Ù?Ù?Û?Ø´Ù?د. Ø®Ù?اÙ?Ø´Ù?Ù?د است بÙ? ساÛ?ت تÙ?ر "
-"رÙ?تÙ? Ù? Ù?Ù?اÛ?Û? ترÛ?Ù? Ù?سخÙ? Ø¢Ù? را بارگذارÛ? Ú©Ù?Û?د."
+msgstr "Ù?سخÙ? Ù?صب شدÙ? تÙ?ر Ù?دÛ?Ù?Û? است Ù? دÛ?گر تÙ?صÛ?Ù? Ù?Ù?Û?Ø´Ù?د. Ø®Ù?اÙ?Ø´Ù?Ù?د است بÙ? ساÛ?ت تÙ?ر رÙ?تÙ? Ù? Ù?Ù?اÛ?Û? ترÛ?Ù? Ù?سخÙ? Ø¢Ù? را بارگذارÛ? Ú©Ù?Û?د."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2104,10 +2086,25 @@ 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."
-msgstr ""
-"Ù?رآÙ?Ú?Ù? بÙ?سÛ?Ù?Ù? اÛ?Ù? ارتباط Ù?رستادÙ? Ø´Ù?د Ù?Û? تÙ?اÙ?د Ù?اÙ?Û?تÙ?ر Ø´Ù?د. Ù?Ø·Ù?ا بتÙ?ظÛ?Ù?ات "
-"برÙ?اÙ?Ù? را بررسÛ? Ú©Ù?Û?د Ù? تÙ?Ù?ا از پرÙ?تکÙ? Ù?اÛ? رÙ?زگذارÛ? شدÙ?Ø? از Ù?بÛ?Ù? SSLØ? در صÙ?رت"
-" اÙ?کاÙ? استÙ?ادÙ? Ú©Ù?Û?د."
+msgstr "Ù?رآÙ?Ú?Ù? بÙ?سÛ?Ù?Ù? اÛ?Ù? ارتباط Ù?رستادÙ? Ø´Ù?د Ù?Û? تÙ?اÙ?د Ù?اÙ?Û?تÙ?ر Ø´Ù?د. Ù?Ø·Ù?ا بتÙ?ظÛ?Ù?ات برÙ?اÙ?Ù? را بررسÛ? Ú©Ù?Û?د Ù? تÙ?Ù?ا از پرÙ?تکÙ? Ù?اÛ? رÙ?زگذارÛ? شدÙ?Ø? از Ù?بÛ?Ù? SSLØ? در صÙ?رت اÙ?کاÙ? استÙ?ادÙ? Ú©Ù?Û?د."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "راÙ? اÙ?دازÛ? torrc از %1 بÙ? %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(شاÛ?د تÙ?Ù?â??Ù?ت)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(شاÛ?د Û?Ú© برÙ?اÙ?Ù? اÛ?Ù?Û?Ù?)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "بÙ? Ù?ظر Ù?Û?â??رسد Û?Ú©Û? از برÙ?اÙ?Ù?â??Ù?اÛ? Ø´Ù?ا %1 در حاÙ? برÙ?رارÛ? ارتباطÛ? رÙ?زگذارÛ? Ù?شدÙ? Ù? Ù?ااÙ?Ù? بÙ? Ù¾Ù?رت %2 است"
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2120,43 +2117,33 @@ msgid ""
 msgstr "باز Ú?خش Ø´Ù?ا Ù?تÙ?Ù?Ù? شدÙ? است./n"
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "راÙ? اÙ?دازÛ? torrc از %1 بÙ? %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "\"Ù?Û?داÙ?Û?ا\" Ù?Ù?Û? تÙ?اÙ?د راÙ?Û? براÛ? برÙ?رارÛ? ارتباط با \"تÙ?ر\" Ù¾Û?دا Ú©Ù?د زÛ?را بÙ? Ù?اÛ?Ù?: %1 دسترسÛ? Ù?دارد.\n\nآخرÛ?Ù? Ù¾Û?غاÙ? خطا:\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 "بÙ? Ù?ظر Ù?Û? رسد Ú©Ù? \"تÙ?ر\" پس از اجرا شدÙ? تÙ?سط Vidalia Ù?تÙ?Ù?Ù? شدÙ? است.\n\nبراÛ? کسب اطÙ?اعات بÛ?شتر Ù?Û? تÙ?اÙ?Û?د Ù?سÙ?ت گزارش Ù¾Û?اÙ? Ù¾Û?شرÙ?تÙ? را Ù?شاÙ?دÙ? Ù?Ù?اÛ?Û?د."
 
 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?"
-msgstr ""
-"Ø´Ù?ا در حاÙ? حاضر Ù?Ù? بازپخش دارÙ?د.پاÙ?اÙ? دادÙ? بÙ? اÙ?Ù? بازپخش Ù?Ù?تÙ?اÙ?د اتصاÙ?ات "
-"Ù?اربراÙ? را Ù?تÙ?Ù?Ù? Ù?Ù?د./n/nØ¢Ù?ا Ù?Ù? Ø®Ù?اÙ?Ù?د بÙ? تدرÙ?ج بازپخش بستÙ? Ø´Ù?د Ù? بÙ? Ù?اربراÙ?"
-" Ù?رصت دÙ?Ù?د تا Ù?Ù? بازپخش جدÙ?د بÙ?ابÙ?دØ?"
+msgstr "Ø´Ù?ا در حاÙ? حاضر Ù?Ù? بازپخش دارÙ?د.پاÙ?اÙ? دادÙ? بÙ? اÙ?Ù? بازپخش Ù?Ù?تÙ?اÙ?د اتصاÙ?ات Ù?اربراÙ? را Ù?تÙ?Ù?Ù? Ù?Ù?د./n/nØ¢Ù?ا Ù?Ù? Ø®Ù?اÙ?Ù?د بÙ? تدرÙ?ج بازپخش بستÙ? Ø´Ù?د Ù? بÙ? Ù?اربراÙ? Ù?رصت دÙ?Ù?د تا Ù?Ù? بازپخش جدÙ?د بÙ?ابÙ?دØ?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Ù?Ù?داÙ?Ù?ا Ù?Ù? Ù?سخÙ? از تÙ?ر را Ø´Ù?اساÙ?Ù? Ù?ردÙ? است./n/nÙ?Ø·Ù?ا Ù¾Ù?غاÙ?Ù?ا را براÙ? خاطاÙ?ا "
-"بررسÙ? Ù?Ù?Ù?د."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(شاÛ?د تÙ?Ù?â??Ù?ت)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(شاÛ?د Û?Ú© برÙ?اÙ?Ù? اÛ?Ù?Û?Ù?)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"بÙ? Ù?ظر Ù?Û?â??رسد Û?Ú©Û? از برÙ?اÙ?Ù?â??Ù?اÛ? Ø´Ù?ا %1 در حاÙ? برÙ?رارÛ? ارتباطÛ? رÙ?زگذارÛ? Ù?شدÙ? "
-"Ù? Ù?ااÙ?Ù? بÙ? Ù¾Ù?رت %2 است"
+msgstr "Ù?Ù?داÙ?Ù?ا Ù?Ù? Ù?سخÙ? از تÙ?ر را Ø´Ù?اساÙ?Ù? Ù?ردÙ? است./n/nÙ?Ø·Ù?ا Ù¾Ù?غاÙ?Ù?ا را براÙ? خاطاÙ?ا بررسÙ? Ù?Ù?Ù?د."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2436,9 +2423,7 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
+msgstr "Messages that only appear when \nsomething has gone wrong with Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2446,37 +2431,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Messages that appear infrequently \n"
-"during normal Tor operation and are \n"
-"not considered errors, but you may \n"
-"care about."
+msgstr "Messages that appear infrequently \nduring normal Tor operation and are \nnot considered errors, but you may \ncare about."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgstr "Messages that appear frequently \nduring normal Tor operation."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+msgstr "Hyper-verbose messages primarily of \ninterest to Tor developers."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Cannot write file %1\n"
-"\n"
-"%2."
+msgstr "Cannot write file %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2583,14 +2557,6 @@ msgid "Ctrl+F"
 msgstr "Ú©Ù?ترÙ? + F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ù¾Ù? Ù?اÙ?عتبر"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Ø´Ù?اسÙ? Ù¾Ù? Ù?شخص شدÙ? Ù?عتبر Ù?Ù?Û?باشد."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Ú©Ù¾Û? کردÙ? (Ctrl+C)"
 
@@ -2598,16 +2564,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Ø´Ù?ا Ù?Û?باÛ?ست Û?Ú© آدرس Ø¢Û? Ù¾Û? Û?ا Û?Ú© Ù?اÙ? Ù?Û?زباÙ? Ù? Û?Ú© Ø´Ù?ارÙ? درگاÙ? براÛ? Ù¾Û?کربÙ?دÛ? "
-"تÙ?ر Ù?شخص Ú©Ù?Û?د جÙ?ت استÙ?ادÙ? ار Û?Ú© Ù¾Û?شکار براÛ? دسترسÛ? بÙ? اÛ?Ù?ترÙ?ت."
+msgstr "Ø´Ù?ا Ù?Û?باÛ?ست Û?Ú© آدرس Ø¢Û? Ù¾Û? Û?ا Û?Ú© Ù?اÙ? Ù?Û?زباÙ? Ù? Û?Ú© Ø´Ù?ارÙ? درگاÙ? براÛ? Ù¾Û?کربÙ?دÛ? تÙ?ر Ù?شخص Ú©Ù?Û?د جÙ?ت استÙ?ادÙ? ار Û?Ú© Ù¾Û?شکار براÛ? دسترسÛ? بÙ? اÛ?Ù?ترÙ?ت."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Ø´Ù?ا Ù?Û?باÛ?ست Û?Ú© Û?ا Ú?Ù?د درگاÙ? Ú©Ù? بارÙ? اجازÙ? دسترسÛ? بÙ? Ø¢Ù?Ù?ا را Ù?Û?دÙ?د Ù?شخص Ú©Ù?Û?د."
+msgstr "Ø´Ù?ا Ù?Û?باÛ?ست Û?Ú© Û?ا Ú?Ù?د درگاÙ? Ú©Ù? بارÙ? اجازÙ? دسترسÛ? بÙ? Ø¢Ù?Ù?ا را Ù?Û?دÙ?د Ù?شخص Ú©Ù?Û?د."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2615,8 +2578,7 @@ msgstr "Ø´Ù?ارÙ? درگاÙ? '%1' Ù?عتبر Ù?Ù?Û?باشد."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Ù?شاÙ? بگذارÛ?د اگر شبکÙ? Ù?Ø­Ù?Û? Ø´Ù?ا Ù?Û?از بÙ? Û?Ú© Ù¾Û?شکار براÛ? دسترسÛ? بÙ? اÛ?Ù?ترÙ?ت دارد"
+msgstr "Ù?شاÙ? بگذارÛ?د اگر شبکÙ? Ù?Ø­Ù?Û? Ø´Ù?ا Ù?Û?از بÙ? Û?Ú© Ù¾Û?شکار براÛ? دسترسÛ? بÙ? اÛ?Ù?ترÙ?ت دارد"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2640,9 +2602,7 @@ msgstr "درگاÙ?:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Ù?شاÙ? بگذارÛ?د جÙ?ت Ù?تصÙ? شدÙ? بÙ? بازپخش Ù?اÛ?Û? Ú©Ù? تÙ?Ù?ا درگاÙ? Ù?اÛ? Ù?جاز بدست بارÙ? را"
-" استÙ?ادÙ? Ù?Û?Ú©Ù?Ù?د"
+msgstr "Ù?شاÙ? بگذارÛ?د جÙ?ت Ù?تصÙ? شدÙ? بÙ? بازپخش Ù?اÛ?Û? Ú©Ù? تÙ?Ù?ا درگاÙ? Ù?اÛ? Ù?جاز بدست بارÙ? را استÙ?ادÙ? Ù?Û?Ú©Ù?Ù?د"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2664,14 +2624,11 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Ù?شاÙ? بگذارÛ?د براÛ? رÙ?زبÙ?دÛ? درخÙ?است Ù?اÛ? Ù?Ù?رست Ù?, اختÛ?ارÛ?, از Ù¾Ù?Ù?اÛ? بازپخش براÛ?"
-" دسترسÛ? بÙ? شبکÙ? تÙ?ر استÙ?ادÙ? Ú©Ù?Û?د"
+msgstr "Ù?شاÙ? بگذارÛ?د براÛ? رÙ?زبÙ?دÛ? درخÙ?است Ù?اÛ? Ù?Ù?رست Ù?, اختÛ?ارÛ?, از Ù¾Ù?Ù?اÛ? بازپخش براÛ? دسترسÛ? بÙ? شبکÙ? تÙ?ر استÙ?ادÙ? Ú©Ù?Û?د"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
-msgstr ""
-"اراÛ?Ù? Ú©Ù?Ù?دÙ? خدÙ?ات دسترسÛ? بÙ? اÛ?Ù?ترÙ?ت اتصاÙ?ات بÙ? شبکÙ? تÙ?ر را Ù?سدÙ?د Ù?Û? Ú©Ù?د"
+msgstr "اراÛ?Ù? Ú©Ù?Ù?دÙ? خدÙ?ات دسترسÛ? بÙ? اÛ?Ù?ترÙ?ت اتصاÙ?ات بÙ? شبکÙ? تÙ?ر را Ù?سدÙ?د Ù?Û? Ú©Ù?د"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
@@ -2705,9 +2662,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ù¾Ù?Ù? جدÙ?دÙ? در دسترس Ù?Ù?ست.Ø´Ù?ا Ù?Ù? تÙ?اÙ?Ù?د صبر Ù?Ù?Ù?د Ù? Ù?جدداÙ? سعÙ? Ù?Ù?Ù?دØ?Ù?ا رÙ?Ø´ "
-"دÙ?گرÙ? اÙ?تحاÙ? Ù?Ù?Ù?د براÙ? Ù¾Ù?دا Ù?ردÙ? Ù¾Ù? Ù?اÙ? جدÙ?د."
+msgstr "Ù¾Ù?Ù? جدÙ?دÙ? در دسترس Ù?Ù?ست.Ø´Ù?ا Ù?Ù? تÙ?اÙ?Ù?د صبر Ù?Ù?Ù?د Ù? Ù?جدداÙ? سعÙ? Ù?Ù?Ù?دØ?Ù?ا رÙ?Ø´ دÙ?گرÙ? اÙ?تحاÙ? Ù?Ù?Ù?د براÙ? Ù¾Ù?دا Ù?ردÙ? Ù¾Ù? Ù?اÙ? جدÙ?د."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2734,13 +2689,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Ø´Ù?ا باÛ?د Û?Ú© Û?ا Ù¾Ù? Ù?اÛ? بÛ?شترÛ? را Ù?شخص Ú©Ù?Û?د."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Ù?بÙ?Ù?"
@@ -2897,17 +2852,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Ø´Ù?ا تÙ?ر را بÙ? Ú¯Ù?Ù?Ù? اÛ? Ù¾Û?کربÙ?دÛ? کردÛ?د Ú©Ù? Ù?اÙ?Ù?د Û?Ú© Ù¾Ù? بازپخش براÛ? کاربراÙ? "
-"ساÙ?سÙ?رشدÙ? کارکÙ?د, اÙ?ا Ù?سخÙ? تÙ?ر Ø´Ù?ا Ù¾Ù? Ù?ا را پشتÛ?باÙ?Û? Ù?Ù?Û? Ú©Ù?د."
+msgstr "Ø´Ù?ا تÙ?ر را بÙ? Ú¯Ù?Ù?Ù? اÛ? Ù¾Û?کربÙ?دÛ? کردÛ?د Ú©Ù? Ù?اÙ?Ù?د Û?Ú© Ù¾Ù? بازپخش براÛ? کاربراÙ? ساÙ?سÙ?رشدÙ? کارکÙ?د, اÙ?ا Ù?سخÙ? تÙ?ر Ø´Ù?ا Ù¾Ù? Ù?ا را پشتÛ?باÙ?Û? Ù?Ù?Û? Ú©Ù?د."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Ø®Ù?اÙ?Ø´Ù?Ù?د است Ù?رÙ? اÙ?زار تÙ?ر را برÙ?زرساÙ?Û? Ú©Ù?Û?د Û?ا تÙ?ر را بÙ? Ú¯Ù?Ù?Ù? اÛ? Ù¾Û?کربÙ?دÛ? "
-"Ú©Ù?Û?د Ú©Ù? Ù?اÙ?Ù?د Û?Ú© بازپخش تÙ?ر Ù?رÙ?اÙ? کارکÙ?د."
+msgstr "Ø®Ù?اÙ?Ø´Ù?Ù?د است Ù?رÙ? اÙ?زار تÙ?ر را برÙ?زرساÙ?Û? Ú©Ù?Û?د Û?ا تÙ?ر را بÙ? Ú¯Ù?Ù?Ù? اÛ? Ù¾Û?کربÙ?دÛ? Ú©Ù?Û?د Ú©Ù? Ù?اÙ?Ù?د Û?Ú© بازپخش تÙ?ر Ù?رÙ?اÙ? کارکÙ?د."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2922,10 +2873,6 @@ msgid "Run as a client only"
 msgstr "اجراکردÙ? تÙ?Ù?ا Ù?اÙ?Ù?د Û?Ú© کاربر"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "تراÙ?Û?Ú© بازپخشâ?? شدÙ? براÛ? شبکÙ?â??Û? تÙ?ر"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "درگاÙ? بازپخش:"
 
@@ -2963,9 +2910,7 @@ msgstr "Ù?اÙ? بازپخش Ø´Ù?ا"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"درگاÙ?Û? Ú©Ù? کاربراÙ? Ù? بازپخش Ù?اÛ? دÛ?گر Ù?Û? تÙ?اÙ?Ù?د بÙ?سÛ?Ù?Ù? Ø¢Ù? با بازپخش Ø´Ù?ا ارتباط"
-" برÙ?رار Ú©Ù?Ù?د"
+msgstr "درگاÙ?Û? Ú©Ù? کاربراÙ? Ù? بازپخش Ù?اÛ? دÛ?گر Ù?Û? تÙ?اÙ?Ù?د بÙ?سÛ?Ù?Ù? Ø¢Ù? با بازپخش Ø´Ù?ا ارتباط برÙ?رار Ú©Ù?Ù?د"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2979,9 +2924,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"براÛ? ارتباطات اÛ?Ù?ترÙ?تÛ? با Ù?رخ بارگÛ?رÛ? (داÙ?Ù?Ù?د) سرÛ?ع Ù?Ù?Û? Ù?رخ بارگذارÛ? (آپÙ?Ù?د)"
-" Ú©Ù?دØ? Ù?Ø·Ù?ا سرعت بارگذارÛ? Ø®Ù?د را اÛ?Ù?جا Ù?شخص Ú©Ù?Û?د."
+msgstr "براÛ? ارتباطات اÛ?Ù?ترÙ?تÛ? با Ù?رخ بارگÛ?رÛ? (داÙ?Ù?Ù?د) سرÛ?ع Ù?Ù?Û? Ù?رخ بارگذارÛ? (آپÙ?Ù?د) Ú©Ù?دØ? Ù?Ø·Ù?ا سرعت بارگذارÛ? Ø®Ù?د را اÛ?Ù?جا Ù?شخص Ú©Ù?Û?د."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3009,8 +2952,7 @@ msgstr "Ø®Ù?دت تغÛ?Û?Ù? Ú©Ù?"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"گزÛ?Ù?Ù?â??اÛ? را Ú©Ù? از Ù?Ù?Ù? بÛ?شتر بÙ? Ù?Ù?ع ارتباط اÛ?Ù?ترÙ?ت Ø´Ù?ا شبÛ?Ù? است اÙ?تخاب Ú©Ù?Û?د"
+msgstr "گزÛ?Ù?Ù?â??اÛ? را Ú©Ù? از Ù?Ù?Ù? بÛ?شتر بÙ? Ù?Ù?ع ارتباط اÛ?Ù?ترÙ?ت Ø´Ù?ا شبÛ?Ù? است اÙ?تخاب Ú©Ù?Û?د"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
@@ -3040,9 +2982,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"بÛ?شترÛ?Ù? Ù?Û?زاÙ? Ù¾Ù?Ù?اÛ? باÙ?د Ø´Ù?ا Ù?Û? باÛ?ست بزرگتر Û?ا Ù?ساÙ?Û? با Ù?Û?زاÙ? Ù¾Ù?Ù?اÛ? باÙ?د "
-"Ù?تÙ?سط Ø´Ù?ا باشد. Ú©Ù?Ú?کترÛ?Ù? Ù?Ù?دار Ù?ردÙ? Ù?Û?باÛ?ست 20 Ú©Û?Ù?Ù?باÛ?ت در ثاÙ?Û?Ù? باشد."
+msgstr "بÛ?شترÛ?Ù? Ù?Û?زاÙ? Ù¾Ù?Ù?اÛ? باÙ?د Ø´Ù?ا Ù?Û? باÛ?ست بزرگتر Û?ا Ù?ساÙ?Û? با Ù?Û?زاÙ? Ù¾Ù?Ù?اÛ? باÙ?د Ù?تÙ?سط Ø´Ù?ا باشد. Ú©Ù?Ú?کترÛ?Ù? Ù?Ù?دار Ù?ردÙ? Ù?Û?باÛ?ست 20 Ú©Û?Ù?Ù?باÛ?ت در ثاÙ?Û?Ù? باشد."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3074,9 +3014,7 @@ msgstr "سرÙ?رÛ?سâ??Ù?اÛ? دÛ?گر"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"درگاÙ?â??Ù?اÛ? Û·Û°Û¶Ø? Û±Û¸Û¶Û³Ø? ÛµÛ°ÛµÛ°Ø? ÛµÛ²Û²Û²Ø? Û¸Û³Û°Û° Ù? Û¸Û¸Û¸Û¸ {706, 1863, 5050, 5190, 5222, "
-"5223, 8300 ?} {8888?}"
+msgstr "درگاÙ?â??Ù?اÛ? Û·Û°Û¶Ø? Û±Û¸Û¶Û³Ø? ÛµÛ°ÛµÛ°Ø? ÛµÛ²Û²Û²Ø? Û¸Û³Û°Û° Ù? Û¸Û¸Û¸Û¸ {706, 1863, 5050, 5190, 5222, 5223, 8300 ?} {8888?}"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3111,9 +3049,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"تÙ?ر Ù?Ù?Ú?Ù?اÙ? بعضÙ? از اÙ?Ù?Ù?Ù? Ù?ا Ù? Ù?اÙ?Ù?Ù?اÙ? اشتراÙ? گذارÙ? شدÙ? ارساÙ?Ù? را بÙ? صÙ?رت "
-"Ù¾Ù?Ø´Ù?رض Ù?سدÙ?د Ù?ردÙ? براÙ? جÙ?Ù?Ú¯Ù?رÙ? از اسپÙ?Ù?Ù?Ú¯ Ù? استÙ?ادÙ? Ù?اÙ? Ù?ادرست."
+msgstr "تÙ?ر Ù?Ù?Ú?Ù?اÙ? بعضÙ? از اÙ?Ù?Ù?Ù? Ù?ا Ù? Ù?اÙ?Ù?Ù?اÙ? اشتراÙ? گذارÙ? شدÙ? ارساÙ?Ù? را بÙ? صÙ?رت Ù¾Ù?Ø´Ù?رض Ù?سدÙ?د Ù?ردÙ? براÙ? جÙ?Ù?Ú¯Ù?رÙ? از اسپÙ?Ù?Ù?Ú¯ Ù? استÙ?ادÙ? Ù?اÙ? Ù?ادرست."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3121,8 +3057,7 @@ msgstr "سÛ?استâ??Ù?اÛ? خرÙ?ج"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"بگذارÛ?د دÛ?گراÙ? بÙ? Ù¾Ù? Ø´Ù?ا دسترسÛ? Ù¾Û?دا Ú©Ù?Ù?د با بÛ?اÙ? کردÙ? اÛ?Ù? خط بÙ? Ø¢Ù?Ù?ا:"
+msgstr "بگذارÛ?د دÛ?گراÙ? بÙ? Ù¾Ù? Ø´Ù?ا دسترسÛ? Ù¾Û?دا Ú©Ù?Ù?د با بÛ?اÙ? کردÙ? اÛ?Ù? خط بÙ? Ø¢Ù?Ù?ا:"
 
 msgctxt "ServerPage"
 msgid ""
@@ -3145,9 +3080,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"اجازÙ? دÙ?Ù?د بازپخش Ø´Ù?ا اداÙ?Ù? Ù¾Ù?دا Ù?Ù?د اÙ?Ù?Ø·Ù?ر Ù?اربراÙ? شاÙ?س بÙ?شترÙ? دارÙ?د تا Ø¢Ù? "
-"را Ù¾Ù?دا Ù?Ù?Ù?د."
+msgstr "اجازÙ? دÙ?Ù?د بازپخش Ø´Ù?ا اداÙ?Ù? Ù¾Ù?دا Ù?Ù?د اÙ?Ù?Ø·Ù?ر Ù?اربراÙ? شاÙ?س بÙ?شترÙ? دارÙ?د تا Ø¢Ù? را Ù¾Ù?دا Ù?Ù?Ù?د."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3161,9 +3094,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgstr "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3171,9 +3102,7 @@ msgstr "The returned response was: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"Ú©Ù?Ú© بÙ? کاربراÙ? ساÙ?سÙ?رشدÙ? براÛ? دستÛ?ابÛ? بÙ? شبکÙ? تÙ?ر (تÙ?ر 0.2.0.8-alpha Û?ا "
-"جدÛ?دتر)"
+msgstr "Ú©Ù?Ú© بÙ? کاربراÙ? ساÙ?سÙ?رشدÙ? براÛ? دستÛ?ابÛ? بÙ? شبکÙ? تÙ?ر (تÙ?ر 0.2.0.8-alpha Û?ا جدÛ?دتر)"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3188,6 +3117,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "بطÙ?ر Ø®Ù?دکار آدرس Ù¾Ù? Ù?Ù? را پخش Ú©Ù?"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "(تراÙ?Û?Ú© باز پخش براÛ? شبکÙ? تÙ?ر (بازپخش خرÙ?جÛ?"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "باز پخش تراÙ?Û?Ú© درÙ?Ù? شبکÙ? \"تÙ?ر\" (بازپخش داخÙ?Û?)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Ù?Ù?Ù?Ù?Ù?اÙ? بازپخش Ù?Ù?رست"
 
@@ -3195,9 +3132,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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\n"
-"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"
@@ -3207,9 +3142,7 @@ 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 ""
-"Ø®Ù?اÙ?Ø´Ù?Ù?د است حداÙ?Ù? Û?Ú© سرÙ?Û?س Ù?Ù?رست Ù? Û?Ú© درگاÙ? Ù?جازÛ? براÛ? Ù?رÛ?Ú© از سرÙ?Û?س Ù?اÛ?Û? "
-"Ú©Ù? Ù?اÛ?Ù? بÙ? ذخÛ?رÙ? Ø¢Ù? Ù?ستÛ?د Ù¾Û?کربÙ?دÛ? Ú©Ù?Û?د. بÙ?Û?Ù? Ù?ا را خذÙ? Ú©Ù?."
+msgstr "Ø®Ù?اÙ?Ø´Ù?Ù?د است حداÙ?Ù? Û?Ú© سرÙ?Û?س Ù?Ù?رست Ù? Û?Ú© درگاÙ? Ù?جازÛ? براÛ? Ù?رÛ?Ú© از سرÙ?Û?س Ù?اÛ?Û? Ú©Ù? Ù?اÛ?Ù? بÙ? ذخÛ?رÙ? Ø¢Ù? Ù?ستÛ?د Ù¾Û?کربÙ?دÛ? Ú©Ù?Û?د. بÙ?Û?Ù? Ù?ا را خذÙ? Ú©Ù?."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3225,8 +3158,7 @@ msgstr "اÙ?تخاب Ù?Ù?رست سرÙ?Û?س"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"درگاÙ? Ù?اÛ? Ù?جازÛ? تÙ?Ù?ا Ù?Û? تÙ?اÙ?Ù?د شاÙ?Ù? Ø´Ù?ارÙ? درگاÙ? Ù?اÛ? Ù?عتبر باشÙ?د [1..65535]."
+msgstr "درگاÙ? Ù?اÛ? Ù?جازÛ? تÙ?Ù?ا Ù?Û? تÙ?اÙ?Ù?د شاÙ?Ù? Ø´Ù?ارÙ? درگاÙ? Ù?اÛ? Ù?عتبر باشÙ?د [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
@@ -3305,11 +3237,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"بر رÙ?Û? گزÛ?Ù?Ù?Ù? \"Start Tor\" در داخÙ? Vidalia Ú©Ù?ترÙ? پاÙ?Ù? Ú©Ù?Û?Ú© Ú©Ù?Û?دØ? تا Ù?رÙ? "
-"اÙ?زار TOR اجرا Ø´Ù?د. اگر Ú©Ù? TOR بÙ? صÙ?رت غÛ?ر Ù?Ù?تظرÙ? از کار اÛ?ستاد Ù? خارج شدØ? "
-"تاب باÙ?اÛ?Û? \"Advanced\" را اÙ?تخاب Ú©Ù?Û?د تا از جزئÛ?ات Ù?Ø´Ú©Ù? Ù¾Û?Ø´ Ø¢Ù?ادÙ? Ù?Ø·Ù?ع "
-"Ø´Ù?Û?د."
+msgstr "بر رÙ?Û? گزÛ?Ù?Ù?Ù? \"Start Tor\" در داخÙ? Vidalia Ú©Ù?ترÙ? پاÙ?Ù? Ú©Ù?Û?Ú© Ú©Ù?Û?دØ? تا Ù?رÙ? اÙ?زار TOR اجرا Ø´Ù?د. اگر Ú©Ù? TOR بÙ? صÙ?رت غÛ?ر Ù?Ù?تظرÙ? از کار اÛ?ستاد Ù? خارج شدØ? تاب باÙ?اÛ?Û? \"Advanced\" را اÙ?تخاب Ú©Ù?Û?د تا از جزئÛ?ات Ù?Ø´Ú©Ù? Ù¾Û?Ø´ Ø¢Ù?ادÙ? Ù?Ø·Ù?ع Ø´Ù?Û?د."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3317,10 +3245,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Ø´Ù?ا Ù?Ù? اکÙ?Ù?Ù? در حاÙ? اجراÛ? Ù?سخÙ? \"%1\" از Ù?رÙ? اÙ?زار تÙ?ر Ù?ستÛ?د Ú©Ù? دÛ?گر تÙ?صÛ?Ù? "
-"Ù?Ù?Û? Ø´Ù?د. Ù?Ø·Ù?Ù? بÙ? آخرÛ?Ù? Ù?سخÙ? از Ù?رÙ? اÙ?زار بÙ? رÙ?ز Ú©Ù?Û?د. اÛ?Ù? برÙ?زرساÙ?Û? Ù?Ù?Ú©Ù? است"
-" شاÙ?Ù? رÙ?ع اÛ?رادات Ù?Ù?Ù? اÙ?Ù?Û?تÛ?Ø? عÙ?Ù?کرد Ù? کاراÛ?Û? باشد"
+msgstr "Ø´Ù?ا Ù?Ù? اکÙ?Ù?Ù? در حاÙ? اجراÛ? Ù?سخÙ? \"%1\" از Ù?رÙ? اÙ?زار تÙ?ر Ù?ستÛ?د Ú©Ù? دÛ?گر تÙ?صÛ?Ù? Ù?Ù?Û? Ø´Ù?د. Ù?Ø·Ù?Ù? بÙ? آخرÛ?Ù? Ù?سخÙ? از Ù?رÙ? اÙ?زار بÙ? رÙ?ز Ú©Ù?Û?د. اÛ?Ù? برÙ?زرساÙ?Û? Ù?Ù?Ú©Ù? است شاÙ?Ù? رÙ?ع اÛ?رادات Ù?Ù?Ù? اÙ?Ù?Û?تÛ?Ø? عÙ?Ù?کرد Ù? کاراÛ?Û? باشد"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3328,10 +3253,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Ø´Ù?ا Ù?Ù? اکÙ?Ù?Ù? در حاÙ? اجراÛ? Ù?سخÙ? \"%1\" از Ù?رÙ? اÙ?زار تÙ?ر Ù?ستÛ?د Ú©Ù? Ù?Ù?Ú©Ù? است "
-"دÛ?گر با شبکÙ? Ù?عÙ?Û? تÙ?ر کار Ù?Ú©Ù?د. Ù?Ø·Ù?Ù? بÙ? آخرÛ?Ù? Ù?سخÙ? از Ù?رÙ? اÙ?زار بÙ? رÙ?ز Ú©Ù?Û?د."
-" اÛ?Ù? برÙ?زرساÙ?Û? Ù?Ù?Ú©Ù? است شاÙ?Ù? رÙ?ع اÛ?رادات Ù?Ù?Ù? اÙ?Ù?Û?تÛ?Ø? عÙ?Ù?کرد Ù? کاراÛ?Û? باشد"
+msgstr "Ø´Ù?ا Ù?Ù? اکÙ?Ù?Ù? در حاÙ? اجراÛ? Ù?سخÙ? \"%1\" از Ù?رÙ? اÙ?زار تÙ?ر Ù?ستÛ?د Ú©Ù? Ù?Ù?Ú©Ù? است دÛ?گر با شبکÙ? Ù?عÙ?Û? تÙ?ر کار Ù?Ú©Ù?د. Ù?Ø·Ù?Ù? بÙ? آخرÛ?Ù? Ù?سخÙ? از Ù?رÙ? اÙ?زار بÙ? رÙ?ز Ú©Ù?Û?د. اÛ?Ù? برÙ?زرساÙ?Û? Ù?Ù?Ú©Ù? است شاÙ?Ù? رÙ?ع اÛ?رادات Ù?Ù?Ù? اÙ?Ù?Û?تÛ?Ø? عÙ?Ù?کرد Ù? کاراÛ?Û? باشد"
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3345,9 +3267,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"اتصاÙ? بÙ? شبکÙ?Ù? TOR Ù?Ù?Ù?Ù?Û?ت Ø¢Ù?Û?ز بÙ?د. حاÙ? Ù?Û?تÙ?اÙ?Û?د برÙ?اÙ?Ù?â??Ù?اÛ? Ø®Ù?د را تÙ?ظÛ?Ù? "
-"Ú©Ù?Û?د تا بتÙ?اÙ?Û?د بÙ? Ø·Ù?ر Ù?اشÙ?اس از اÛ?Ù?ترÙ?ت استÙ?ادÙ? Ú©Ù?Û?د. "
+msgstr "اتصاÙ? بÙ? شبکÙ?Ù? TOR Ù?Ù?Ù?Ù?Û?ت Ø¢Ù?Û?ز بÙ?د. حاÙ? Ù?Û?تÙ?اÙ?Û?د برÙ?اÙ?Ù?â??Ù?اÛ? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا بتÙ?اÙ?Û?د بÙ? Ø·Ù?ر Ù?اشÙ?اس از اÛ?Ù?ترÙ?ت استÙ?ادÙ? Ú©Ù?Û?د. "
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3357,9 +3277,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Ù?رÙ? اÙ?زار تÙ?ر با Û?Ú© اشکاÙ? داخÙ?Û? Ù?Ù?اجÙ? شد. Ù?Ø·Ù?Ù? Ù¾Û?اÙ? خطاÛ? زÛ?ر را براÛ? سازÙ?دگاÙ? تÙ?ر بÙ? آدرس زÛ?ر ارساÙ? Ú©Ù?Û?د:\n"
-"bugs.torproject.org: \"%1\""
+msgstr "Ù?رÙ? اÙ?زار تÙ?ر با Û?Ú© اشکاÙ? داخÙ?Û? Ù?Ù?اجÙ? شد. Ù?Ø·Ù?Ù? Ù¾Û?اÙ? خطاÛ? زÛ?ر را براÛ? سازÙ?دگاÙ? تÙ?ر بÙ? آدرس زÛ?ر ارساÙ? Ú©Ù?Û?د:\nbugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3367,10 +3285,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"تÙ?ر Ù?شخص کرد Ú©Ù? ساعت کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا Ù?Ù?Ú©Ù? است در Ù?Ù?اÛ?سÙ? با Ù?Ù?بع \"%2\"Ø? %1 "
-"ثاÙ?Û?Ù? در گذشتÙ? تÙ?ظÛ?Ù? شدÙ? باشد. اگر ساعت Ø´Ù?ا تÙ?ظÛ?Ù? Ù?باشد تÙ?ر کار Ù?Ù?Û? Ú©Ù?د. "
-"Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا ساعت درست را Ù?شاÙ? Ù?Û?دÙ?د"
+msgstr "تÙ?ر Ù?شخص کرد Ú©Ù? ساعت کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا Ù?Ù?Ú©Ù? است در Ù?Ù?اÛ?سÙ? با Ù?Ù?بع \"%2\"Ø? %1 ثاÙ?Û?Ù? در گذشتÙ? تÙ?ظÛ?Ù? شدÙ? باشد. اگر ساعت Ø´Ù?ا تÙ?ظÛ?Ù? Ù?باشد تÙ?ر کار Ù?Ù?Û? Ú©Ù?د. Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا ساعت درست را Ù?شاÙ? Ù?Û?دÙ?د"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3378,10 +3293,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"تÙ?ر Ù?شخص کرد Ú©Ù? ساعت کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا Ù?Ù?Ú©Ù? است در Ù?Ù?اÛ?سÙ? با Ù?Ù?بع \"%2\"Ø? %1 "
-"ثاÙ?Û?Ù? در Ø¢Û?Ù?دÙ? تÙ?ظÛ?Ù? شدÙ? باشد. اگر ساعت Ø´Ù?ا تÙ?ظÛ?Ù? Ù?باشد تÙ?ر کار Ù?Ù?Û? Ú©Ù?د. "
-"Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا ساعت درست را Ù?شاÙ? Ù?Û?دÙ?د"
+msgstr "تÙ?ر Ù?شخص کرد Ú©Ù? ساعت کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا Ù?Ù?Ú©Ù? است در Ù?Ù?اÛ?سÙ? با Ù?Ù?بع \"%2\"Ø? %1 ثاÙ?Û?Ù? در Ø¢Û?Ù?دÙ? تÙ?ظÛ?Ù? شدÙ? باشد. اگر ساعت Ø´Ù?ا تÙ?ظÛ?Ù? Ù?باشد تÙ?ر کار Ù?Ù?Û? Ú©Ù?د. Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا ساعت درست را Ù?شاÙ? Ù?Û?دÙ?د"
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3393,21 +3305,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Ù?Ù?Ú©Ù? است Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا براÛ? برÙ?رارÛ? ارتباط رÙ?زگذارÛ? Ù?شدÙ? "
-"از درگاÙ? %1 بتÙ?سط تÙ?ر تÙ?اش کردÙ? باشد. Ù?رستادÙ? اطÙ?اعات رÙ?زگذارÛ? Ù?شدÙ? از طرÛ?Ù? "
-"شبکÙ? تÙ?رØ? خطرÙ?اک است Ù? تÙ?صÛ?Ù? Ù?Ù?Û? Ø´Ù?د. براÛ? Ù?حاÙ?ظت از Ø´Ù?اØ? تÙ?ر اÛ?Ù? ارتباط را "
-"بصÙ?رت Ø®Ù?دکار بست."
+msgstr "Ù?Ù?Ú©Ù? است Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا براÛ? برÙ?رارÛ? ارتباط رÙ?زگذارÛ? Ù?شدÙ? از درگاÙ? %1 بتÙ?سط تÙ?ر تÙ?اش کردÙ? باشد. Ù?رستادÙ? اطÙ?اعات رÙ?زگذارÛ? Ù?شدÙ? از طرÛ?Ù? شبکÙ? تÙ?رØ? خطرÙ?اک است Ù? تÙ?صÛ?Ù? Ù?Ù?Û? Ø´Ù?د. براÛ? Ù?حاÙ?ظت از Ø´Ù?اØ? تÙ?ر اÛ?Ù? ارتباط را بصÙ?رت Ø®Ù?دکار بست."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Ù?Ù?Ú©Ù? است Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا براÛ? برÙ?رارÛ? ارتباط رÙ?زگذارÛ? Ù?شدÙ? "
-"از درگاÙ? %1 بتÙ?سط تÙ?ر تÙ?اش کردÙ? باشد. Ù?رستادÙ? اطÙ?اعات رÙ?زگذارÛ? Ù?شدÙ? از طرÛ?Ù? "
-"شبکÙ? تÙ?رØ? خطرÙ?اک است Ù? تÙ?صÛ?Ù? Ù?Ù?Û? Ø´Ù?د."
+msgstr "Ù?Ù?Ú©Ù? است Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا براÛ? برÙ?رارÛ? ارتباط رÙ?زگذارÛ? Ù?شدÙ? از درگاÙ? %1 بتÙ?سط تÙ?ر تÙ?اش کردÙ? باشد. Ù?رستادÙ? اطÙ?اعات رÙ?زگذارÛ? Ù?شدÙ? از طرÛ?Ù? شبکÙ? تÙ?رØ? خطرÙ?اک است Ù? تÙ?صÛ?Ù? Ù?Ù?Û? Ø´Ù?د."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3419,11 +3324,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ø´Ù?ا از طرÛ?Ù? تÙ?ر Ù? پرÙ?تکÙ?Û? Ú©Ù? Ù?Ù?Ú©Ù? است اطÙ?اعاتÛ? از Ù?Ù?صد "
-"Ù?Ù?اÛ?Û? Ø´Ù?ا را Ù?اش سازد بÙ? \"%1\" برÙ?رار ساختÙ?. Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د "
-"را بÙ?Ø­Ù?Û? تÙ?ظÛ?Ù? Ù?Û?Ú©Ù?Û?د Ú©Ù? Ù?Ù?Ø· از SOCKS4a Û?ا SOCKS5 بÙ?Ù?راÙ? remote hostname "
-"resolution استÙ?ادÙ? Ú©Ù?د."
+msgstr "Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ø´Ù?ا از طرÛ?Ù? تÙ?ر Ù? پرÙ?تکÙ?Û? Ú©Ù? Ù?Ù?Ú©Ù? است اطÙ?اعاتÛ? از Ù?Ù?صد Ù?Ù?اÛ?Û? Ø´Ù?ا را Ù?اش سازد بÙ? \"%1\" برÙ?رار ساختÙ?. Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را بÙ?Ø­Ù?Û? تÙ?ظÛ?Ù? Ù?Û?Ú©Ù?Û?د Ú©Ù? Ù?Ù?Ø· از SOCKS4a Û?ا SOCKS5 بÙ?Ù?راÙ? remote hostname resolution استÙ?ادÙ? Ú©Ù?د."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3434,11 +3335,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ø´Ù?ا تÙ?اش کردÙ? است Ú©Ù? بÙ? تÙ?سط تÙ?ر Ù? از پرÙ?تکÙ?Û? Ú©Ù? تÙ?ر Ø¢Ù? "
-"را Ù?Ù?Û?Ù?Ù?Ù?د ارتباطÛ? برÙ?رار Ú©Ù?د.  Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را بÙ?Ø­Ù?Û? تÙ?ظÛ?Ù? "
-"Ù?Û?Ú©Ù?Û?د Ú©Ù? Ù?Ù?Ø· از SOCKS4a Û?ا SOCKS5 بÙ?Ù?راÙ? remote hostname resolution استÙ?ادÙ?"
-" Ú©Ù?د."
+msgstr "Û?Ú©Û? از اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ø´Ù?ا تÙ?اش کردÙ? است Ú©Ù? بÙ? تÙ?سط تÙ?ر Ù? از پرÙ?تکÙ?Û? Ú©Ù? تÙ?ر Ø¢Ù? را Ù?Ù?Û?Ù?Ù?Ù?د ارتباطÛ? برÙ?رار Ú©Ù?د.  Ù?Ø·Ù?Ù? Ù?Ø·Ù?Û?Ù? Ø´Ù?Û?د اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را بÙ?Ø­Ù?Û? تÙ?ظÛ?Ù? Ù?Û?Ú©Ù?Û?د Ú©Ù? Ù?Ù?Ø· از SOCKS4a Û?ا SOCKS5 بÙ?Ù?راÙ? remote hostname resolution استÙ?ادÙ? Ú©Ù?د."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3449,10 +3346,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Û?Ú©Û?â?? از برÙ?اÙ?Ù?â??Ù?اÛ? Ø´Ù?ا سعÛ?â?? داشت تا از طرÛ?Ù? شبکÙ?Ù? TOR بÙ? \"%1\" دست رسÛ?â?? "
-"Ù¾Û?دا Ú©Ù?دØ? در حاÙ?Û?â?? Ú©Ù? TOR اÛ?Ù? \"hostname\" Û?ا Ù?اÙ? Ù?Û?زباÙ? را بÙ? رسÙ?Û?ت "
-"Ù?Ù?Û?â??Ø´Ù?اسد. Ù?Ø·Ù?ا تÙ?ظÛ?Ù?ات برÙ?اÙ?Ù? Ø®Ù?د را Ù?جدداÙ? Ú?Ú© Ú©Ù?Û?د."
+msgstr "Û?Ú©Û?â?? از برÙ?اÙ?Ù?â??Ù?اÛ? Ø´Ù?ا سعÛ?â?? داشت تا از طرÛ?Ù? شبکÙ?Ù? TOR بÙ? \"%1\" دست رسÛ?â?? Ù¾Û?دا Ú©Ù?دØ? در حاÙ?Û?â?? Ú©Ù? TOR اÛ?Ù? \"hostname\" Û?ا Ù?اÙ? Ù?Û?زباÙ? را بÙ? رسÙ?Û?ت Ù?Ù?Û?â??Ø´Ù?اسد. Ù?Ø·Ù?ا تÙ?ظÛ?Ù?ات برÙ?اÙ?Ù? Ø®Ù?د را Ù?جدداÙ? Ú?Ú© Ú©Ù?Û?د."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3463,9 +3357,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"تÙ?ر تشخÛ?ص دادÙ? Ú©Ù? آدرس IP Ø´Ù?ا در حاÙ? حاضر %1%2 است. اگر درست Ù?Û?ستØ? Ù?Ø·Ù?Ù? "
-"تÙ?ظÛ?Ù? 'Address' را در Ù¾Û?کربÙ?دÛ? بازپخش Ú©Ù?Ù?دÙ? Ø®Ù?د در Ù?ظر داشتÙ? باشÛ?د."
+msgstr "تÙ?ر تشخÛ?ص دادÙ? Ú©Ù? آدرس IP Ø´Ù?ا در حاÙ? حاضر %1%2 است. اگر درست Ù?Û?ستØ? Ù?Ø·Ù?Ù? تÙ?ظÛ?Ù? 'Address' را در Ù¾Û?کربÙ?دÛ? بازپخش Ú©Ù?Ù?دÙ? Ø®Ù?د در Ù?ظر داشتÙ? باشÛ?د."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3476,20 +3368,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"TOR تشخÛ?ص دادÙ? است Ú©Ù? ارائÙ? دÙ?Ù?دÙ?Ù? DNS Ø´Ù?ا پاسخÙ?اÛ? Ù?ادرستÛ? بÙ? داÙ?Û?Ù?â??Ù?اÛ?Û?â?? Ú©Ù?"
-" Ù?Ù?جÙ?د Ù?Û?ستÙ?د Ù?Û?دÙ?د. بعضÛ?â?? ISPâ??Ù?ا Ù? اراÛ?Ù? دÙ?Ù?دگاÙ? DNS, Ù?Ø«Ù? OpenDNS, بÙ? Ø·Ù?ر "
-"Ù?شخص اÛ?Ù? کار را اÙ?جاÙ? دادÙ? تا Ù?تاÛ?ج جستجÙ?Û? Ø®Ù?د Ù? Û?ا تبÙ?Û?غات را Ù?Ù?اÛ?Ø´ دÙ?Ù?د."
+msgstr "TOR تشخÛ?ص دادÙ? است Ú©Ù? ارائÙ? دÙ?Ù?دÙ?Ù? DNS Ø´Ù?ا پاسخÙ?اÛ? Ù?ادرستÛ? بÙ? داÙ?Û?Ù?â??Ù?اÛ?Û?â?? Ú©Ù? Ù?Ù?جÙ?د Ù?Û?ستÙ?د Ù?Û?دÙ?د. بعضÛ?â?? ISPâ??Ù?ا Ù? اراÛ?Ù? دÙ?Ù?دگاÙ? DNS, Ù?Ø«Ù? OpenDNS, بÙ? Ø·Ù?ر Ù?شخص اÛ?Ù? کار را اÙ?جاÙ? دادÙ? تا Ù?تاÛ?ج جستجÙ?Û? Ø®Ù?د Ù? Û?ا تبÙ?Û?غات را Ù?Ù?اÛ?Ø´ دÙ?Ù?د."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"TOR تشخÛ?ص دادÙ? است Ú©Ù? ارائÙ? دÙ?Ù?دÙ?Ù? DNS Ø´Ù?ا پاسخÙ?اÛ? Ù?ادرستÛ? بÙ? داÙ?Û?Ù?â??Ù?اÛ?Û?â?? "
-"Ø´Ù?اختÙ? شدÙ? Ù?Û?دÙ?د. از Ø¢Ù?جا Ú©Ù? کاÙ?Ù¾Û?Ù?تر کاربر براÛ? درÛ?اÙ?ت پاسخ DNS بÙ? رÙ?Ù?â??Ù?اÛ? "
-"شبکÙ?Ù? TOR اتکا Ù?Û?â??Ú©Ù?دØ? رÙ?Ù? Ø´Ù?ا بÙ? عÙ?Ù?اÙ? رÙ?Ù? خرÙ?جÛ? استÙ?ادÙ? Ù?Ø®Ù?اÙ?د شد. "
+msgstr "TOR تشخÛ?ص دادÙ? است Ú©Ù? ارائÙ? دÙ?Ù?دÙ?Ù? DNS Ø´Ù?ا پاسخÙ?اÛ? Ù?ادرستÛ? بÙ? داÙ?Û?Ù?â??Ù?اÛ?Û?â?? Ø´Ù?اختÙ? شدÙ? Ù?Û?دÙ?د. از Ø¢Ù?جا Ú©Ù? کاÙ?Ù¾Û?Ù?تر کاربر براÛ? درÛ?اÙ?ت پاسخ DNS بÙ? رÙ?Ù?â??Ù?اÛ? شبکÙ?Ù? TOR اتکا Ù?Û?â??Ú©Ù?دØ? رÙ?Ù? Ø´Ù?ا بÙ? عÙ?Ù?اÙ? رÙ?Ù? خرÙ?جÛ? استÙ?ادÙ? Ù?Ø®Ù?اÙ?د شد. "
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3500,9 +3386,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"TOR در حاÙ? تشخÛ?ص Ù?ابÙ?Û?ت دسترسÛ?Ù? Ù¾Ù?رتÙ? سرÙ?ر از درÙ?Ù? شبکÙ? TOR از طرÛ?Ù? اتصاÙ? بÙ? Ø®Ù?د در  \"%1:%2\" Ù?Û?â??باشد. \n"
-"اÛ?Ù? پرÙ?سÙ? Ú?Ù?د دÙ?Û?Ù?Ù? Ø·Ù?Ù? Ù?Û?â??کشد."
+msgstr "TOR در حاÙ? تشخÛ?ص Ù?ابÙ?Û?ت دسترسÛ?Ù? Ù¾Ù?رتÙ? سرÙ?ر از درÙ?Ù? شبکÙ? TOR از طرÛ?Ù? اتصاÙ? بÙ? Ø®Ù?د در  \"%1:%2\" Ù?Û?â??باشد. \nاÛ?Ù? پرÙ?سÙ? Ú?Ù?د دÙ?Û?Ù?Ù? Ø·Ù?Ù? Ù?Û?â??کشد."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3522,11 +3406,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Ù¾Ù?رتÙ? سرÙ?رÙ? رÙ?Ù? Ø´Ù?ا Ù?ابÙ? دسترسÛ?â?? تÙ?سط کاربراÙ? دÛ?گر Ù?Û?ست. اÛ?Ù? Ù?Ù?Ú©Ù? از بÙ? اÛ?Ù? "
-"دÙ?Û?Ù? باشد Ú©Ù? کاÙ?Ù¾Û?Ù?ترÙ? Ø´Ù?ا پشت firewall Ù?رار دارد Û?ا اÛ?Ù?Ú©Ù? بÙ? رÙ?تر Ù?صÙ? شدÙ? "
-"است Ú©Ù? Ù?ازÙ? است Ù¾Ù?رت Ù?رÙ?اردÛ?Ù?Ú¯ Ú©Ù?د. اگر \"%1:%2\" آدرسÙ? Ø¢Û?â??Ù¾Û? Ù? Ù¾Ù?رتÙ? Ø´Ù?ا "
-"Ù?Û?ستØ? Ù?Ø·Ù?ا تÙ?ظÛ?Ù?ات رÙ?Ù? Ø®Ù?د را Ú?Ú© Ú©Ù?Û?د."
+msgstr "Ù¾Ù?رتÙ? سرÙ?رÙ? رÙ?Ù? Ø´Ù?ا Ù?ابÙ? دسترسÛ?â?? تÙ?سط کاربراÙ? دÛ?گر Ù?Û?ست. اÛ?Ù? Ù?Ù?Ú©Ù? از بÙ? اÛ?Ù? دÙ?Û?Ù? باشد Ú©Ù? کاÙ?Ù¾Û?Ù?ترÙ? Ø´Ù?ا پشت firewall Ù?رار دارد Û?ا اÛ?Ù?Ú©Ù? بÙ? رÙ?تر Ù?صÙ? شدÙ? است Ú©Ù? Ù?ازÙ? است Ù¾Ù?رت Ù?رÙ?اردÛ?Ù?Ú¯ Ú©Ù?د. اگر \"%1:%2\" آدرسÙ? Ø¢Û?â??Ù¾Û? Ù? Ù¾Ù?رتÙ? Ø´Ù?ا Ù?Û?ستØ? Ù?Ø·Ù?ا تÙ?ظÛ?Ù?ات رÙ?Ù? Ø®Ù?د را Ú?Ú© Ú©Ù?Û?د."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3537,9 +3417,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"تÙ?ر در حاÙ? بررسÛ? دسترسÛ? Ù¾Ù?رت داÛ?رکتÙ?رÛ? بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?اØ? از داخÙ? شبکÙ? تÙ?رØ? "
-"بÙ? Ù?سÛ?Ù?Ù? Ù?صÙ? Ø®Ù?د در %1:%2 است. اÛ?Ù? آزÙ?اÛ?Ø´ Ù?Ù?Ú©Ù? است Ú?Ù?د دÙ?Û?Ù?Ù? Ø·Ù?Ù? بکشد."
+msgstr "تÙ?ر در حاÙ? بررسÛ? دسترسÛ? Ù¾Ù?رت داÛ?رکتÙ?رÛ? بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?اØ? از داخÙ? شبکÙ? تÙ?رØ? بÙ? Ù?سÛ?Ù?Ù? Ù?صÙ? Ø®Ù?د در %1:%2 است. اÛ?Ù? آزÙ?اÛ?Ø´ Ù?Ù?Ú©Ù? است Ú?Ù?د دÙ?Û?Ù?Ù? Ø·Ù?Ù? بکشد."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3559,11 +3437,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"داÛ?رکتÙ?رÛ? Ù¾Ù?رت بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?اØ? تÙ?سط دÛ?گر کاربراÙ? تÙ?ر Ù?ابÙ? دسترس Ù?Û?ست. اÛ?Ù? "
-"اتÙ?اÙ? زÙ?اÙ?Û? Ù?Ù?Ú©Ù? است بÛ?اÙ?تدØ? Ú©Ù? Ø´Ù?ا پشت رÙ?تر Û?ا Ù?اÛ?رÙ?اÙ?Û? Ù?ستÛ?د Ú©Ù? Ù?Û?از بÙ? "
-"تÙ?ظÛ?Ù? اÙ?تÙ?اÙ? Ù¾Ù?رت دارد. اگر %1:%2 آدرس IP Ù? داÛ?رکتÙ?رÛ? Ù¾Ù?رت درست Ø´Ù?ا Ù?Û?ستØ? "
-"Ù?Ø·Ù?Ù? Ù¾Û?کربÙ?دÛ? بازپخش Ú©Ù?Ù?دÙ? Ø®Ù?د را Ú?Ú© Ú©Ù?Û?د."
+msgstr "داÛ?رکتÙ?رÛ? Ù¾Ù?رت بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?اØ? تÙ?سط دÛ?گر کاربراÙ? تÙ?ر Ù?ابÙ? دسترس Ù?Û?ست. اÛ?Ù? اتÙ?اÙ? زÙ?اÙ?Û? Ù?Ù?Ú©Ù? است بÛ?اÙ?تدØ? Ú©Ù? Ø´Ù?ا پشت رÙ?تر Û?ا Ù?اÛ?رÙ?اÙ?Û? Ù?ستÛ?د Ú©Ù? Ù?Û?از بÙ? تÙ?ظÛ?Ù? اÙ?تÙ?اÙ? Ù¾Ù?رت دارد. اگر %1:%2 آدرس IP Ù? داÛ?رکتÙ?رÛ? Ù¾Ù?رت درست Ø´Ù?ا Ù?Û?ستØ? Ù?Ø·Ù?Ù? Ù¾Û?کربÙ?دÛ? بازپخش Ú©Ù?Ù?دÙ? Ø®Ù?د را Ú?Ú© Ú©Ù?Û?د."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3573,9 +3447,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Ù?اصÙ? بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?اØ? Ú©Ù? کاربراÙ? را Ù?ادر بÙ? اتصاÙ? بÙ? بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا "
-"Ù?Û?Ú©Ù?دØ? تÙ?سط سرÙ?ر دادÙ? Ù?ا در %1:%2 رد شد. عÙ?ت: %3"
+msgstr "Ù?اصÙ? بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?اØ? Ú©Ù? کاربراÙ? را Ù?ادر بÙ? اتصاÙ? بÙ? بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا Ù?Û?Ú©Ù?دØ? تÙ?سط سرÙ?ر دادÙ? Ù?ا در %1:%2 رد شد. عÙ?ت: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3587,10 +3459,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا Ø¢Ù?Ù?اÛ?Ù? Ù? براÛ? استÙ?ادÙ? کاربراÙ? تÙ?ر در دسترس است. Ù?Ù?Ú?Ù?اÙ? Ú©Ù? "
-"کاربراÙ? بÛ?شترÛ? از بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا آگاÙ? Ù?Û?Ø´Ù?Ù?دØ? در Ú?Ù?د ساعت Ø¢Û?Ù?دÙ?Ø? Ø´Ù?ا باÛ?د "
-"شاÙ?د باÙ?ا رÙ?تÙ? تراÙ?Û?Ú© Ù?Ù?اÛ?Ø´ دادÙ? شدÙ? در Ù?Ù?Ù?دار Ù¾Ù?Ù?اÛ? باÙ?د باشÛ?د!"
+msgstr "بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا Ø¢Ù?Ù?اÛ?Ù? Ù? براÛ? استÙ?ادÙ? کاربراÙ? تÙ?ر در دسترس است. Ù?Ù?Ú?Ù?اÙ? Ú©Ù? کاربراÙ? بÛ?شترÛ? از بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا آگاÙ? Ù?Û?Ø´Ù?Ù?دØ? در Ú?Ù?د ساعت Ø¢Û?Ù?دÙ?Ø? Ø´Ù?ا باÛ?د شاÙ?د باÙ?ا رÙ?تÙ? تراÙ?Û?Ú© Ù?Ù?اÛ?Ø´ دادÙ? شدÙ? در Ù?Ù?Ù?دار Ù¾Ù?Ù?اÛ? باÙ?د باشÛ?د!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3652,9 +3521,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"تÙ?ظÛ?Ù?ات را ذخÛ?رÙ? Ú©Ù?. اگر عÙ?اÙ?ت Ù?Ø®Ù?ردÙ? باشد Ù?Ù?Ø· براÛ? Ù?Ù?Ù?Ù?Ù? تÙ?ر Ù?عÙ?Û? اعÙ?اÙ? "
-"Ù?Û?Ø´Ù?د."
+msgstr "تÙ?ظÛ?Ù?ات را ذخÛ?رÙ? Ú©Ù?. اگر عÙ?اÙ?ت Ù?Ø®Ù?ردÙ? باشد Ù?Ù?Ø· براÛ? Ù?Ù?Ù?Ù?Ù? تÙ?ر Ù?عÙ?Û? اعÙ?اÙ? Ù?Û?Ø´Ù?د."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3694,9 +3561,7 @@ msgstr "خطا در ارتباط با تÙ?ر"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Ù?حدÙ?دÙ? اÙ?تخاب خاÙ?Û? است. Ù?Ø·Ù?Ù? Ù?Ù?دارÛ? از Ù?ت Ù? Û?ا \"Ù?Ù?Ù? را اعÙ?اÙ? Ú©Ù?\" را اÙ?تخاب"
-" Ú©Ù?Û?د"
+msgstr "Ù?حدÙ?دÙ? اÙ?تخاب خاÙ?Û? است. Ù?Ø·Ù?Ù? Ù?Ù?دارÛ? از Ù?ت Ù? Û?ا \"Ù?Ù?Ù? را اعÙ?اÙ? Ú©Ù?\" را اÙ?تخاب Ú©Ù?Û?د"
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3770,17 +3635,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?ادر بÙ? بررسÛ? بÙ? رÙ?ز رساÙ?Û? Ù?اÛ? در دسترس Ù?رÙ? اÙ?زار Ù?Û?ست.زÛ?را Ù?Ù?Û?تÙ?اÙ?د"
-" '%1' را Ù¾Û?دا Ú©Ù?د."
+msgstr "Ù?Û?داÙ?Û?ا Ù?ادر بÙ? بررسÛ? بÙ? رÙ?ز رساÙ?Û? Ù?اÛ? در دسترس Ù?رÙ? اÙ?زار Ù?Û?ست.زÛ?را Ù?Ù?Û?تÙ?اÙ?د '%1' را Ù¾Û?دا Ú©Ù?د."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Ù?Û?داÙ?Û?ا Ù?ادر بÙ? بررسÛ? بÙ? رÙ?ز رساÙ?Û? Ù?اÛ? در دسترس Ù?رÙ? اÙ?زار Ù?Û?ستØ? زÛ?را رÙ?Ù?د بÙ?"
-" رÙ?ز رساÙ?Û? تÙ?ر غÛ?ر Ù?Ù?تظرÙ? Ù?تÙ?Ù?Ù? شدÙ?."
+msgstr "Ù?Û?داÙ?Û?ا Ù?ادر بÙ? بررسÛ? بÙ? رÙ?ز رساÙ?Û? Ù?اÛ? در دسترس Ù?رÙ? اÙ?زار Ù?Û?ستØ? زÛ?را رÙ?Ù?د بÙ? رÙ?ز رساÙ?Û? تÙ?ر غÛ?ر Ù?Ù?تظرÙ? Ù?تÙ?Ù?Ù? شدÙ?."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3955,10 +3816,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
-"\n"
-"Would you like to continue starting Vidalia?"
+msgstr "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n\nWould you like to continue starting Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3991,5 +3849,3 @@ msgstr "%1 ساعت"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 دÙ?Û?Ù?Ù?"
-
-
diff --git a/src/vidalia/i18n/po/fi/qt_fi.po b/src/vidalia/i18n/po/fi/qt_fi.po
index d072686..06a933e 100644
--- a/src/vidalia/i18n/po/fi/qt_fi.po
+++ b/src/vidalia/i18n/po/fi/qt_fi.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 on jo olemassa.\n"
-"Haluatko korvata sen?"
+msgstr "%1 on jo olemassa.\nHaluatko korvata sen?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Tiedostoa ei löytynyt.\n"
-"Ole hyvä ja tarkista tiedoston nimi."
+msgstr "%1\nTiedostoa ei löytynyt.\nOle hyvä ja tarkista tiedoston nimi."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Kansiota ei löytynyt.\n"
-"Ole hyvä ja tarkista kansion nimi."
+msgstr "%1\nKansiota ei löytynyt.\nOle hyvä ja tarkista kansion nimi."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' on kirjoitussuojattu.\n"
-"Oletko varma, että haluat poistaa sen?"
+msgstr "'%1' on kirjoitussuojattu.\nOletko varma, että haluat poistaa sen?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Nimeä \"%1\" ei voida käyttää.</b><p>Koita käyttää toista nimeä, vähemmän"
-" merkkejä tai ei erikoisia merkkejä."
+msgstr "<b>Nimeä \"%1\" ei voida käyttää.</b><p>Koita käyttää toista nimeä, vähemmän merkkejä tai ei erikoisia merkkejä."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 kt"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 tavua"
-
-
diff --git a/src/vidalia/i18n/po/fi/vidalia_fi.po b/src/vidalia/i18n/po/fi/vidalia_fi.po
index a820f31..84b2072 100644
--- a/src/vidalia/i18n/po/fi/vidalia_fi.po
+++ b/src/vidalia/i18n/po/fi/vidalia_fi.po
@@ -1,5 +1,6 @@
 # 
 # Translators:
+#   <c168298@xxxxxxxxx>, 2012.
 #   <debris@xxxxxxxxxx>, 2012.
 #   <jukka.mieskonen@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,9 +8,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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-02 05:59+0000\n"
-"Last-Translator: jukkamieskonen <jukka.mieskonen@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: torre <c168298@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,17 +172,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Annettu Tor-asetustiedoston sijainti sisältää merkkejä, joita järjestelmäsi "
-"nykyinen 8-bittinen merkistökoodaus ei voi näyttää."
+msgstr "Annettu Tor-asetustiedoston sijainti sisältää merkkejä, joita järjestelmäsi nykyinen 8-bittinen merkistökoodaus ei voi näyttää."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Annettu Tor-datahakemiston sijainti sisältää merkkejä, joita järjestelmäsi "
-"nykyinen 8-bittinen merkistökoodaus ei voi näyttää."
+msgstr "Annettu Tor-datahakemiston sijainti sisältää merkkejä, joita järjestelmäsi nykyinen 8-bittinen merkistökoodaus ei voi näyttää."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -205,12 +202,17 @@ 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 ei onnistunut poistamaan Tor-palvelua. Joudut ehkä poistamaan sen "
-"manuaalisesti."
+msgstr "Vidalia ei onnistunut poistamaan Tor-palvelua. Joudut ehkä poistamaan sen manuaalisesti."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -232,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ei onnistunut lataamaan valittua kielikäännöstä."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Alkaen:"
@@ -326,8 +345,7 @@ msgstr "# Asiakasta"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"Asiakasta seuraavista maista ovat käyttäneet välityspalvelintasi %1 alkaen"
+msgstr "Asiakasta seuraavista maista ovat käyttäneet välityspalvelintasi %1 alkaen"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -427,8 +445,7 @@ msgstr "Virhe otettaessa käyttöön asetuksia"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr ""
-"Vidalia ei onnistunut ottamaan käyttöön %1 asetuksia Tor-ohjelman kanssa."
+msgstr "Vidalia ei onnistunut ottamaan käyttöön %1 asetuksia Tor-ohjelman kanssa."
 
 msgctxt "ConfigDialog"
 msgid "Settings"
@@ -454,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia on yhdistynyt käynnissä olevaan Tor - ohjelmaan, joka vaatii "
-"salasanaa. Ole hyvä ja kirjoita ohjaussalasana:"
+msgstr "Vidalia on yhdistynyt käynnissä olevaan Tor - ohjelmaan, joka vaatii salasanaa. Ole hyvä ja kirjoita ohjaussalasana:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1294,9 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Emme onnistuneet käynnistämään Vidaliaa uudelleen automaattisesti. Käynnistä"
-" Vidalia uudelleen manuaalisesti."
+msgstr "Emme onnistuneet käynnistämään Vidaliaa uudelleen automaattisesti. Käynnistä Vidalia uudelleen manuaalisesti."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1538,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia voi avata valitun linkin oletus Internetselaimessa. Jos selainta ei "
-"ole määritelty käyttämään Tor-verkkoa, niin sivulla oleminen ei ole "
-"anonyymistä."
+msgstr "Vidalia voi avata valitun linkin oletus Internetselaimessa. Jos selainta ei ole määritelty käyttämään Tor-verkkoa, niin sivulla oleminen ei ole anonyymistä."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1555,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ei onnistunut avaamaan valittua linkkiä Internetselaimessa. Linkin "
-"voi kuitenkin kopioida ja liittää selaimen osoiteriville."
+msgstr "Vidalia ei onnistunut avaamaan valittua linkkiä Internetselaimessa. Linkin voi kuitenkin kopioida ja liittää selaimen osoiteriville."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1768,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Yhdistetty Tor-verkkoon"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Tunnistamaton käynnistystila"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "sekalaiset"
 
@@ -1839,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia ei onnistunut käynnistämään Tor-ohjelmaa. Tarkista asetukset ja "
-"varmista onko Tor-ohjelman nimi ja sijainti kirjoitettu oikein."
+msgstr "Vidalia ei onnistunut käynnistämään Tor-ohjelmaa. Tarkista asetukset ja varmista onko Tor-ohjelman nimi ja sijainti kirjoitettu oikein."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1879,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor-ohjelma pyytää Vidaliaa lähettämään kirjautumisevästeen tiedot, mutta "
-"Vidalia ei löytänyt kirjautumisevästettä."
+msgstr "Tor-ohjelma pyytää Vidaliaa lähettämään kirjautumisevästeen tiedot, mutta Vidalia ei löytänyt kirjautumisevästettä."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1903,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia ei pystynyt rekisteröimään joitakin tapahtumia. Jotkin Vidian "
-"ominaisuudet eivät ehkä toimi."
+msgstr "Vidalia ei pystynyt rekisteröimään joitakin tapahtumia. Jotkin Vidian ominaisuudet eivät ehkä toimi."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1927,9 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään."
-" Ole hyvä ja lataa uusin versio Tor-ohjelman kotisivulta."
+msgstr "Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään. Ole hyvä ja lataa uusin versio Tor-ohjelman kotisivulta."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1939,9 +1935,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Vaikuttaisi että kaikki seuraavat yhteydet tulevat olemaan erilaiset kuin "
-"vanhat yhteydet."
+msgstr "Vaikuttaisi että kaikki seuraavat yhteydet tulevat olemaan erilaiset kuin vanhat yhteydet."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1953,8 +1947,7 @@ msgstr "Porttien läpivienti epäonnistui"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia ei onnistunut määrittelemään automaattista porttien läpivientiä."
+msgstr "Vidalia ei onnistunut määrittelemään automaattista porttien läpivientiä."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
@@ -2037,18 +2030,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia yritti nollata Tor salasanaa, mutta ei pystynyt käynnistämään "
-"uudestaan Tor -ohjelmaa. Tarkista Tehtävienhallinnasta (Task Manager) että "
-"päällekkäisiä Tor prosesseja ei ole käynnissä. (Käynnistä "
-"Tehtävienhallinta:Ctrl+Shift+Esc)"
+msgstr "Vidalia yritti nollata Tor salasanaa, mutta ei pystynyt käynnistämään uudestaan Tor -ohjelmaa. Tarkista Tehtävienhallinnasta (Task Manager) että päällekkäisiä Tor prosesseja ei ole käynnissä. (Käynnistä Tehtävienhallinta:Ctrl+Shift+Esc)"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään."
+msgstr "Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2063,8 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor on automaattisesti sulkenut yhteden suojatakseen anonymiteettiäsi."
+msgstr "Tor on automaattisesti sulkenut yhteden suojatakseen anonymiteettiäsi."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2078,8 +2065,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Uusia Tor-ohjelmiston paketteja ei ole saatavana tietokoneellesi juuri nyt."
+msgstr "Uusia Tor-ohjelmiston paketteja ei ole saatavana tietokoneellesi juuri nyt."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2098,10 +2084,25 @@ 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."
+msgstr "Kaikkea tämän yhteyden yli lähetettyä voidaan tarkkailla. Tarkista sovelluksesi asetukset ja käytä vain kryptattuja protokollia, kuten SSL:ää, jos mahdollista."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(todennäköisesti Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(todennäköisesti sähköpostiasiakasohjelma)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"Kaikkea tämän yhteyden yli lähetettyä voidaan tarkkailla. Tarkista "
-"sovelluksesi asetukset ja käytä vain kryptattuja protokollia, kuten SSL:ää, "
-"jos mahdollista."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2111,12 +2112,21 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
+msgstr "Välitypalvelimesi on sulkeutumassa. \nNapsauta 'Pysäytä'-nappia uudelleen sulkeaksesi välityspalvelun heti. "
+
+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 ""
-"Välitypalvelimesi on sulkeutumassa. \n"
-"Napsauta 'Pysäytä'-nappia uudelleen sulkeaksesi välityspalvelun heti. "
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2124,34 +2134,14 @@ msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
 "Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Operoit parhaillaan välityspalvelinta. Mikäli sammutat välityspalvelimesi, se katkaisee kaikkien palvelintasi käyttävien yhteydet!\n"
-"\n"
-"Haluaisitko sensijaan sammuttaa sulavasti ja antaa yhteyttäsi käyttäville aikaa löytää uusi yhteys?"
+msgstr "Operoit parhaillaan välityspalvelinta. Mikäli sammutat välityspalvelimesi, se katkaisee kaikkien palvelintasi käyttävien yhteydet!\n\nHaluaisitko sensijaan sammuttaa sulavasti ja antaa yhteyttäsi käyttäville aikaa löytää uusi yhteys?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia havaitsi että Tor ohjelma päättyi odottamatta.\n"
-"\n"
-"Tarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Vidalia havaitsi että Tor ohjelma päättyi odottamatta.\n\nTarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2439,9 +2429,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Normaalin Tor käytön aikana ilmestyvät ajoittaiset virheviestit \n"
-"jotka eivät ole varsinaisia virhetilanteita, mutta joista on ehkä hyvä tietää."
+msgstr "Normaalin Tor käytön aikana ilmestyvät ajoittaiset virheviestit \njotka eivät ole varsinaisia virhetilanteita, mutta joista on ehkä hyvä tietää."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2460,10 +2448,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Tiedoston %1 kirjoitus epäonnistui \n"
-"\n"
-"%2."
+msgstr "Tiedoston %1 kirjoitus epäonnistui \n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2570,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Virheellinen silta"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Määritelty siltahenkilöllisyys on virheellinen."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopioi (Ctrl+C)"
 
@@ -2585,17 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Joko IP-osoite tai sitten isäntä ja portti numero pitää määrittää, jotta "
-"Tor-ohjelma osaa  yhdistää välityspalvelimen kautta Internettiin."
+msgstr "Joko IP-osoite tai sitten isäntä ja portti numero pitää määrittää, jotta Tor-ohjelma osaa  yhdistää välityspalvelimen kautta Internettiin."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Portteja pitää olla määriteltynä vähintään yksi tai useampi, mihin palomuuri"
-" antaa yhdistää."
+msgstr "Portteja pitää olla määriteltynä vähintään yksi tai useampi, mihin palomuuri antaa yhdistää."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2603,8 +2576,7 @@ msgstr "'%1' ei ole kelvollinen porttinumero."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Tarkista, jos paikallinen verkko vaatii välityspalvelimen Internetin pääsyyn"
+msgstr "Tarkista, jos paikallinen verkko vaatii välityspalvelimen Internetin pääsyyn"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2628,9 +2600,7 @@ msgstr "Portti:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Rastita yhdistääkseen vain reitittimiin käyttäen palomuurin sallimia "
-"portteja"
+msgstr "Rastita yhdistääkseen vain reitittimiin käyttäen palomuurin sallimia portteja"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2652,9 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Rastita suojataksesi hakemistopyynnöt, ja valinnaisesti käytä "
-"siltareitittimiä yhdistääksesi Tor-verkkoon."
+msgstr "Rastita suojataksesi hakemistopyynnöt, ja valinnaisesti käytä siltareitittimiä yhdistääksesi Tor-verkkoon."
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2692,9 +2660,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Uusia siltoja ei ole juuri nyt saatavana. Voit joko odottaa hetken ja "
-"yrittää uudelleen, tai voit kokeilla toista tapaa löytää siltoja."
+msgstr "Uusia siltoja ei ole juuri nyt saatavana. Voit joko odottaa hetken ja yrittää uudelleen, tai voit kokeilla toista tapaa löytää siltoja."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2721,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "salli"
@@ -2884,17 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Olet määritelly Tor-ohjelmasi toimimaan siltareitittimenä sensuroiduille "
-"käyttäjille, mutta käyttämäsi Tor-ohjelman versio ei tue siltoja."
+msgstr "Olet määritelly Tor-ohjelmasi toimimaan siltareitittimenä sensuroiduille käyttäjille, mutta käyttämäsi Tor-ohjelman versio ei tue siltoja."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Ole hyvä ja päivitä Tor-ohjelmasi tai säädä Tor-ohjelmasi toimimaan "
-"normaalina Tor-reitittimenä."
+msgstr "Ole hyvä ja päivitä Tor-ohjelmasi tai säädä Tor-ohjelmasi toimimaan normaalina Tor-reitittimenä."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2909,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Suorita vain asiakasohjelmana"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Välitä tietoa Tor-verkossa"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Reititinportti:"
 
@@ -2950,9 +2908,7 @@ msgstr "Reitittimesi nimi"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Portti, jolla käyttäjät ja muut reitittimet kommunikoivat reitittimesi "
-"kanssa"
+msgstr "Portti, jolla käyttäjät ja muut reitittimet kommunikoivat reitittimesi kanssa"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2966,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Yhteydet, joilla on nopea latausnopeus mutta hidas lähetys, valitkaa "
-"listasta alhaalta lähetysnopeutenne."
+msgstr "Yhteydet, joilla on nopea latausnopeus mutta hidas lähetys, valitkaa listasta alhaalta lähetysnopeutenne."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3026,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Enimmäisnopeus pitää olla suurempi tai sama kuin keskimääräinen nopeus. "
-"Molempien lukujen pitäisi olla vähintään 20 kt/s."
+msgstr "Enimmäisnopeus pitää olla suurempi tai sama kuin keskimääräinen nopeus. Molempien lukujen pitäisi olla vähintään 20 kt/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3089,17 +3041,13 @@ msgstr "Näytä poistumiskäytännöistä ohje"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Mitä Internet-palveluita käyttäjien pitäisi voida käyttää reitittimesi "
-"kautta?"
+msgstr "Mitä Internet-palveluita käyttäjien pitäisi voida käyttää reitittimesi kautta?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor torjuu joitakin lähteviä sähköposteja sekä tiedostonjako-ohjelmia "
-"vähentääkseen roskapostitusta ja muunlaista hyväksikäyttöä."
+msgstr "Tor torjuu joitakin lähteviä sähköposteja sekä tiedostonjako-ohjelmia vähentääkseen roskapostitusta ja muunlaista hyväksikäyttöä."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3112,8 +3060,7 @@ msgstr "Anna muiden käyttää siltaasi antamalla heille tämä rivi:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Tämä on siltareitittimesi henkilöllisyys, jonka voi antaa muille käyttäjille"
+msgstr "Tämä on siltareitittimesi henkilöllisyys, jonka voi antaa muille käyttäjille"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3131,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Jätä reitittimesi päälle niin että käyttäjillä on paremmat mahdollisuudet "
-"löytää ja käyttää sitä."
+msgstr "Jätä reitittimesi päälle niin että käyttäjillä on paremmat mahdollisuudet löytää ja käyttää sitä."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3167,6 +3112,14 @@ msgstr "<a href=\"#bridgeHelp\">Mikä tämä on?</a>"
 
 msgctxt "ServerPage"
 msgid "Automatically distribute my bridge address"
+msgstr "Jaa siltaosoitteeni automaattisesti"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -3177,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Sähköpostiosoite josta sinut voidaan tavoittaa jos reitittimesi kanssa on ongelmia.\n"
-"Voit myös lisätä PGP tai GPG tunnuksesi."
+msgstr "Sähköpostiosoite josta sinut voidaan tavoittaa jos reitittimesi kanssa on ongelmia.\nVoit myös lisätä PGP tai GPG tunnuksesi."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3189,9 +3140,7 @@ 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 ""
-"Ole hyvä ja määritä vähintään palvelun kansio ja virtuaaliportti jokaiselle "
-"halumallesi palvelulle, jonka haluat tallentaa. Muut voi poistaa."
+msgstr "Ole hyvä ja määritä vähintään palvelun kansio ja virtuaaliportti jokaiselle halumallesi palvelulle, jonka haluat tallentaa. Muut voi poistaa."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3207,8 +3156,7 @@ msgstr "Valitse palvelun kansio"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Virtuaaliportti voi sisältää vain kelvollisia porttinumeroita [1..65535]."
+msgstr "Virtuaaliportti voi sisältää vain kelvollisia porttinumeroita [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
@@ -3260,9 +3208,7 @@ msgstr "Kopioi onion-osoite valitusta palvelusta leikepöydälle"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Selaa paikallista tiedostojärjestelmää ja valitse kansio valitulle "
-"palvelulle"
+msgstr "Selaa paikallista tiedostojärjestelmää ja valitse kansio valitulle palvelulle"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3289,10 +3235,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Napsauta \"Käynnistä Tor\" Vidalian hallintapaneelissa käynnistääksesi Tor-"
-"ohjelman uudelleen. Jos Tor sulkeutui odottamattomasti, valitse ylhäältä "
-"\"Edistynyt\"-välilehti saadaksesi tietoa mahdollisista virheistä."
+msgstr "Napsauta \"Käynnistä Tor\" Vidalian hallintapaneelissa käynnistääksesi Tor-ohjelman uudelleen. Jos Tor sulkeutui odottamattomasti, valitse ylhäältä \"Edistynyt\"-välilehti saadaksesi tietoa mahdollisista virheistä."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3300,10 +3243,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Käytät parhaillaan Tor-ohjelman versiota \"%1\", jota ei enää suositella. "
-"Päivitäthän ohjelman uusimpaan versioon, joka saattaa sisältää tärkeitä "
-"turvallisuutta, luotettavuutta ja suorituskykyä parantavia korjauksia."
+msgstr "Käytät parhaillaan Tor-ohjelman versiota \"%1\", jota ei enää suositella. Päivitäthän ohjelman uusimpaan versioon, joka saattaa sisältää tärkeitä turvallisuutta, luotettavuutta ja suorituskykyä parantavia korjauksia."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3311,11 +3251,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Käytät parhaillaan Tor-ohjelman versiota \"%1\", joka ei ehkä enää toimi "
-"nykyisen Tor-verkon kanssa. Päivitäthän ohjelman uusimpaan versioon, joka "
-"saattaa sisältää tärkeitä turvallisuutta, luotettavuutta ja suorituskykyä "
-"parantavia korjauksia."
+msgstr "Käytät parhaillaan Tor-ohjelman versiota \"%1\", joka ei ehkä enää toimi nykyisen Tor-verkon kanssa. Päivitäthän ohjelman uusimpaan versioon, joka saattaa sisältää tärkeitä turvallisuutta, luotettavuutta ja suorituskykyä parantavia korjauksia."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3329,9 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Onnistuimme luomaan yhteyden Tor-verkkoon. Voit nyt asettaa ohjelmasi "
-"käyttämään Internetiä anonyymisti."
+msgstr "Onnistuimme luomaan yhteyden Tor-verkkoon. Voit nyt asettaa ohjelmasi käyttämään Internetiä anonyymisti."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3341,7 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
+msgstr "Tor-sovellus päättyi sisäiseen virheeseen. Voit raportoida seuraavan virheviestin Tor-kehittäjille osoitteeseen bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3361,7 +3295,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Tietokoneesi kello on mahdollisesti väärässä"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3369,14 +3303,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
+msgstr "Jokin tietokoneellasi oleva sovellus on saattanut yrittää muodostaa salaamattoman yhteyden Torin kautta porttiin %1. Salaamattoman tiedon lähettäminen Tor-verkon yli on vaarallista, eikä sitä suositella. Tor on automaattisesti sulkenut tämän yhteyden."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
+msgstr "Jokin tietokoneellasi oleva sovellus on saattanut yrittää muodostaa salaamattoman yhteyden Torin kautta porttiin %1. Salaamattoman tiedon lähettäminen Tor-verkon yli on vaarallista, eikä sitä suositella."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3388,7 +3322,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
+msgstr "Jokin tietokoneellasi oleva sovellus muodosti yhteyden Torin kautta osoitteeseen \"%1\" käyttäen protokollaa, joka voi vuotaa tietoa yhteyden kohteesta. Varmista, että olet asettanut sovellukset käyttämään vain SOCKS4:sta tai SOCKS5:sta isäntäkoneen nimen selvittämiseen."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3414,7 +3348,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
-msgstr ""
+msgstr "Ulkoinen IP-osoite on muuttunut"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3425,7 +3359,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "DNS-kaappaus havaittu"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3443,7 +3377,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Tarkistetaan palvelimen portin saavutettavuutta"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3649,8 +3583,7 @@ msgstr "UPnP-laitteita ei löytynyt"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Yhteensopivia UPnP:tä käyttäviä Internet-yhdyskäytävälaitteita ei löytynyt"
+msgstr "Yhteensopivia UPnP:tä käyttäviä Internet-yhdyskäytävälaitteita ei löytynyt"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
@@ -3700,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska "
-"kohdetta '%1' ei löytynyt."
+msgstr "Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska kohdetta '%1' ei löytynyt."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska "
-"Tor:in  päivitysprosessi suljettiin yllättäen."
+msgstr "Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska Tor:in  päivitysprosessi suljettiin yllättäen."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3866,7 +3795,7 @@ msgstr "Lokitiedoston'%1': %2 avaaminen epäonnistui"
 
 msgctxt "Vidalia"
 msgid "Value required for parameter :"
-msgstr ""
+msgstr "Parametri vaatii arvon :"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
@@ -3885,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Toinen Vidalia prosessi on mahdollisesti jo käynnissä. Jos näin on, voit jatkaa jokatapauksessa.\n"
-"\n"
-"Haluatko jatkaa ja käynnistää Vidalian?"
+msgstr "Toinen Vidalia prosessi on mahdollisesti jo käynnissä. Jos näin on, voit jatkaa jokatapauksessa.\n\nHaluatko jatkaa ja käynnistää Vidalian?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3921,5 +3847,3 @@ msgstr "%1 tuntia"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minuuttia"
-
-
diff --git a/src/vidalia/i18n/po/fil/qt_fil.po b/src/vidalia/i18n/po/fil/qt_fil.po
index f32a87f..d4811fc 100644
--- a/src/vidalia/i18n/po/fil/qt_fil.po
+++ b/src/vidalia/i18n/po/fil/qt_fil.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fil/vidalia_fil.po b/src/vidalia/i18n/po/fil/vidalia_fil.po
index 4c01d38..f8eb119 100644
--- a/src/vidalia/i18n/po/fil/vidalia_fil.po
+++ b/src/vidalia/i18n/po/fil/vidalia_fil.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/fo/qt_fo.po b/src/vidalia/i18n/po/fo/qt_fo.po
index 18ad62a..b49f584 100644
--- a/src/vidalia/i18n/po/fo/qt_fo.po
+++ b/src/vidalia/i18n/po/fo/qt_fo.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fo/vidalia_fo.po b/src/vidalia/i18n/po/fo/vidalia_fo.po
index 22b0f4e..950382d 100644
--- a/src/vidalia/i18n/po/fo/vidalia_fo.po
+++ b/src/vidalia/i18n/po/fo/vidalia_fo.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fr/qt_fr.po b/src/vidalia/i18n/po/fr/qt_fr.po
index c0ce609..f4a5eb2 100644
--- a/src/vidalia/i18n/po/fr/qt_fr.po
+++ b/src/vidalia/i18n/po/fr/qt_fr.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # K Anon <anonymK@xxxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-01-24 03:48+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: K Anon <anonymK@xxxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 existe déjà.\n"
-"Voulez-vous le remplacer ?"
+msgstr "%1 existe déjà.\nVoulez-vous le remplacer ?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Fichier introuvable.\n"
-"Veuillez vérifier que le nom du fichier est correct."
+msgstr "%1\nFichier introuvable.\nVeuillez vérifier que le nom du fichier est correct."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Dossier introuvable.\n"
-"Veuillez vérifier que le nom du dossier est correct."
+msgstr "%1\nDossier introuvable.\nVeuillez vérifier que le nom du dossier est correct."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' est protégé en écriture.\n"
-"Voulez-vous quand même le supprimer ?"
+msgstr "'%1' est protégé en écriture.\nVoulez-vous quand même le supprimer ?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Le nom \"%1\" ne peut pas être utilisé.</b><p>Essayez un autre nom avec "
-"moins de caractères ou sans ponctuation."
+msgstr "<b>Le nom \"%1\" ne peut pas être utilisé.</b><p>Essayez un autre nom avec moins de caractères ou sans ponctuation."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 Ko"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 octets"
-
-
diff --git a/src/vidalia/i18n/po/fr/vidalia_fr.po b/src/vidalia/i18n/po/fr/vidalia_fr.po
index 87b6c4c..ebb7d39 100644
--- a/src/vidalia/i18n/po/fr/vidalia_fr.po
+++ b/src/vidalia/i18n/po/fr/vidalia_fr.po
@@ -1,5 +1,6 @@
 # 
 # Translators:
+#  arpalord <arpalord@xxxxxxxxx>, 2012.
 # mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>, 2011.
 # Pierre Antoine <pierre.antoine@xxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,9 +8,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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-20 11:42+0000\n"
-"Last-Translator: Pierre Antoine <pierre.antoine@xxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-30 12:25+0000\n"
+"Last-Translator: arpalord <arpalord@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,9 +46,7 @@ msgstr "'%1' n'est pas une adresse IP valide."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Vous avez choisi une authentification par mot de passe, mais n'avez pas "
-"spécifié de mot de passe."
+msgstr "Vous avez choisi une authentification par mot de passe, mais n'avez pas spécifié de mot de passe."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -119,8 +118,7 @@ msgstr "Fichier de configuration de Tor"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Lance le logiciel Tor avec le fichier de configuration spécifié (torrc)"
+msgstr "Lance le logiciel Tor avec le fichier de configuration spécifié (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -140,8 +138,7 @@ msgstr "Sauver les données du logiciel Tor dans le répertoire suivant"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Selectionnez le répertoire utilisé pour sauver les données du logiciel Tor"
+msgstr "Selectionnez le répertoire utilisé pour sauver les données du logiciel Tor"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -175,18 +172,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"L'emplacement du fichier de configuration Tor spécifié contient des "
-"caractères qui ne peuvent pas être affichés avec l'encodage 8 bit de votre "
-"système."
+msgstr "L'emplacement du fichier de configuration Tor spécifié contient des caractères qui ne peuvent pas être affichés avec l'encodage 8 bit de votre système."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"L'emplacement du dossier de données Tor spécifié contient des caractères qui"
-" ne peuvent pas être affichés avec l'encodage 8 bit de votre système."
+msgstr "L'emplacement du dossier de données Tor spécifié contient des caractères qui ne peuvent pas être affichés avec l'encodage 8 bit de votre système."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -210,13 +202,17 @@ msgstr "Configurer le port de contrôle automatiquement"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Vidalia n'a pa pu supprimer le service de Tor.\n"
-"\n"
-"Vous pouvez avoir à le supprimer manuellement."
+msgstr "Vidalia n'a pa pu supprimer le service de Tor.\n\nVous pouvez avoir à le supprimer manuellement."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -238,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia n'a pas pu charger la traduction sélectionnée."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Depuis :"
@@ -458,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia est connecté à un service Tor qui demande un mot de passe. Merci de "
-"saisir votre mot de passe de contrôle."
+msgstr "Vidalia est connecté à un service Tor qui demande un mot de passe. Merci de saisir votre mot de passe de contrôle."
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1298,9 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Nous sommes dans l'impossibilité de redémarrer Vidalia automatiquement. "
-"Merci de redémarrer Vidalia manuellement."
+msgstr "Nous sommes dans l'impossibilité de redémarrer Vidalia automatiquement. Merci de redémarrer Vidalia manuellement."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1310,29 +1319,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Un rapport de plantage a été créé pour que vous puissiez l'envoyer aux "
-"développeurs de Vidalia pour aider à identifier et corriger le problème. Les"
-" données soumises ne contiennent aucune information d'identification "
-"personnelle."
+msgstr "Un rapport de plantage a été créé pour que vous puissiez l'envoyer aux développeurs de Vidalia pour aider à identifier et corriger le problème. Les données soumises ne contiennent aucune information d'identification personnelle."
 
 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 ""
-"avec une description de ce que vous faisiez avant le plantage de "
-"l'application, avec en attachement les fichiers suivants correspondant au "
-"plantage :"
+msgstr "avec une description de ce que vous faisiez avant le plantage de l'application, avec en attachement les fichiers suivants correspondant au plantage :"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1551,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia peut ouvrir le lien que vous avez sélectionné dans votre navigateur "
-"par défaut. Si votre navigateur n'est pas actuellement configuré pour Tor, "
-"votre requête ne sera pas anonyme."
+msgstr "Vidalia peut ouvrir le lien que vous avez sélectionné dans votre navigateur par défaut. Si votre navigateur n'est pas actuellement configuré pour Tor, votre requête ne sera pas anonyme."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1568,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia a été incapable d'ouvrir le lien selectionné dans votre navigateur. "
-"Vous pouvez tout de même copier l'URL et la coller dans votre navigateur."
+msgstr "Vidalia a été incapable d'ouvrir le lien selectionné dans votre navigateur. Vous pouvez tout de même copier l'URL et la coller dans votre navigateur."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1738,8 +1733,7 @@ msgstr "Erreur lors du démarrage du serveur mandataire (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é"
+msgstr "Vidalia n'est pas parvenu à démarrer le serveur mandataire (proxy) configuré"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
@@ -1782,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connecté au réseau Tor !"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Etat de lancement inconnu"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "divers"
 
@@ -1853,10 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia n'est pas parvenu à démarrer Tor. Contrôlez vos options et assurez-"
-"vous que le nom et le chemin de l'exécutable de Tor sont correctement "
-"indiqués."
+msgstr "Vidalia n'est pas parvenu à démarrer Tor. Contrôlez vos options et assurez-vous que le nom et le chemin de l'exécutable de Tor sont correctement indiqués."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1894,15 +1881,11 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Le logiciel Tor demande que Vidalia envoie le contenu d'un cookie "
-"d'authentification, mais Vidalia n'a pas pu le trouver."
+msgstr "Le logiciel Tor demande que Vidalia envoie le contenu d'un cookie d'authentification, mais Vidalia n'a pas pu le trouver."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"Voulez-vous effectuer manuellement la recherche du fichier "
-"'control_auth_cookie' ?"
+msgstr "Voulez-vous effectuer manuellement la recherche du fichier 'control_auth_cookie' ?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
@@ -1920,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia n'a pas pu enregistrer certains évènements. Plusieurs "
-"fonctionnalités de Vidalia peuvent être indisponibles."
+msgstr "Vidalia n'a pas pu enregistrer certains évènements. Plusieurs fonctionnalités de Vidalia peuvent être indisponibles."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1934,9 +1915,7 @@ msgstr "Vidalia n'a pu s'authentifier au logiciel Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Veuillez vérifier les paramètress d'authentification de votre port de "
-"contrôle."
+msgstr "Veuillez vérifier les paramètress d'authentification de votre port de contrôle."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1946,10 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"La version actuellement installée de Tor est obsolète et n'est plus "
-"recommandée. Merci de visiter le site Web de Tor pour télécharger la "
-"dernière version."
+msgstr "La version actuellement installée de Tor est obsolète et n'est plus recommandée. Merci de visiter le site Web de Tor pour télécharger la dernière version."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1959,8 +1935,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Toutes les connexions suivantes sembleront être différentes des précédentes."
+msgstr "Toutes les connexions suivantes sembleront être différentes des précédentes."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2055,25 +2030,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia a essayé de réinitialiser le mot de passe de Tor, mais n'a pu "
-"redémarrer le logiciel Tor. Merci de consulter votre gestionnaire de Taches "
-"pour vous assurer qu'il n'y a pas d'autres processus Tor actif."
+msgstr "Vidalia a essayé de réinitialiser le mot de passe de Tor, mais n'a pu redémarrer le logiciel Tor. Merci de consulter votre gestionnaire de Taches pour vous assurer qu'il n'y a pas d'autres processus Tor actif."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"La version actuellement installée de Tor est obsolète et n'est plus "
-"recommandée."
+msgstr "La version actuellement installée de Tor est obsolète et n'est plus recommandée."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Voulez-vous vérifier si une nouvelle version est disponible pour "
-"l'intstallation ?"
+msgstr "Voulez-vous vérifier si une nouvelle version est disponible pour l'intstallation ?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2083,9 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor a automatiquement fermé votre connexion de façon à protéger votre "
-"anonymat."
+msgstr "Tor a automatiquement fermé votre connexion de façon à protéger votre anonymat."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2099,9 +2065,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Il n'y a pas de nouvelle version de Tor disponible pour votre ordinateur "
-"pour le moment."
+msgstr "Il n'y a pas de nouvelle version de Tor disponible pour votre ordinateur pour le moment."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2109,8 +2073,7 @@ msgstr "Echec de l'installation"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
-"Vidalia n'a pas été capable d'installer les mises à jour de votre logiciel."
+msgstr "Vidalia n'a pas été capable d'installer les mises à jour de votre logiciel."
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
@@ -2121,10 +2084,25 @@ 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."
-msgstr ""
-"Tout ce qui sera envoyé à travers cette connexion pourrait être surveillé. "
-"Merci de vérifier la configuration de votre application et d'utiliser "
-"seulement des protocoles cryptés, tél que SSL, si possible."
+msgstr "Tout ce qui sera envoyé à travers cette connexion pourrait être surveillé. Merci de vérifier la configuration de votre application et d'utiliser seulement des protocoles cryptés, tél que SSL, si possible."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Exécution de torrc de %1 à %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probablement Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probably un client de messagerie)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Une de vos applications %1 semble réaliser une connexion non chiffrée au port %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2134,49 +2112,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Votre relais s'arrête.\n"
-"Cliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Exécution de torrc de %1 à %2"
+msgstr "Votre relais s'arrête.\nCliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ""
-"Vous hébergez actuellement un relais. Terminer le relais va interrompre toutes les connexions des clients.\n"
-"\n"
-"Voulez vous l'arrêter doucement et laisser à vos clients le temps de trouver un nouveau relais."
 
 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 ""
-"Vidalia a détecté que Tor s'est arrêté brutalement.\n"
-"\n"
-"Veuillez contrôler dans l'historique les derniers messages d'erreur ou d'alerte."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablement Telnet)"
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probably un client de messagerie)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Vous hébergez actuellement un relais. Terminer le relais va interrompre toutes les connexions des clients.\n\nVoulez vous l'arrêter doucement et laisser à vos clients le temps de trouver un nouveau relais."
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Une de vos applications %1 semble réaliser une connexion non chiffrée au "
-"port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia a détecté que Tor s'est arrêté brutalement.\n\nVeuillez contrôler dans l'historique les derniers messages d'erreur ou d'alerte."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2200,9 +2165,7 @@ msgstr "Le nom de fichier du Journal des messages est requis"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Vous devez entrer un nom de fichier pour pouvoir enregistrer les messages "
-"dans un fichier."
+msgstr "Vous devez entrer un nom de fichier pour pouvoir enregistrer les messages dans un fichier."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2452,17 +2415,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Messages qui apparaissent quand un problème\n"
-" est arrivé et que Tor ne peut continuer."
+msgstr "Messages qui apparaissent quand un problème\n est arrivé et que Tor ne peut continuer."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Messages qui apparaissent uniquement quand\n"
-"un problème s'est produit avec Tor."
+msgstr "Messages qui apparaissent uniquement quand\nun problème s'est produit avec Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2470,39 +2429,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Messages qui apparaissent de manière peu fréquente\n"
-"durant le fonctionnement normal\n"
-"de Tor et ne sont pas considérés comme\n"
-"des erreurs, mais dont vous devez tenir\n"
-"compte."
+msgstr "Messages qui apparaissent de manière peu fréquente\ndurant le fonctionnement normal\nde Tor et ne sont pas considérés comme\ndes erreurs, mais dont vous devez tenir\ncompte."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Messages qui apparaissent fréquemment \n"
-"durant le fonctionnement de Tor"
+msgstr "Messages qui apparaissent fréquemment \ndurant le fonctionnement de Tor"
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Nombreux Messages destiné à \n"
-"l'usage principal des développeurs \n"
-"de Tor."
+msgstr "Nombreux Messages destiné à \nl'usage principal des développeurs \nde Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Impossible d'écrire le fichier %1\n"
-"\n"
-"%2."
+msgstr "Impossible d'écrire le fichier %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2609,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Passerelle invalide"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identifiant de passerelle spécifié est invalide."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copier (Ctrl+C)"
 
@@ -2624,18 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro "
-"de port pour que Tor puisse utiliser le serveur mandataire (proxy) et "
-"accéder à l'Internet."
+msgstr "Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port pour que Tor puisse utiliser le serveur mandataire (proxy) et accéder à l'Internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Vous devez indiquer le ou les ports utilisés par votre parefeu pour vous "
-"autoriser à vous connecter."
+msgstr "Vous devez indiquer le ou les ports utilisés par votre parefeu pour vous autoriser à vous connecter."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2643,9 +2576,7 @@ msgstr "'%1' n'est pas un numéro de port valide."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Cochez si votre réseau local a besoin d'un proxy mandataire pour accéder à "
-"Internet"
+msgstr "Cochez si votre réseau local a besoin d'un proxy mandataire pour accéder à Internet"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2669,9 +2600,7 @@ msgstr "Port :"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Cochez pour se connecter uniquement au relais en utilisant les ports "
-"autorisés par votre parefeu."
+msgstr "Cochez pour se connecter uniquement au relais en utilisant les ports autorisés par votre parefeu."
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2693,14 +2622,11 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Cochez pour crypter les demandes d'annuaire et, facultativement, utilisez "
-"les relais passerelles pour accéder au réseau Tor."
+msgstr "Cochez pour crypter les demandes d'annuaire et, facultativement, utilisez les relais passerelles pour accéder au réseau Tor."
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
-msgstr ""
-"Mon fournisseur d'accès à Internet bloque les connexions au réseau Tor"
+msgstr "Mon fournisseur d'accès à Internet bloque les connexions au réseau Tor"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
@@ -2724,9 +2650,7 @@ msgstr "Rechercher maintenant des passerelles"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">Comment puis-je trouver autrement des "
-"passerelles ?</a>"
+msgstr "<a href=\"bridges.finding\">Comment puis-je trouver autrement des passerelles ?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2736,16 +2660,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Pas de nouvelle passerelle disponible. Vous pouvez soit attendre un peu et "
-"réessayer, ou encore essayer une autre méthode pour trouver de nouvelles "
-"passerelles."
+msgstr "Pas de nouvelle passerelle disponible. Vous pouvez soit attendre un peu et réessayer, ou encore essayer une autre méthode pour trouver de nouvelles passerelles."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Appuyez sur Aide pour voir d'autres moyens de trouver de nouvelles "
-"passerelles."
+msgstr "Appuyez sur Aide pour voir d'autres moyens de trouver de nouvelles passerelles."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2768,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Vous devez définir un ou plusieurs pont."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accepter"
@@ -2931,18 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Vous avez configuré Tor en tant que relais passerelle pour les utilisateurs "
-"censurés, mais la version de Tor que vous utilisez ne supporte pas les "
-"passerelles."
+msgstr "Vous avez configuré Tor en tant que relais passerelle pour les utilisateurs censurés, mais la version de Tor que vous utilisez ne supporte pas les passerelles."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Merci de mettre à jour Tor ou de configurer votre version actuelle pour agir"
-" en tant que relais Tor normal."
+msgstr "Merci de mettre à jour Tor ou de configurer votre version actuelle pour agir en tant que relais Tor normal."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2957,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Lancer uniquement comme client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relayer le trafic pour le réseau Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port relais :"
 
@@ -2998,9 +2908,7 @@ msgstr "Nom de votre relais"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Port par lequel les utilisateurs et les autres relais peuvent communiquer "
-"avec votre relais"
+msgstr "Port par lequel les utilisateurs et les autres relais peuvent communiquer avec votre relais"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -3014,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Merci d'indiquer votre vitesse en remontée si votre connexion a une vitesse "
-"élevée en téléchargement mais lente en remontée."
+msgstr "Merci d'indiquer votre vitesse en remontée si votre connexion a une vitesse élevée en téléchargement mais lente en remontée."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3044,9 +2950,7 @@ msgstr "Personnalisé"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Sélectionner dans la liste déroulante l'entrée qui se rapproche le plus de "
-"votre connexion Internet"
+msgstr "Sélectionner dans la liste déroulante l'entrée qui se rapproche le plus de votre connexion Internet"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
@@ -3076,10 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Votre bande passante maximale doit être supérieure ou égal à votre bande "
-"passante moyene. Les deux valeurs doivent être supérieures ou égales à 20 "
-"KB/s."
+msgstr "Votre bande passante maximale doit être supérieure ou égal à votre bande passante moyene. Les deux valeurs doivent être supérieures ou égales à 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3140,17 +3041,13 @@ msgstr "Afficher la rubrique d'aide des politiques de sortie"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Quelles sont les ressources d'Internet auquelles peuvent avoir accès les "
-"utilisateurs par votre relais ?"
+msgstr "Quelles sont les ressources d'Internet auquelles peuvent avoir accès les utilisateurs par votre relais ?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor bloque encore certains programmes mails et partage de fichiers par "
-"défaut pour réduire le spam et les autres abus."
+msgstr "Tor bloque encore certains programmes mails et partage de fichiers par défaut pour réduire le spam et les autres abus."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3158,16 +3055,12 @@ msgstr "Politiques de sortie"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Permettre aux utilisateurs d'accéder à votre passerelle en leur donnant "
-"cette ligne :"
+msgstr "Permettre aux utilisateurs d'accéder à votre passerelle en leur donnant cette ligne :"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Il s'agit de l'identité de votre passerelle ; vous pouvez la communiquer aux"
-" personnes que vous souhaitez"
+msgstr "Il s'agit de l'identité de votre passerelle ; vous pouvez la communiquer aux personnes que vous souhaitez"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3185,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Laisser votre relais actif de façon à ce que les clients aient un chance de "
-"le trouver et de l'utiliser."
+msgstr "Laisser votre relais actif de façon à ce que les clients aient un chance de le trouver et de l'utiliser."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3201,9 +3092,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor a renvoyé une réponse incorrecte lorsque Vidalia a demandé l'historique "
-"de votre passerelle."
+msgstr "Tor a renvoyé une réponse incorrecte lorsque Vidalia a demandé l'historique de votre passerelle."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3226,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Attribuer automatiquemeny l'adresse de mon bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Trafic du relai pour le réseau Tor (point de sortie)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Héberger une copie du répertoire des relais"
 
@@ -3233,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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 \n"
-"problème avec votre relais. Vous pouvez aussi inclure votre empreinte PGP ou GPG."
+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"
@@ -3245,9 +3140,7 @@ 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 répertoire et un port virtuel pour chacun "
-"des services que vous voulez sauver. Supprimez les autres."
+msgstr "Merci de configurer au moins un répertoire et un port virtuel pour chacun des services que vous voulez sauver. Supprimez les autres."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3263,14 +3156,11 @@ msgstr "Sélectionnez le répertoire de Service"
 
 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]"
+msgstr "Les ports virtuels peuvent uniquement contenir des numéros de ports valides [1..65535]"
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"Destination doit uniquement contenir addresse:port, addresse, or port."
+msgstr "Destination doit uniquement contenir addresse:port, addresse, or port."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
@@ -3318,9 +3208,7 @@ msgstr "Copier l'adresse onion du service selectionné dans le presse-papiers."
 
 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é"
+msgstr "Parcourez le système de fichiers et choisissez le dossier du service sélectionné"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3347,11 +3235,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Cliquer sur \"Démarrer Tor\" dans le Panneau de Configuration Vidalia pour "
-"redémarrer le programme Tor. Si Tor s'arrête de manière intempestive, "
-"sélectionnez l'onglet \"Avancé\" ci-dessus pour obtenir des détails sur "
-"l'erreur produite."
+msgstr "Cliquer sur \"Démarrer Tor\" dans le Panneau de Configuration Vidalia pour redémarrer le programme Tor. Si Tor s'arrête de manière intempestive, sélectionnez l'onglet \"Avancé\" ci-dessus pour obtenir des détails sur l'erreur produite."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3359,11 +3243,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Vous utilisez actuellement le programme Tor en version \"%1\", qui n'est "
-"plus recommandée. Merci de mettre à jour Tor à la version la plus récente, "
-"qui pourrait contenir d'importantes corrections de sécurité, de fiabilité et"
-" de performances."
+msgstr "Vous utilisez actuellement le programme Tor en version \"%1\", qui n'est plus recommandée. Merci de mettre à jour Tor à la version la plus récente, qui pourrait contenir d'importantes corrections de sécurité, de fiabilité et de performances."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3371,11 +3251,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Vous utilisez actuellement le programme Tor en version \"%1\", qui pourrait "
-"ne pas fonctionner avec le réseau Tor actuel. Merci de mettre à jour Tor à "
-"la version la plus récente, qui pourrait contenir d'importantes corrections "
-"de sécurité, de fiabilité et de performances."
+msgstr "Vous utilisez actuellement le programme Tor en version \"%1\", qui pourrait ne pas fonctionner avec le réseau Tor actuel. Merci de mettre à jour Tor à la version la plus récente, qui pourrait contenir d'importantes corrections de sécurité, de fiabilité et de performances."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3389,10 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Vous avez pu vous connecter avec succès au réseau Tor. Vous pouvez "
-"maintenant configurer vos applications pour utiliser Internet de manière "
-"anonyme."
+msgstr "Vous avez pu vous connecter avec succès au réseau Tor. Vous pouvez maintenant configurer vos applications pour utiliser Internet de manière anonyme."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3402,10 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Le programme Tor a rencontré une erreur interne. Merci de transmettre le "
-"message d'erruer suivant aux développeurs de Tor à bugs.torproject.org: "
-"\"%1\"\n"
+msgstr "Le programme Tor a rencontré une erreur interne. Merci de transmettre le message d'erruer suivant aux développeurs de Tor à bugs.torproject.org: \"%1\"\n"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3413,11 +3283,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 "
-"secondes en retard de la source \"%2\". Si votre horloge n'est pas correcte,"
-" Tor ne sera pas capable de fonctionner. Merci de vérifier que votre "
-"ordinateur affiche la bonne heure."
+msgstr "Tor a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 secondes en retard de la source \"%2\". Si votre horloge n'est pas correcte, Tor ne sera pas capable de fonctionner. Merci de vérifier que votre ordinateur affiche la bonne heure."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3425,11 +3291,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 "
-"secondes en avance de la source \"%2\". Si votre horloge n'est pas correcte,"
-" Tor ne sera pas capable de fonctionner. Merci de vérifier que votre "
-"ordinateur affiche la bonne heure."
+msgstr "Tor a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 secondes en avance de la source \"%2\". Si votre horloge n'est pas correcte, Tor ne sera pas capable de fonctionner. Merci de vérifier que votre ordinateur affiche la bonne heure."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3441,21 +3303,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Une des applications de votre ordinateur a tenté d'établir une connexion "
-"non-cryptée à travers Tor sur le port %1. Envoyer des informations non-"
-"cryptées sur Tor peut être dangereux et n'est pas recommandé. Pour votre "
-"protection, Tor a automatiquement fermé la connexion."
+msgstr "Une des applications de votre ordinateur a tenté d'établir une connexion non-cryptée à travers Tor sur le port %1. Envoyer des informations non-cryptées sur Tor peut être dangereux et n'est pas recommandé. Pour votre protection, Tor a automatiquement fermé la connexion."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Une des applications de votre ordinateur a tenté d'établir une connexion "
-"non-cryptée à travers Tor sur le port %1. Envoyer des informations non-"
-"cryptées sur Tor peut être dangereux et n'est pas recommandé. "
+msgstr "Une des applications de votre ordinateur a tenté d'établir une connexion non-cryptée à travers Tor sur le port %1. Envoyer des informations non-cryptées sur Tor peut être dangereux et n'est pas recommandé. "
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3467,12 +3322,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Une des applications de votre ordinateur a établi une connexion à travers "
-"Tor vers \" %1\", en utilisant un protocole qui pourrait révéler des "
-"informations sur votre destination. Merci de vous assurer que vous avez "
-"configuré vos applications pour qu'elles utilisent seulement SOCKS4a ou "
-"SOCKS5 avec résolution à distance du nom d'hôte."
+msgstr "Une des applications de votre ordinateur a établi une connexion à travers Tor vers \" %1\", en utilisant un protocole qui pourrait révéler des informations sur votre destination. Merci de vous assurer que vous avez configuré vos applications pour qu'elles utilisent seulement SOCKS4a ou SOCKS5 avec résolution à distance du nom d'hôte."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3483,12 +3333,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Une des applications de votre ordinateur a tenté d'établir une connexion à "
-"travers Tor en utilisant un protocole que Tor ne reconnait pas. Merci de "
-"vous assurer que vous avez configuré vos applications pour qu'elles "
-"utilisent seulement SOCKS4a ou SOCKS5 avec résolution à distance du nom "
-"d'hôte."
+msgstr "Une des applications de votre ordinateur a tenté d'établir une connexion à travers Tor en utilisant un protocole que Tor ne reconnait pas. Merci de vous assurer que vous avez configuré vos applications pour qu'elles utilisent seulement SOCKS4a ou SOCKS5 avec résolution à distance du nom d'hôte."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3499,10 +3344,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Une de vos applications a tenté d'établir une connexion à travers Tor vers "
-"\"%1\", que Tor ne reconnait comme étant un nom d'hôte valide. Merci de "
-"vérifier la configuration de votre application."
+msgstr "Une de vos applications a tenté d'établir une connexion à travers Tor vers \"%1\", que Tor ne reconnait comme étant un nom d'hôte valide. Merci de vérifier la configuration de votre application."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3513,10 +3355,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor a déterminé que l'adresse IP publique de votre relais est actuellement "
-"%1%2. Si ceci n'est pas correct, merci de mettre l'option \"Adresse\" de la "
-"configuration de votre relais à la bonne valeur."
+msgstr "Tor a déterminé que l'adresse IP publique de votre relais est actuellement %1%2. Si ceci n'est pas correct, merci de mettre l'option \"Adresse\" de la configuration de votre relais à la bonne valeur."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3527,22 +3366,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor a détecté que votre fournisseur DNS fournit des réponses fausses pour "
-"des domaines qui n'existent pas. Quelques FAI et autres fournisseurs DNS, "
-"téls que OpenDNS, sont connus pour cette pratique qui a pour but d'afficher "
-"leurs propres pages de recherche et de publicité."
+msgstr "Tor a détecté que votre fournisseur DNS fournit des réponses fausses pour des domaines qui n'existent pas. Quelques FAI et autres fournisseurs DNS, téls que OpenDNS, sont connus pour cette pratique qui a pour but d'afficher leurs propres pages de recherche et de publicité."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor a détecté que votre fournisseur DNS fournit des réponses fausses pour "
-"des domaines bien connus. Puisque les clients comptent sur les relais Tor "
-"pour obtenir des réponses DNS précises, votre relais ne sera pas configuré "
-"en tant que relais de sortie."
+msgstr "Tor a détecté que votre fournisseur DNS fournit des réponses fausses pour des domaines bien connus. Puisque les clients comptent sur les relais Tor pour obtenir des réponses DNS précises, votre relais ne sera pas configuré en tant que relais de sortie."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3553,16 +3384,11 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor tente de déterminer si le port du serveur de votre relais est accessible"
-" par le réseau Tor en se connectant à %1:%2. Ce test pourrait prendre "
-"plusieurs minutes."
+msgstr "Tor tente de déterminer si le port du serveur de votre relais est accessible par le réseau Tor en se connectant à %1:%2. Ce test pourrait prendre plusieurs minutes."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
-msgstr ""
-"Test de vérification de l'accessibilité du port du serveur effectué avec "
-"succès!"
+msgstr "Test de vérification de l'accessibilité du port du serveur effectué avec succès!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
@@ -3578,12 +3404,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Le port du serveur de votre relais n'est pas accessible par les autres "
-"clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un "
-"firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre "
-"adresse IP / port de serveur, merci de vérifier la configuration de votre "
-"relais."
+msgstr "Le port du serveur de votre relais n'est pas accessible par les autres clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre adresse IP / port de serveur, merci de vérifier la configuration de votre relais."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3594,26 +3415,19 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor tente de déterminer si le port du serveur de votre relais est accessible"
-" par le réseau Tor en se connectant à %1:%2. Ce test pourrait prendre "
-"plusieurs minutes."
+msgstr "Tor tente de déterminer si le port du serveur de votre relais est accessible par le réseau Tor en se connectant à %1:%2. Ce test pourrait prendre plusieurs minutes."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-"Test de vérification de l'accessibilité du port du répertoire effectué avec "
-"succès!"
+msgstr "Test de vérification de l'accessibilité du port du répertoire effectué avec succès!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-"Le port du répertoire de votre relais est accessible par le réseau Tor!"
+msgstr "Le port du répertoire de votre relais est accessible par le réseau Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
-msgstr ""
-"Echec du test de vérification de l'accessibilité du port du répertoire"
+msgstr "Echec du test de vérification de l'accessibilité du port du répertoire"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3621,12 +3435,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Le port du répertoire de votre relais n'est pas accessible par les autres "
-"clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un "
-"firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre "
-"adresse IP / port de répertoire, merci de vérifier la configuration de votre"
-" relais."
+msgstr "Le port du répertoire de votre relais n'est pas accessible par les autres clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre adresse IP / port de répertoire, merci de vérifier la configuration de votre relais."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3636,10 +3445,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Le descripteur de votre relais, qui permet à des clients de se connecter à "
-"votre relais, a été rejeté par le serveur de répertoire à %1:%2. La raison "
-"donnée est: %3"
+msgstr "Le descripteur de votre relais, qui permet à des clients de se connecter à votre relais, a été rejeté par le serveur de répertoire à %1:%2. La raison donnée est: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3651,12 +3457,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Votre relais est maintenant en ligne et disponible pour être utilisé par les"
-" clients Tor. Dans quelques heures, au fur et à mesure que des clients "
-"apprendront l'existance de votre relais, vous devriez remarquer une "
-"augmentation du traffic de votre réseau sur le Graphique de Bande Passante  "
-"Merci de contribuer au déploiement du réseau Tor!"
+msgstr "Votre relais est maintenant en ligne et disponible pour être utilisé par les clients Tor. Dans quelques heures, au fur et à mesure que des clients apprendront l'existance de votre relais, vous devriez remarquer une augmentation du traffic de votre réseau sur le Graphique de Bande Passante  Merci de contribuer au déploiement du réseau Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3718,9 +3519,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Sauvegarde des réglages. Si non cochée les réglages seront appliqués "
-"seulement à la présente instance Tor."
+msgstr "Sauvegarde des réglages. Si non cochée les réglages seront appliqués seulement à la présente instance Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3760,9 +3559,7 @@ 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\""
+msgstr "La sélection est vide. Merci de sélectionner du texte, ou cocher \"Appliquer tout\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3836,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia n'a pu vérifier les mises à jour logicielles car il n'a pu trouver "
-"'%1'."
+msgstr "Vidalia n'a pu vérifier les mises à jour logicielles car il n'a pu trouver '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia n'a pu vérifier les mises à jour logicielles car le processus de "
-"mise à jour de Tor a échoué de façon inattendue."
+msgstr "Vidalia n'a pu vérifier les mises à jour logicielles car le processus de mise à jour de Tor a échoué de façon inattendue."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3970,20 +3763,15 @@ msgstr "Réinitialiser TOUS les paramètres utilisés par Vidalia."
 
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
-"Définir le dossier que Vidalia utiliser pour enregistrer les fichiers de "
-"données."
+msgstr "Définir le dossier que Vidalia utiliser pour enregistrer les fichiers de données."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
-"Définir le nom et le chemin du fichier d'identification du processus Vidalia"
-" (pidfile)."
+msgstr "Définir le nom et le chemin du fichier d'identification du processus Vidalia (pidfile)."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
-"Définir le nom et le chemin du fichier du Journal des messages de Vidalia."
+msgstr "Définir le nom et le chemin du fichier du Journal des messages de Vidalia."
 
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
@@ -4026,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Un autre processus Vidalia est peut être actif. S'il n'y a réellement aucun autre processus fonctionnant, vous pouvez choisir de continuer quand même. \n"
-"\n"
-"Voulez vous continuer à lancer Vidalia ?"
+msgstr "Un autre processus Vidalia est peut être actif. S'il n'y a réellement aucun autre processus fonctionnant, vous pouvez choisir de continuer quand même. \n\nVoulez vous continuer à lancer Vidalia ?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4062,5 +3847,3 @@ msgstr "%1 heures"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 mins"
-
-
diff --git a/src/vidalia/i18n/po/fur/qt_fur.po b/src/vidalia/i18n/po/fur/qt_fur.po
index 0eb6c13..46b1277 100644
--- a/src/vidalia/i18n/po/fur/qt_fur.po
+++ b/src/vidalia/i18n/po/fur/qt_fur.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fur/vidalia_fur.po b/src/vidalia/i18n/po/fur/vidalia_fur.po
index 9307aa2..a69ece6 100755
--- a/src/vidalia/i18n/po/fur/vidalia_fur.po
+++ b/src/vidalia/i18n/po/fur/vidalia_fur.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/fy/qt_fy.po b/src/vidalia/i18n/po/fy/qt_fy.po
index f31a58b..ee5a60c 100644
--- a/src/vidalia/i18n/po/fy/qt_fy.po
+++ b/src/vidalia/i18n/po/fy/qt_fy.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fy/vidalia_fy.po b/src/vidalia/i18n/po/fy/vidalia_fy.po
index 22b0f4e..2a2cf5d 100644
--- a/src/vidalia/i18n/po/fy/vidalia_fy.po
+++ b/src/vidalia/i18n/po/fy/vidalia_fy.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ga/qt_ga.po b/src/vidalia/i18n/po/ga/qt_ga.po
index d408691..60e2ea7 100644
--- a/src/vidalia/i18n/po/ga/qt_ga.po
+++ b/src/vidalia/i18n/po/ga/qt_ga.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ga/vidalia_ga.po b/src/vidalia/i18n/po/ga/vidalia_ga.po
index 92828aa..043b1b4 100644
--- a/src/vidalia/i18n/po/ga/vidalia_ga.po
+++ b/src/vidalia/i18n/po/ga/vidalia_ga.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/gl/qt_gl.po b/src/vidalia/i18n/po/gl/qt_gl.po
index cf67d75..290b50c 100644
--- a/src/vidalia/i18n/po/gl/qt_gl.po
+++ b/src/vidalia/i18n/po/gl/qt_gl.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/gl/vidalia_gl.po b/src/vidalia/i18n/po/gl/vidalia_gl.po
index f23a0ed..5070a88 100755
--- a/src/vidalia/i18n/po/gl/vidalia_gl.po
+++ b/src/vidalia/i18n/po/gl/vidalia_gl.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/gu/qt_gu.po b/src/vidalia/i18n/po/gu/qt_gu.po
index de997d9..476a4b9 100644
--- a/src/vidalia/i18n/po/gu/qt_gu.po
+++ b/src/vidalia/i18n/po/gu/qt_gu.po
@@ -1,10 +1,12 @@
-# 
+# Translators:
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -199,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 પહ�લ�થ� હા�ર ��.\n"
-"શ�� તમ� ત�ના પર બદલવા મા��� ��?"
+msgstr "%1 પહ�લ�થ� હા�ર ��.\nશ�� તમ� ત�ના પર બદલવા મા��� ��?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -209,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"ફા�લ મળ� નહ�.\n"
-"મહ�રબાન� �ર�ન� ��ાસ� �� સા��� ફા�લ નામ �પવામા� �વ�ય�� હત��."
+msgstr "%1\nફા�લ મળ� નહ�.\nમહ�રબાન� �ર�ન� ��ાસ� �� સા��� ફા�લ નામ �પવામા� �વ�ય�� હત��."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
diff --git a/src/vidalia/i18n/po/gu/vidalia_gu.po b/src/vidalia/i18n/po/gu/vidalia_gu.po
index 174bcbe..b48b31a 100755
--- a/src/vidalia/i18n/po/gu/vidalia_gu.po
+++ b/src/vidalia/i18n/po/gu/vidalia_gu.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -193,6 +194,17 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
@@ -219,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
@@ -1262,24 +1291,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 ""
 
@@ -1297,16 +1308,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+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..."
+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..."
+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 "GeneralPage"
@@ -1751,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2060,15 +2078,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2083,24 +2113,31 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2515,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2655,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2839,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3087,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3665,14 +3698,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 ""
@@ -3766,6 +3791,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 ""
 
@@ -3815,5 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/gun/qt_gun.po b/src/vidalia/i18n/po/gun/qt_gun.po
index 7439ef0..7ee94bb 100644
--- a/src/vidalia/i18n/po/gun/qt_gun.po
+++ b/src/vidalia/i18n/po/gun/qt_gun.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/gun/vidalia_gun.po b/src/vidalia/i18n/po/gun/vidalia_gun.po
index bd970e0..d83d35c 100644
--- a/src/vidalia/i18n/po/gun/vidalia_gun.po
+++ b/src/vidalia/i18n/po/gun/vidalia_gun.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ha/qt_ha.po b/src/vidalia/i18n/po/ha/qt_ha.po
index b7a61cd..5b98691 100644
--- a/src/vidalia/i18n/po/ha/qt_ha.po
+++ b/src/vidalia/i18n/po/ha/qt_ha.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ha/vidalia_ha.po b/src/vidalia/i18n/po/ha/vidalia_ha.po
index ce91a85..d29d261 100644
--- a/src/vidalia/i18n/po/ha/vidalia_ha.po
+++ b/src/vidalia/i18n/po/ha/vidalia_ha.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/he/qt_he.po b/src/vidalia/i18n/po/he/qt_he.po
index c875a40..35f2acd 100644
--- a/src/vidalia/i18n/po/he/qt_he.po
+++ b/src/vidalia/i18n/po/he/qt_he.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # Amichay P. K. <am1chay.p.k@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-10-09 19:14+0000\n"
-"Last-Translator: Amichay <am1chay.p.k@xxxxxxxxx>\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
+"Last-Translator: Amichay P. K. <am1chay.p.k@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 ×?×?ר ק×?×?×?.\n"
-"×?×?×? ×?רצ×?× ×? ×?×?×?×?×?×£ ×?×?ת×??"
+msgstr "%1 ×?×?ר ק×?×?×?.\n×?×?×? ×?רצ×?× ×? ×?×?×?×?×?×£ ×?×?ת×??"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"×?ק×?×?×¥ ×?×? × ×?צ×?.\n"
-"×?× ×? ×?×?×?×? שש×? ×?ק×?×?×¥ × ×?×?×?."
+msgstr "%1\n×?ק×?×?×¥ ×?×? × ×?צ×?.\n×?× ×? ×?×?×?×? שש×? ×?ק×?×?×¥ × ×?×?×?."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"×?ת×?ק×?×?×? ×?×? × ×?צ×?×?.\n"
-"×?× ×? ×?×?×?×? ×?ת ש×? ×?ת×?ק×?×?×?."
+msgstr "%1\n×?ת×?ק×?×?×? ×?×? × ×?צ×?×?.\n×?× ×? ×?×?×?×? ×?ת ש×? ×?ת×?ק×?×?×?."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' ×?×?×?×? ×?פנ×? ×?ת×?×?×?.\n"
-"×?×?×? ×?רצ×?× ×? ×?×?×?×?ק ×?×?ת×? ×?×?×? ×?קר×??"
+msgstr "'%1' ×?×?×?×? ×?פנ×? ×?ת×?×?×?.\n×?×?×? ×?רצ×?× ×? ×?×?×?×?ק ×?×?ת×? ×?×?×? ×?קר×??"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>×?ש×? \"%1\" ×?×?× ×? תק×?×?.</b><p>נס×? שנ×?ת ×¢×? ש×? ×?×?ר, ×?×¢×? פ×?×?ת ×?×?ת×?×?ת ×?×?×?×? "
-"ס×?×?× ×?×? ×?×?×?×?×?×?×?."
+msgstr "<b>×?ש×? \"%1\" ×?×?× ×? תק×?×?.</b><p>נס×? שנ×?ת ×¢×? ש×? ×?×?ר, ×?×¢×? פ×?×?ת ×?×?ת×?×?ת ×?×?×?×? ס×?×?× ×?×? ×?×?×?×?×?×?×?."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/he/vidalia_he.po b/src/vidalia/i18n/po/he/vidalia_he.po
index 1372b55..d07dda7 100644
--- a/src/vidalia/i18n/po/he/vidalia_he.po
+++ b/src/vidalia/i18n/po/he/vidalia_he.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-22 16:52+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: static172 <static.172@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -202,13 +202,17 @@ 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"
-"×?ת×?×? שע×?×?×? ×?×?ס×?ר ×?×?ת×? ×?×?× ×?ת."
+msgstr "Vidalia ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?ס×?ר ×?ת Tor.\n\n×?ת×?×? שע×?×?×? ×?×?ס×?ר ×?×?ת×? ×?×?× ×?ת."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -230,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?×¢×?×? ×?ת ק×?צ×? ×?תר×?×?×? ×?×?×?×?קש×?×?."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "×?×?×?:"
@@ -450,8 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia ×?ת×?×?ר×? ×?ת×?×?×?×? פע×?×? ש×? Tor ש×?×?רש ס×?ס×?×?. ×?× ×? ×?×?×? ×?ת ס×?ס×?ת ×?ת×?×?×?×?:"
+msgstr "Vidalia ×?ת×?×?ר×? ×?ת×?×?×?×? פע×?×? ש×? Tor ש×?×?רש ס×?ס×?×?. ×?× ×? ×?×?×? ×?ת ס×?ס×?ת ×?ת×?×?×?×?:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1531,9 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia ×?×?×?×?×? ×?פת×?×? ×?ת ×?ק×?ש×?ר ש×?×?רת ×?×?פ×?פ×? ×?ר×?רת ×?×?×?×?×? ש×?×?. ×?×? ×?×?פ×?פ×? ×?×?× ×? "
-"×?×?ת×?×? ×?ש×?×?×?ש ×?-Tor, ×?×?קש×? עש×?×?×?×? ×?×?×?×?ת ×?ש×?פ×?."
+msgstr "Vidalia ×?×?×?×?×? ×?פת×?×? ×?ת ×?ק×?ש×?ר ש×?×?רת ×?×?פ×?פ×? ×?ר×?רת ×?×?×?×?×? ש×?×?. ×?×? ×?×?פ×?פ×? ×?×?× ×? ×?×?ת×?×? ×?ש×?×?×?ש ×?-Tor, ×?×?קש×? עש×?×?×?×? ×?×?×?×?ת ×?ש×?פ×?."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1547,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ×?×? ×?צ×?×?×?×? ×?פת×?×? ×?ת ×?ק×?ש×?ר ×?×?פ×?פ×?. ×?ת×? ×¢×?×?×?×? ×?×?×?×? ×?×?עת×?ק ×?ת ×?×?ת×?×?ת ×?×?"
-" ×?×?פ×?פ×? ×?צ×?ר×? ×?×?× ×?ת."
+msgstr "Vidalia ×?×? ×?צ×?×?×?×? ×?פת×?×? ×?ת ×?ק×?ש×?ר ×?×?פ×?פ×?. ×?ת×? ×¢×?×?×?×? ×?×?×?×? ×?×?עת×?ק ×?ת ×?×?ת×?×?ת ×?×? ×?×?פ×?פ×? ×?צ×?ר×? ×?×?× ×?ת."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1760,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "×?×?×?×?ר ×?רשת Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "×?צ×? ×?ת×?×?×? ×?×? ×?×?×?×?×?"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "ש×?× ×?ת"
 
@@ -1831,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia ×?×? ×?צ×?×?×? ×?×?פע×?×? ×?ת Tor. ×?× ×? ×?×?×?ק ×?ת ×?×?×?×?ר×?ת ×?×?×?×? ש×?ש×? ×?×?×?ק×?×? ק×?×?×¥ "
-"×?רצת Tor ×?×?× ×? × ×?×?×?."
+msgstr "Vidalia ×?×? ×?צ×?×?×? ×?×?פע×?×? ×?ת Tor. ×?× ×? ×?×?×?ק ×?ת ×?×?×?×?ר×?ת ×?×?×?×? ש×?ש×? ×?×?×?ק×?×? ק×?×?×¥ ×?רצת Tor ×?×?× ×? × ×?×?×?."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1871,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"ת×?×?נת Tor ×?×?רשת ש-Vidalia תש×?×? ×¢×?×?×?×?ת ×?×?×?×?ת, ×?×? Vidalia ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?צ×?×?"
-" ×?×?×?ת."
+msgstr "ת×?×?נת Tor ×?×?רשת ש-Vidalia תש×?×? ×¢×?×?×?×?ת ×?×?×?×?ת, ×?×? Vidalia ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?צ×?×? ×?×?×?ת."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1895,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?רש×? ×?×?ספר ×?×?ר×?×¢×?×?. ת×?×?× ×?ת ×?ס×?×?×?×?×?ת ש×? Vidalia "
-"×?×?ש×?ת×?."
+msgstr "Vidalia ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?רש×? ×?×?ספר ×?×?ר×?×¢×?×?. ת×?×?× ×?ת ×?ס×?×?×?×?×?ת ש×? Vidalia ×?×?ש×?ת×?."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1919,9 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"×?×?רסת Tor ×?× ×?×?×?×?ת ×?×?×?שנת ×?×?×? ×?×?×?×?צת ×?×?תר ×?ש×?×?×?ש. ×?× ×? ×?קר ×?×?תר Tor ×¢×? ×?נת "
-"×?×?×?ר×?×? ×?ת ×?×?×?רס×? ×?×?×?ר×?× ×?."
+msgstr "×?×?רסת Tor ×?× ×?×?×?×?ת ×?×?×?שנת ×?×?×? ×?×?×?×?צת ×?×?תר ×?ש×?×?×?ש. ×?× ×? ×?קר ×?×?תר Tor ×¢×? ×?נת ×?×?×?ר×?×? ×?ת ×?×?×?רס×? ×?×?×?ר×?× ×?."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2026,17 +2030,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia × ×?סת×? ×?×?ת×?×? ×?ת ס×?ס×?ת ×?×?×? ×?×?קר×? ש×? Tor, ×?×? ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?ת×?×? ×?ת "
-"×?ת×?×?× ×?. ×?× ×? ×?×?×?×? ש×?×?×? ×¢×?×? ת×?×?×?×?×?×? פע×?×?×?×? ש×? Tor."
+msgstr "Vidalia × ×?סת×? ×?×?ת×?×? ×?ת ס×?ס×?ת ×?×?×? ×?×?קר×? ש×? Tor, ×?×? ×?×? ×?×?ת×? ×?ס×?×?×?ת ×?×?ת×?×? ×?ת ×?ת×?×?× ×?. ×?× ×? ×?×?×?×? ש×?×?×? ×¢×?×? ת×?×?×?×?×?×? פע×?×?×?×? ש×? Tor."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"×?×?רסת Tor ×?× ×?×?×?×?ת ×?×?×?שנת ×?×?×? ×?×?×?×?צת ×?×?תר ×?ש×?×?×?ש. ×?× ×? ×?קר ×?×?תר Tor ×¢×? ×?נת "
-"×?×?×?ר×?×? ×?ת ×?×?×?רס×? ×?×?×?ר×?× ×?."
+msgstr "×?×?רסת Tor ×?× ×?×?×?×?ת ×?×?×?שנת ×?×?×? ×?×?×?×?צת ×?×?תר ×?ש×?×?×?ש. ×?× ×? ×?קר ×?×?תר Tor ×¢×? ×?נת ×?×?×?ר×?×? ×?ת ×?×?×?רס×? ×?×?×?ר×?× ×?."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2084,9 +2084,25 @@ 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."
+msgstr "×?×? ×?×? שנש×?×? ×?ר×? ×?×?×?×?ר ×?×? ×?×?×?×? ×?×?×?×?ת ×?×?×?×? ×?×?עק×?. ×?× ×? ×?×?×?ק ×?ת ק×?נפ×?×?×?רצ×?×?ת ×?ת×?×?× ×?×?ת ש×?×? ×?×?שת×?ש ×?פר×?×?×?ק×?×?×?×? ×?×?צפנ×?×?, ×?×?×?×? SSL, ×?×? ×?ת×?פשר."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(×?ת×?×? (Telnet"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(×?נר×?×? ×?ק×?×? ×?×?×?×?×?×?)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"×?×? ×?×? שנש×?×? ×?ר×? ×?×?×?×?ר ×?×? ×?×?×?×? ×?×?×?×?ת ×?×?×?×? ×?×?עק×?. ×?× ×? ×?×?×?ק ×?ת ק×?נפ×?×?×?רצ×?×?ת "
-"×?ת×?×?× ×?×?ת ש×?×? ×?×?שת×?ש ×?פר×?×?×?ק×?×?×?×? ×?×?צפנ×?×?, ×?×?×?×? SSL, ×?×? ×?ת×?פשר."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2096,12 +2112,21 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
+msgstr "×?×?×?×?ר ש×?×? ×?×?×?×?×? ×?עת.\n×?×?×¥ \"עצ×?ר\" ×¢×? ×?נת ×?עצ×?ר ×?×?ת×? ×?×?×?×?×?ת."
+
+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 ""
-"×?×?×?×?ר ש×?×? ×?×?×?×?×? ×?עת.\n"
-"×?×?×¥ \"עצ×?ר\" ×¢×? ×?נת ×?עצ×?ר ×?×?ת×? ×?×?×?×?×?ת."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2109,34 +2134,14 @@ msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
 "Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"×?ת×? ×?ר×?×¥ ×?עת ×?×?סר. עצ×?רת ×?×?×?סר ×?פ×?×¢ ×?תקש×?רת ש×? ק×?×?×?× ×?×?×? ×?ר×?×?.\n"
-"\n"
-"×?×?×? ×?רצ×?× ×? ×?עצ×?ר ×?ת ×?×?×?סר ×?×?×?ר×?×?, ×?×?×?פשר ×?ק×?×?×?× ×?×?×? ×?×?תר נת×?×? ש×?× ×??"
+msgstr "×?ת×? ×?ר×?×¥ ×?עת ×?×?סר. עצ×?רת ×?×?×?סר ×?פ×?×¢ ×?תקש×?רת ש×? ק×?×?×?× ×?×?×? ×?ר×?×?.\n\n×?×?×? ×?רצ×?× ×? ×?עצ×?ר ×?ת ×?×?×?סר ×?×?×?ר×?×?, ×?×?×?פשר ×?ק×?×?×?× ×?×?×? ×?×?תר נת×?×? ש×?× ×??"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia ×?×?×?×? ×?×? ת×?×?נת Tor נעצר×? ×?×?×?פ×? פת×?×?×?×?.\n"
-"\n"
-"×?× ×? ×?×?×?ק ×?ת ×?ר×?×?×?×? ×?×?×?×?×¢×?ת ×?×?×?×?×¢ × ×?סף."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(×?ת×?×? (Telnet"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(×?נר×?×? ×?ק×?×? ×?×?×?×?×?×?)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Vidalia ×?×?×?×? ×?×? ת×?×?נת Tor נעצר×? ×?×?×?פ×? פת×?×?×?×?.\n\n×?× ×? ×?×?×?ק ×?ת ×?ר×?×?×?×? ×?×?×?×?×¢×?ת ×?×?×?×?×¢ × ×?סף."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2410,17 +2415,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"×?×?×?×¢×?ת ×?×?×?פ×?×¢×?ת ×?×?שר ×?ש×?×?\n"
-"×?שת×?ש ×?×?×?×? ×?-Tor ×?×? ×?×?×?×? ×?×?×?ש×?×?."
+msgstr "×?×?×?×¢×?ת ×?×?×?פ×?×¢×?ת ×?×?שר ×?ש×?×?\n×?שת×?ש ×?×?×?×? ×?-Tor ×?×? ×?×?×?×? ×?×?×?ש×?×?."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"×?×?×?×¢×?ת ×?×?×?פ×?×¢×?ת ×?×?שר ×?ש×?×?\n"
-"×?שת×?ש ×?-Tor."
+msgstr "×?×?×?×¢×?ת ×?×?×?פ×?×¢×?ת ×?×?שר ×?ש×?×?\n×?שת×?ש ×?-Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2428,11 +2429,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"×?×?×?×¢×?ת ×?×?×?פ×?×¢×?ת ×?×¢×?ת×?×? ר×?×?ק×?ת\n"
-"×?×?×?×?×? פע×?×?×?ת ר×?×?×?×? ש×? Tor\n"
-"×?×?×?× ×? × ×?ש×?×?ת ×?תק×?×?ת, ×?×? ×?ת×?×?\n"
-"ש×?×¢× ×?×?× ×? ×?×?ת×?."
+msgstr "×?×?×?×¢×?ת ×?×?×?פ×?×¢×?ת ×?×¢×?ת×?×? ר×?×?ק×?ת\n×?×?×?×?×? פע×?×?×?ת ר×?×?×?×? ש×? Tor\n×?×?×?× ×? × ×?ש×?×?ת ×?תק×?×?ת, ×?×? ×?ת×?×?\nש×?×¢× ×?×?× ×? ×?×?ת×?."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2451,10 +2448,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"×?×? ×?×?×?×? ×?×?ת×?×? ×?ת ×?ק×?×?×¥ %1\n"
-"\n"
-"%2."
+msgstr "×?×? ×?×?×?×? ×?×?ת×?×? ×?ת ×?ק×?×?×¥ %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2561,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "×?שר ×?×? תק×?×?"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "×?×?×?×? ×?×?שר ×?נת×?×? ×?×?× ×? תק×?×?."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "×?עתק (Ctrl+C)"
 
@@ -2576,9 +2562,7 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"×¢×?×?×? ×?צ×?×?×? ×?ת×?×?ת IP ×?×? ש×? ×?×?ספר פ×?ר×? ×¢×? ×?נת ×?×?×?×?×?ר ×?ת Tor ×?ש×?×?×?ש ×?שרת "
-"פר×?קס×?."
+msgstr "×¢×?×?×? ×?צ×?×?×? ×?ת×?×?ת IP ×?×? ש×? ×?×?ספר פ×?ר×? ×¢×? ×?נת ×?×?×?×?×?ר ×?ת Tor ×?ש×?×?×?ש ×?שרת פר×?קס×?."
 
 msgctxt "NetworkPage"
 msgid ""
@@ -2676,9 +2660,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"×?שר×?×? ×?×?ש×?×? ×?×?× ×? ×?×?×?× ×?×? ×?עת. ×?ת×? ×?×?×?×? ×?×?×?×?ת ×?×?נס×?ת ש×?×?, ×?×? ×?נס×?ת ×?ר×? ×?×?רת "
-"×?×?×?ת×?ר ×?שר×?×? ×?×?ש×?×?."
+msgstr "×?שר×?×? ×?×?ש×?×? ×?×?× ×? ×?×?×?× ×?×? ×?עת. ×?ת×? ×?×?×?×? ×?×?×?×?ת ×?×?נס×?ת ש×?×?, ×?×? ×?נס×?ת ×?ר×? ×?×?רת ×?×?×?ת×?ר ×?שר×?×? ×?×?ש×?×?."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2705,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "ק×?×?"
@@ -2868,8 +2850,7 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"×?×?×?רת ×?ת Tor ×?ש×?ש ×?×?שר ×?×?שת×?ש×?×? ×?צ×?× ×?ר×?×?, ×?×?×? ×?×?רסת Tor ש×?×? ×?×? ת×?×?×?ת ×?×?שר×?×?."
+msgstr "×?×?×?רת ×?ת Tor ×?ש×?ש ×?×?שר ×?×?שת×?ש×?×? ×?צ×?× ×?ר×?×?, ×?×?×? ×?×?רסת Tor ש×?×? ×?×? ת×?×?×?ת ×?×?שר×?×?."
 
 msgctxt "ServerPage"
 msgid ""
@@ -2890,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "×?פע×? ×?×?ק×?×? ×?×?×?×?"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "×?×¢×?ר ×?×?×?×¢ ×¢×?×?ר רשת Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "פ×?ר×? ×?×?×?סר:"
 
@@ -2945,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"×?×?×?×?×?ר×? ×?×?× ×?רנ×? ×¢×? קצ×? ×?×?ר×?×? ×?×?×?ר ×?×?×? קצ×? ×?×¢×?×?×? ×?×?×?×?, ×?× ×? ×?×?נס ×?ת קצ×? ×?×?×¢×?×?×?"
-" ש×?×? ×?×?×?."
+msgstr "×?×?×?×?×?ר×? ×?×?× ×?רנ×? ×¢×? קצ×? ×?×?ר×?×? ×?×?×?ר ×?×?×? קצ×? ×?×¢×?×?×? ×?×?×?×?, ×?× ×? ×?×?נס ×?ת קצ×? ×?×?×¢×?×?×? ש×?×? ×?×?×?."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3005,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"ר×?×?×? ×?פס ×?×?×?ר×?×? ×?×?×?×? ×?×?×?×?ת ×?×?×?×? ×?×? ש×?×?×? ×?ר×?×?×? ×?פס ×?×?×?×?צע. ×¢×? שנ×? ×?ער×?×?×? "
-"×?×?×?×?צ ×?פ×?×?ת 20 KB/s."
+msgstr "ר×?×?×? ×?פס ×?×?×?ר×?×? ×?×?×?×? ×?×?×?×?ת ×?×?×?×? ×?×? ש×?×?×? ×?ר×?×?×? ×?פס ×?×?×?×?צע. ×¢×? שנ×? ×?ער×?×?×? ×?×?×?×?צ ×?פ×?×?ת 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3039,9 +3012,7 @@ msgstr "ש×?ר×?ת×?×? × ×?ספ×?×?"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"פ×?ר×?×?×? 706, 1863, 5050, 5190, 5222, 8300 ×? 8888 {706, 1863, 5050, 5190, "
-"5222, 5223, 8300 ?}"
+msgstr "פ×?ר×?×?×? 706, 1863, 5050, 5190, 5222, 8300 ×? 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3076,8 +3047,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor ×¢×?×?×?×? ×?×?ס×?×? ×?צ×?×?×? ש×? ×?×?×?\"×? ×?ש×?ת×?×£ ק×?צ×?×? ×¢×? ×?נת ×?×?× ×?×¢ ספ×?×? ×?פש×?×¢×? ×?×?רת."
+msgstr "Tor ×¢×?×?×?×? ×?×?ס×?×? ×?צ×?×?×? ש×? ×?×?×?\"×? ×?ש×?ת×?×£ ק×?צ×?×? ×¢×? ×?נת ×?×?× ×?×¢ ספ×?×? ×?פש×?×¢×? ×?×?רת."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3108,8 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"×?ש×?ר ×?ת ×?×?×?סר ש×?×? פ×?×¢×?, ×?×? ש×?שת×?ש×?×? ×?×?×?×?×? ×?×?צ×?×? ×?×?×?שת×?ש ×?×? ×?×?×?תר ק×?×?ת."
+msgstr "×?ש×?ר ×?ת ×?×?×?סר ש×?×? פ×?×¢×?, ×?×? ש×?שת×?ש×?×? ×?×?×?×?×? ×?×?צ×?×? ×?×?×?שת×?ש ×?×? ×?×?×?תר ק×?×?ת."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3123,8 +3092,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor ×?×?×?×?ר תש×?×?×? ש×?×?× ×? ×?×?×?ר×?נת ×?×?שר Vidalia ×?×?קש×? ×?ת ×?×?ס×?×?ר×?ת ×?ש×?×?×?ש ×?×?שר."
+msgstr "Tor ×?×?×?×?ר תש×?×?×? ש×?×?× ×? ×?×?×?ר×?נת ×?×?שר Vidalia ×?×?קש×? ×?ת ×?×?ס×?×?ר×?ת ×?ש×?×?×?ש ×?×?שר."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3147,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "×?שת×?ש ×?×?ר×?×? ×¢×?×?ר ת×?ק×?×?ת ×?×?×?סר"
 
@@ -3154,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"×?ת×?×?ת ×?×?×?\"×? ×?×? ×?ת×? ×?×?×?×? ×?×?קר×? ×?×? ×?×?×?×? צ×?ר×? ×?×?צ×?ר ×?×?ת×? קשר ×?×?×?×? ×?×?×?סר. ×?ת×? "
-"×?×?×?×? ×?×? ×?×?×?×?×?×? ×?ת ×?×?×?עת ×?×?צ×?×¢ ש×? ×?פת×? PGP ×?×? GPG ש×?×?."
+msgstr "×?ת×?×?ת ×?×?×?\"×? ×?×? ×?ת×? ×?×?×?×? ×?×?קר×? ×?×? ×?×?×?×? צ×?ר×? ×?×?צ×?ר ×?×?ת×? קשר ×?×?×?×? ×?×?×?סר. ×?ת×? ×?×?×?×? ×?×? ×?×?×?×?×?×? ×?ת ×?×?×?עת ×?×?צ×?×¢ ש×? ×?פת×? PGP ×?×? GPG ש×?×?."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3166,9 +3140,7 @@ 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 ""
-"×?× ×? ×?×?×?ר ×?פ×?×?ת ת×?ק×?×?ת ש×?ר×?ת ×?פ×?ר×? ×?×?×?ר×?×?×?×?×? ×¢×?×?ר ×?×? ש×?ר×?ת ש×?ת×? ×?×¢×?× ×?×?×? "
-"ש×?ש×?ר. ×?×?ק ×?ת ×?×?×?ר×?×?."
+msgstr "×?× ×? ×?×?×?ר ×?פ×?×?ת ת×?ק×?×?ת ש×?ר×?ת ×?פ×?ר×? ×?×?×?ר×?×?×?×?×? ×¢×?×?ר ×?×? ש×?ר×?ת ש×?ת×? ×?×¢×?× ×?×?×? ש×?ש×?ר. ×?×?ק ×?ת ×?×?×?ר×?×?."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3842,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"ת×?×?×?×? ×?×?ר ש×? Vidalia פע×?×?. ×?×? ×?×?×? ת×?×?×?×? פע×?×? ×?×?ר ש×? Vidalia,×?ת×? ×?×?×?×? ×?×?×?×?ר ×?×?×?ש×?×? ×?×?×? ×?קר×?.\n"
-"\n"
-"×?×?×? ×?רצ×?× ×? ×?×?×?ש×?×? ×?×?פע×?×? ×?ת Vidalia?"
+msgstr "ת×?×?×?×? ×?×?ר ש×? Vidalia פע×?×?. ×?×? ×?×?×? ת×?×?×?×? פע×?×? ×?×?ר ש×? Vidalia,×?ת×? ×?×?×?×? ×?×?×?×?ר ×?×?×?ש×?×? ×?×?×? ×?קר×?.\n\n×?×?×? ×?רצ×?× ×? ×?×?×?ש×?×? ×?×?פע×?×? ×?ת Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3878,5 +3847,3 @@ msgstr "%1 שע×?ת"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 ×?ק×?ת"
-
-
diff --git a/src/vidalia/i18n/po/hi/qt_hi.po b/src/vidalia/i18n/po/hi/qt_hi.po
index 9e761e3..8ca424b 100644
--- a/src/vidalia/i18n/po/hi/qt_hi.po
+++ b/src/vidalia/i18n/po/hi/qt_hi.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/hi/vidalia_hi.po b/src/vidalia/i18n/po/hi/vidalia_hi.po
index 69a19f6..7e5a5c5 100644
--- a/src/vidalia/i18n/po/hi/vidalia_hi.po
+++ b/src/vidalia/i18n/po/hi/vidalia_hi.po
@@ -1,12 +1,14 @@
 # 
+# Translators:
+#   <mayurchanakya@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: mayurchanakya <mayurchanakya@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +27,11 @@ msgstr "ला�स��स"
 
 msgctxt "AboutDialog"
 msgid "Vidalia 0.2.0"
-msgstr ""
+msgstr "विडालिया 0.2.0"
 
 msgctxt "AboutDialog"
 msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "��र 0.2.0.32 "
 
 msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
@@ -42,7 +44,7 @@ msgstr "'% १' IP पता मन�य नहि ह� ।"
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
+msgstr "�पन� 'पासवर�ड' प�रमाण��रण �ा �यन �िया ह�, ल��िन पासवर�ड निर�दिष�� नह�� �िया."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -122,7 +124,7 @@ msgstr "�प�ि स�र�पण स��ि�ा �� लिय� 
 
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr ""
+msgstr "ब�रा��़ "
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
@@ -193,11 +195,22 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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 ""
+msgstr "विडालिया ��र स�वा �� ह�ान� म�� �समर�थ था. �प�� �स� स�वय� ह�ान� �� �वश�य�ता ह� स�त� ह�."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -209,7 +222,7 @@ msgstr "व�डाल�या म� प�रय���त ह�न� 
 
 msgctxt "AppearancePage"
 msgid "Style"
-msgstr ""
+msgstr "श�ल�"
 
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
@@ -219,13 +232,30 @@ 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 ""
+msgstr "पश��ात"
 
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
-msgstr ""
+msgstr "स��ि���स ��पा��"
 
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
@@ -241,11 +271,11 @@ msgstr "प�न�स�थाप"
 
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
-msgstr ""
+msgstr "�ान�ार� भ���� �ान� �ा दर "
 
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
-msgstr ""
+msgstr "�ान�ार� प�राप�त  �ा दर"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
@@ -305,7 +335,7 @@ msgstr ""
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
-msgstr ""
+msgstr "द�श"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
@@ -333,7 +363,7 @@ msgstr "��ल�"
 
 msgctxt "Circuit"
 msgid "Building"
-msgstr ""
+msgstr "�मारत"
 
 msgctxt "Circuit"
 msgid "Failed"
@@ -393,11 +423,11 @@ msgstr ""
 
 msgctxt "ConfigDialog"
 msgid "Advanced"
-msgstr ""
+msgstr "�न�नत"
 
 msgctxt "ConfigDialog"
 msgid "Help"
-msgstr ""
+msgstr "मदद"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
@@ -417,7 +447,7 @@ msgstr ""
 
 msgctxt "ConfigDialog"
 msgid "Settings"
-msgstr ""
+msgstr "स��ि���स"
 
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
@@ -429,11 +459,11 @@ msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
-msgstr ""
+msgstr "पासवर�ड �वश�य�"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Remember my password"
-msgstr ""
+msgstr "म�रा पासवर�ड याद र���"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
@@ -459,143 +489,143 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
-msgstr ""
+msgstr "�फ़�़ानिस�तान"
 
 msgctxt "CountryInfo"
 msgid "Andorra"
-msgstr ""
+msgstr "��ड�रा"
 
 msgctxt "CountryInfo"
 msgid "Angola"
-msgstr ""
+msgstr "����ला"
 
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "������� �र बारब�डा"
 
 msgctxt "CountryInfo"
 msgid "Argentina"
-msgstr ""
+msgstr "�र������ना"
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "�र�म�नि�"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "�स���र�लिया"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "��़रब��ान"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "बहमास"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "बा���लाद�श"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "बारबाड�स"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "ब�लार�स"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "ब�ल��ियम"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "ब�ल��़"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "भ��ान"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "ब�ल�विया"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "ब�स�निया �र हर��़���विना"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "ब�त�सवाना"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "ब�रा�़िल"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "ब�र�न�� दार�सलाम"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "ब�ल��ारिया"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "ब�र��िना फास�"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "ब�स�र�न�द�"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "��ब�डिया"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "��मर�न"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "�नाडा"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "��प वर�ड"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "मध�य �फ�र��� �णरा��य"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "�ाड"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "�िल�"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "��न"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "��ल�बिया"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "��म�र��़"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "�ा���, ल��ता�त�रि� �णरा��य"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "�ा���"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
@@ -603,103 +633,103 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "���� डा  ��वर"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "��र��शिया"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "��य�बा"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "सायप�रस"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "��� �णरा��य"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "ड�नमार��"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "�िब���"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "ड�मिनि�ा"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "ड�मिनि� �णरा��य"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "���व�ड�र"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "मिस�र"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "�ल सल�वाड�र"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "���व���रियल �िन�"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "�र���रिया"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "�स�त�निया"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "फ�रा�स"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "��बन"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "�ाम�बिया"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "��र��िया"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr ""
+msgstr "�र�मन�"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr ""
+msgstr "�ाना"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
-msgstr ""
+msgstr "��र�न�डा"
 
 msgctxt "CountryInfo"
 msgid "Guatemala"
-msgstr ""
+msgstr "��वा��माला"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr ""
+msgstr "�िन�"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "�िन�न� - बिसा�"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
@@ -707,451 +737,451 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Hong Kong"
-msgstr ""
+msgstr "हा�� �ा��"
 
 msgctxt "CountryInfo"
 msgid "Haiti"
-msgstr ""
+msgstr "ह�त�"
 
 msgctxt "CountryInfo"
 msgid "Honduras"
-msgstr ""
+msgstr "ह��ड�रस"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr ""
+msgstr "��रा�ल"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr ""
+msgstr "��ल�"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr ""
+msgstr "�म��ा"
 
 msgctxt "CountryInfo"
 msgid "Japan"
-msgstr ""
+msgstr "�ापान"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr ""
+msgstr "��र�डन"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr ""
+msgstr "��ा�स�तान"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr ""
+msgstr "��न�या"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
-msgstr ""
+msgstr "�िरबात�"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr ""
+msgstr "��व�त"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "�िर��िस�तान"
 
 msgctxt "CountryInfo"
 msgid "Laos"
-msgstr ""
+msgstr "ला�स"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr ""
+msgstr "ला�विया"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr ""
+msgstr "ल�बनान"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr ""
+msgstr "ल�स�थ�"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr ""
+msgstr "ला�ब�रिया"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr ""
+msgstr "लि���स���न"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr ""
+msgstr "लिथ��निया"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr ""
+msgstr "ल���़मबर��"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr ""
+msgstr "म�द�निया"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr ""
+msgstr "म�डा�ास��र"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
-msgstr ""
+msgstr "मलाव�"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr ""
+msgstr "मल�शिया"
 
 msgctxt "CountryInfo"
 msgid "Mali"
-msgstr ""
+msgstr "माल�"
 
 msgctxt "CountryInfo"
 msgid "Malta"
-msgstr ""
+msgstr "माल��ा"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr ""
+msgstr "मार�शल द�व�प"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr ""
+msgstr "म�रि�ानिया"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
-msgstr ""
+msgstr "म�रिशस"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr ""
+msgstr "मा���र�न�शिया"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
-msgstr ""
+msgstr "माल�ड�वा"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr ""
+msgstr "म�ना��"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr ""
+msgstr "म���लिया"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr ""
+msgstr "म�न�����र�"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr ""
+msgstr "म�र����"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr ""
+msgstr "म��़ाम�बि�"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr ""
+msgstr "नाम�बिया"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
-msgstr ""
+msgstr "न�र�"
 
 msgctxt "CountryInfo"
 msgid "Nepal"
-msgstr ""
+msgstr "न�पाल"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr ""
+msgstr "न�दरल��ड"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr ""
+msgstr "न�य��़�ल��ड"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr ""
+msgstr "नि�ारा���"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "ना��र"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "ना���रिया"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "न�र�व�"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "�मान"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "पा�िस�तान"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "पला�"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "पल�स��ा�न"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "पनामा"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "पाप�� न�य� �िन�"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "प�रा��व�"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "प�र�"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "फ़िलिप��स"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "प�ल��ड"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "प�र�त�ाल"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "�़तर"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "र�मानिया"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "र�स"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "रवा�डा"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "स��� �ि��स �र न�विस"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
-msgstr ""
+msgstr "स��� ल�सिया"
 
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "स��� विन�स��� �र ��र�न��ियन�स"
 
 msgctxt "CountryInfo"
 msgid "Samoa"
-msgstr ""
+msgstr "साम��"
 
 msgctxt "CountryInfo"
 msgid "San Marino"
-msgstr ""
+msgstr "स�न मारिन�"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "सा� ��म �र प�रि�सिप�"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "स�द� �रब"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
-msgstr ""
+msgstr "स�न��ल"
 
 msgctxt "CountryInfo"
 msgid "Serbia"
-msgstr ""
+msgstr "सर�बि�"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr ""
+msgstr "स�श�ल�स"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
-msgstr ""
+msgstr "सि�रा लिय�न"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr ""
+msgstr "सि��ाप�र"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr ""
+msgstr "स�ल�वा�िया"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr ""
+msgstr "स�ल�व�निया"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr ""
+msgstr "स�ल�मन ��ल��ड�स"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr ""
+msgstr "स�मालिया"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr ""
+msgstr "द��षिण �फ�र��ा"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr ""
+msgstr "स�प�न"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
-msgstr ""
+msgstr "श�र�ल��ा"
 
 msgctxt "CountryInfo"
 msgid "Sudan"
-msgstr ""
+msgstr "स�डान"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr ""
+msgstr "स�र�नाम"
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr ""
+msgstr "स�वा�़�ल��ड"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr ""
+msgstr "स�व�डन"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr ""
+msgstr "स�वि�रल��ड"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr ""
+msgstr "स�रिया"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr ""
+msgstr "ता���िस�तान"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr ""
+msgstr "त��़ानिया"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr ""
+msgstr "था�ल��ड"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "तिम�र ल�स�त� (प�र�व� तिम�र)"
 
 msgctxt "CountryInfo"
 msgid "Togo"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Tonga"
-msgstr ""
+msgstr "����ा"
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "त�रिनिदाद �व� ��ब���"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr ""
+msgstr "��य�न�शिया"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
-msgstr ""
+msgstr "�र���"
 
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
-msgstr ""
+msgstr "त�र��म�निस�तान"
 
 msgctxt "CountryInfo"
 msgid "Tuvalu"
-msgstr ""
+msgstr "�वाल�"
 
 msgctxt "CountryInfo"
 msgid "Uganda"
-msgstr ""
+msgstr "य��ा�डा"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr ""
+msgstr "य���र�न"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "स�य���त �रब �म�रात"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr ""
+msgstr "य�ना���ड �ि��डम"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr ""
+msgstr "�म�रि�ा"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
-msgstr ""
+msgstr "�र���व�"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr ""
+msgstr "��़�ब��िस�तान"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
-msgstr ""
+msgstr "वानात�"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr ""
+msgstr "पादर� सर�ार"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
-msgstr ""
+msgstr "व�न��़��ला"
 
 msgctxt "CountryInfo"
 msgid "Vietnam"
-msgstr ""
+msgstr "वियतनाम"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr ""
+msgstr "पश��िम� सहारा"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr ""
+msgstr "यमन"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr ""
+msgstr "�़ाम�बिया"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
-msgstr ""
+msgstr "�़िम�बाब�व�"
 
 msgctxt "CountryInfo"
 msgid "Zaire"
@@ -1159,99 +1189,99 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr ""
+msgstr "�ल�बानिया"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr ""
+msgstr "�ल���रिया"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr ""
+msgstr "�स���रिया"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr ""
+msgstr "बहर�न"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr ""
+msgstr "ब�निन"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr ""
+msgstr "�थिय�पिया"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
-msgstr ""
+msgstr "फि��"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr ""
+msgstr "फ़िनल��ड"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr ""
+msgstr "��र�स"
 
 msgctxt "CountryInfo"
 msgid "Guam"
-msgstr ""
+msgstr "���म"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr ""
+msgstr "ह��र�"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr ""
+msgstr "��सल��ड"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr ""
+msgstr "भारत"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr ""
+msgstr "��ड�न�शिया"
 
 msgctxt "CountryInfo"
 msgid "Iran"
-msgstr ""
+msgstr "�रान"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr ""
+msgstr "�रा�"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr ""
+msgstr "�यरल��ड"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr ""
+msgstr "�त�तर ��रिया"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr ""
+msgstr "द��षिण ��रिया"
 
 msgctxt "CountryInfo"
 msgid "Libya"
-msgstr ""
+msgstr "ल�बिया"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr ""
+msgstr "मालद�व"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr ""
+msgstr "म���सि��"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr ""
+msgstr "म�या�मार"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
-msgstr ""
+msgstr "ता�वान"
 
 msgctxt "CrashReportDialog"
 msgid "Submit a Crash Report"
@@ -1262,24 +1292,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 ""
 
@@ -1297,16 +1309,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+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..."
+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..."
+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 "GeneralPage"
@@ -1339,7 +1362,7 @@ msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Tor"
-msgstr ""
+msgstr "��"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
@@ -1363,7 +1386,7 @@ msgstr ""
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "�ा�� �र��"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
@@ -1403,7 +1426,7 @@ msgstr ""
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
-msgstr ""
+msgstr "दस�ताव��़ म�� पाठ नह�� मिला"
 
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
@@ -1415,11 +1438,11 @@ msgstr ""
 
 msgctxt "HelpBrowser"
 msgid "Back"
-msgstr ""
+msgstr "वापस"
 
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
-msgstr ""
+msgstr "पि�ल� प�ष�ठ प� �ा�� (ब��स�प�स)"
 
 msgctxt "HelpBrowser"
 msgid "Backspace"
@@ -1431,7 +1454,7 @@ msgstr ""
 
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
-msgstr ""
+msgstr "��ल� प�ष�ठ पर ल� �ा�� (शिफ�� + ब��स�प�स )"
 
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
@@ -1751,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2060,15 +2079,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2083,24 +2114,31 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2515,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2655,11 +2685,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2839,10 +2869,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3087,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3665,14 +3699,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 ""
@@ -3766,6 +3792,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 ""
 
@@ -3815,5 +3845,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/hr/qt_hr.po b/src/vidalia/i18n/po/hr/qt_hr.po
index 5f5c70e..fa5810c 100644
--- a/src/vidalia/i18n/po/hr/qt_hr.po
+++ b/src/vidalia/i18n/po/hr/qt_hr.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/hr/vidalia_hr.po b/src/vidalia/i18n/po/hr/vidalia_hr.po
index d8a7f23..722f069 100755
--- a/src/vidalia/i18n/po/hr/vidalia_hr.po
+++ b/src/vidalia/i18n/po/hr/vidalia_hr.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ht/qt_ht.po b/src/vidalia/i18n/po/ht/qt_ht.po
index 6de105d..3dc8064 100644
--- a/src/vidalia/i18n/po/ht/qt_ht.po
+++ b/src/vidalia/i18n/po/ht/qt_ht.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ht/vidalia_ht.po b/src/vidalia/i18n/po/ht/vidalia_ht.po
index 32e3898..741370e 100644
--- a/src/vidalia/i18n/po/ht/vidalia_ht.po
+++ b/src/vidalia/i18n/po/ht/vidalia_ht.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/hu/qt_hu.po b/src/vidalia/i18n/po/hu/qt_hu.po
index 24dbe22..2c5d775 100644
--- a/src/vidalia/i18n/po/hu/qt_hu.po
+++ b/src/vidalia/i18n/po/hu/qt_hu.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #   <viktor.varga@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-07-17 21:47+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 már létezik.\n"
-"Szeretné felülírni?"
+msgstr "%1 már létezik.\nSzeretné felülírni?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Fájl nem található.\n"
-"Kérjük ellenÅ?rizze, hogy helyes fájlnevet adott-e meg."
+msgstr "%1\nFájl nem található.\nKérjük ellenÅ?rizze, hogy helyes fájlnevet adott-e meg."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Könyvtár nem található.\n"
-"Kérjük ellenÅ?rizze, hogy helyes könyvtárnevet adott-e meg."
+msgstr "%1\nKönyvtár nem található.\nKérjük ellenÅ?rizze, hogy helyes könyvtárnevet adott-e meg."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' írásvédett.\n"
-"Biztos hogy ennek ellenére törölni akarja?"
+msgstr "'%1' írásvédett.\nBiztos hogy ennek ellenére törölni akarja?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>A \"%1\" név nem használható.</b><p>Próbálja kevesebb karakterrel, vagy "
-"speciális karakterek nélkül."
+msgstr "<b>A \"%1\" név nem használható.</b><p>Próbálja kevesebb karakterrel, vagy speciális karakterek nélkül."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bájt"
-
-
diff --git a/src/vidalia/i18n/po/hu/vidalia_hu.po b/src/vidalia/i18n/po/hu/vidalia_hu.po
index 1405efc..d6de25d 100644
--- a/src/vidalia/i18n/po/hu/vidalia_hu.po
+++ b/src/vidalia/i18n/po/hu/vidalia_hu.po
@@ -1,13 +1,13 @@
 # 
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
-#   <viktor.varga@xxxxxxxxx>, 2011.
+#   <viktor.varga@xxxxxxxxx>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-15 12:37+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-06 09:28+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -170,17 +170,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"A megadott Tor konfigurációs fájl helye olyan karakteret tartalmaz, amely "
-"nem értelmezhetÅ? a rendszer aktuális 8-bites karakter kódolásával."
+msgstr "A megadott Tor konfigurációs fájl helye olyan karakteret tartalmaz, amely nem értelmezhetÅ? a rendszer aktuális 8-bites karakter kódolásával."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"A megadott Tor adatkönyvtár neve olyan karakteret tartalmaz, amely nem "
-"értelmezhetÅ? a rendszer aktuális 8-bites karakter kódolásával."
+msgstr "A megadott Tor adatkönyvtár neve olyan karakteret tartalmaz, amely nem értelmezhetÅ? a rendszer aktuális 8-bites karakter kódolásával."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -204,13 +200,17 @@ msgstr "VezérlÅ?port automatikus konfigurálása"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Bekapcsolta az automatikus beállítását a VezérlÅ?portnak, de nem adott meg Adat könyvtárat.Kérem adjon meg egyet, vagy kapcsolja ki a \"A vezérlÅ?port automatikus beállítása\" opciót."
+
+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"
-"\n"
-"Kézzel kell majd eltávolítania."
+msgstr "Vidalia nem tudta eltávolítani a Tor szolgáltatást.\n\nKézzel kell majd eltávolítania."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -232,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Nem sikerült a választott nyelvi fordítás betöltése."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "Rendszer ikon beállítások (a Vidalia újraindításával változnak)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "A Tálca és Dokkoló ikonok megjelenítése (alapértelmezett)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Tálca ikon elrejtése"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Dokkoló ikon elrejtése"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Ekkortól:"
@@ -452,9 +469,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"A Vidalia olyan Tor folyamathoz kapcsolódott, amely jelszót kér. Kérjük adja"
-" meg a vezérlÅ? jelszót:"
+msgstr "A Vidalia olyan Tor folyamathoz kapcsolódott, amely jelszót kér. Kérjük adja meg a vezérlÅ? jelszót:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1292,9 +1307,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Nem sikerült automatikusan újraindítani a Vidalia-t. Kérjük indítsa el "
-"kézzel."
+msgstr "Nem sikerült automatikusan újraindítani a Vidalia-t. Kérjük indítsa el kézzel."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1304,27 +1317,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Egy összeomlási jelentés jött létre, amit elküldhet a Vidalia fejlesztÅ?inek,"
-" hogy segítse a hiba megkeresését és javítását. Az elküldött hibajelentés "
-"személyazonosításra alkalmas adatot nem tartalmaz."
+msgstr "Egy összeomlási jelentés jött létre, amit elküldhet a Vidalia fejlesztÅ?inek, hogy segítse a hiba megkeresését és javítását. Az elküldött hibajelentés személyazonosításra alkalmas adatot nem tartalmaz."
 
 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 ""
-"egy leírással, hogy mit csinált mielÅ?tt az alkalmazás összeomlott, és az "
-"alábbi fájlokkal, amelyek az összeomlási jelentéshez  kapcsolódnak:"
+msgstr "egy leírással, hogy mit csinált mielÅ?tt az alkalmazás összeomlott, és az alábbi fájlokkal, amelyek az összeomlási jelentéshez  kapcsolódnak:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1543,16 +1549,11 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészÅ?ben."
-" Ha a böngészÅ? nincs jelenleg a Tor használatára beállítva, a kapcsolat nem "
-"lesz anonim."
+msgstr "A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészÅ?ben. Ha a böngészÅ? nincs jelenleg a Tor használatára beállítva, a kapcsolat nem lesz anonim."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-"Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett "
-"böngészÅ?ben?"
+msgstr "Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett böngészÅ?ben?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
@@ -1562,10 +1563,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészÅ?ben. "
-"Próbálja meg másolni és beilleszteni a a hivatkozást és <b>Beilleszt</b>eni "
-"a böngészõ URL sávjába."
+msgstr "A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészÅ?ben. Próbálja meg másolni és beilleszteni a a hivatkozást és <b>Beilleszt</b>eni a böngészõ URL sávjába."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1776,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Kapcsolódva a Tor hálózathoz! "
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Felismerhetetlen indítási státusz"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "egyebek"
 
@@ -1847,9 +1841,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"A Vidalia nem tudta elindítani a Tor-t. EllenÅ?rizze a beállításait, hogy jól"
-" van-e megadva a Tor indítófájl neve és elérési útja."
+msgstr "A Vidalia nem tudta elindítani a Tor-t. EllenÅ?rizze a beállításait, hogy jól van-e megadva a Tor indítófájl neve és elérési útja."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1887,9 +1879,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"A Tor a Vidalia-tól egy bejelentkezÅ? süti elküldését kéri, de a Vidalia nem "
-"találja."
+msgstr "A Tor a Vidalia-tól egy bejelentkezÅ? süti elküldését kéri, de a Vidalia nem találja."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1911,9 +1901,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Nem sikerült a Vidalia-t kifogástalanul elindítani, ezért bizonyos funkciói "
-"várhatóan nem fognak rendeltetésszerűen működni."
+msgstr "Nem sikerült a Vidalia-t kifogástalanul elindítani, ezért bizonyos funkciói várhatóan nem fognak rendeltetésszerűen működni."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1935,9 +1923,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"A Tor jelenleg telepített régi vagy már nem ajánlott. Látogasson el a Tor "
-"weboldalára a legfrissebb verzióért."
+msgstr "A Tor jelenleg telepített régi vagy már nem ajánlott. Látogasson el a Tor weboldalára a legfrissebb verzióért."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1947,8 +1933,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Minden késÅ?bbi kapcsolat a régi kapcsolataitól különbözÅ?ként fog szerepelni."
+msgstr "Minden késÅ?bbi kapcsolat a régi kapcsolataitól különbözÅ?ként fog szerepelni."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1960,8 +1945,7 @@ msgstr "Port továbbítás sikertelen"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"A Vidalia-nak nem sikerült beállítania az automatikus port továbbítást."
+msgstr "A Vidalia-nak nem sikerült beállítania az automatikus port továbbítást."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
@@ -2044,10 +2028,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"A Vidalia megpróbálta visszaállítani a Tor kontroll-jelszót, de nem tudta a "
-"Tor-t újraindítani. EllenÅ?rizze a FeladatkezelÅ?ben, hogy nem fut-e másik Tor"
-" példány."
+msgstr "A Vidalia megpróbálta visszaállítani a Tor kontroll-jelszót, de nem tudta a Tor-t újraindítani. EllenÅ?rizze a FeladatkezelÅ?ben, hogy nem fut-e másik Tor példány."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2068,8 +2049,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"A Tor automatikusan lezárta a kapcsolatot az anonimitása védelme érdekében."
+msgstr "A Tor automatikusan lezárta a kapcsolatot az anonimitása védelme érdekében."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2102,10 +2082,25 @@ 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."
-msgstr ""
-"Bármi ami ezen a kapcsolaton keresztül megy ki nyomon követhetÅ?. EllenÅ?rizze"
-" az alkalmazás beállításait, és csak titkosított kapcsolatot használjon, "
-"például SSL-t ha lehetséges."
+msgstr "Bármi ami ezen a kapcsolaton keresztül megy ki nyomon követhetÅ?. EllenÅ?rizze az alkalmazás beállításait, és csak titkosított kapcsolatot használjon, például SSL-t ha lehetséges."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "RendszertÅ?ltÅ? torrc a %1 -tÅ?l %2 -ig"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(valószínűleg Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(valószínűleg egy email kliens)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Az alkalmazásai egyike %1 úgy tűnik, hogy egy pontenciálisan titkosítatlan és nem biztonságos kapcsolatot próbál létrehozni a a %2 porton keresztül."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2115,49 +2110,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Az Elosztó leáll.\n"
-"Kattintson újra 'Stop'-ra az azonnali leállításhoz."
+msgstr "Az Elosztó leáll.\nKattintson újra 'Stop'-ra az azonnali leállításhoz."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "RendszertÅ?ltÅ? torrc a %1 -tÅ?l %2 -ig"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "A Vidalia nem tudja kideríteni, hogyan kommunikáljon a Tor-ral, mert nem fér hozzá ehhez a fájlhoz: %1\n\nAz utolsó hibaüzenet:\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 "�gy tűnik, a Tor leállt, mióta a Vidalia el lett indítva.\n\nTekintse meg a Részletes rendszernaplót a további információkért."
 
 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?"
-msgstr ""
-"Jelenleg Elosztót futtat. Az Elosztó leállítása megszakítja a többi használó kapcsolatát.\n"
-"\n"
-"Szeretné szépen leállítani, és ezzel idÅ?t adni a többi használónak, hogy új elosztót találjanak??"
+msgstr "Jelenleg Elosztót futtat. Az Elosztó leállítása megszakítja a többi használó kapcsolatát.\n\nSzeretné szépen leállítani, és ezzel idÅ?t adni a többi használónak, hogy új elosztót találjanak??"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"A Vidalia a Tor szoftver váratlan kilépését észlelte..\n"
-"\n"
-"Kérjük tekintse meg a log üzeneteket az aktuális hibaüzenetekért."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(valószínűleg Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(valószínűleg egy email kliens)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Az alkalmazásai egyike %1 úgy tűnik, hogy egy pontenciálisan titkosítatlan "
-"és nem biztonságos kapcsolatot próbál létrehozni a a %2 porton keresztül."
+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 "MessageLog"
 msgid "Error Setting Filter"
@@ -2431,16 +2413,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"�zenetek, amik akkor jelentek meg, amikor valami nagyon nem volt jó, és a "
-"Tor nem tudott működni."
+msgstr "�zenetek, amik akkor jelentek meg, amikor valami nagyon nem volt jó, és a Tor nem tudott működni."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Ã?zenetek, amik akkor jelentek meg, amikor valamivel gond volt a Tor-ra."
+msgstr "Ã?zenetek, amik akkor jelentek meg, amikor valamivel gond volt a Tor-ra."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2448,9 +2427,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"�zenetek, amik néha-néha megjelennek normális Tor használatnál, és nem "
-"hibák, de talán érdemes odafigyelni rájuk."
+msgstr "�zenetek, amik néha-néha megjelennek normális Tor használatnál, és nem hibák, de talán érdemes odafigyelni rájuk."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2469,10 +2446,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Nem írható az állomány: %1\n"
-"\n"
-"%2."
+msgstr "Nem írható az állomány: %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2579,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "�rvénytelen Hídkapcsolat"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A megadott Hídkapcsolat azonosító érvénytelen."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Másolás (Ctrl+C)"
 
@@ -2594,17 +2560,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Meg kell adnia egy IP címet, vagy egy gépnevet (host) és egy portot , ahhoz,"
-" hogy a Tor ezen a proxy-n keresztül kapcsolódjon az Internethez."
+msgstr "Meg kell adnia egy IP címet, vagy egy gépnevet (host) és egy portot , ahhoz, hogy a Tor ezen a proxy-n keresztül kapcsolódjon az Internethez."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) "
-"vannak a tűzfalon."
+msgstr "Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) vannak a tűzfalon."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2612,9 +2574,7 @@ msgstr "A következÅ? port érvénytelen: '%1'"
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez való "
-"kapcsolódáshoz"
+msgstr "Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez való kapcsolódáshoz"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2638,9 +2598,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tűzfalam nyitott "
-"portjaira vannak konfigurálva"
+msgstr "Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tűzfalam nyitott portjaira vannak konfigurálva"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2662,9 +2620,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Címtár lekérdezések titkosítása és opcionálisan, Hídkapcsolatok használata a"
-" TOR-hoz való kapcsolódáshoz"
+msgstr "Címtár lekérdezések titkosítása és opcionálisan, Hídkapcsolatok használata a TOR-hoz való kapcsolódáshoz"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2702,15 +2658,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Nincs új hídkapcsolat elérhetÅ?. Várhat egy kicsit és megpróbálhatja késÅ?bb, "
-"vagy kereshet egy másik megoldást a hídkapcsolatok keresésére."
+msgstr "Nincs új hídkapcsolat elérhetÅ?. Várhat egy kicsit és megpróbálhatja késÅ?bb, vagy kereshet egy másik megoldást a hídkapcsolatok keresésére."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Kattintson a Súgó-ra, hogy megtudja, milyen lehetÅ?ségek vannak még a "
-"hídkapcsolatok keresésére."
+msgstr "Kattintson a Súgó-ra, hogy megtudja, milyen lehetÅ?ségek vannak még a hídkapcsolatok keresésére."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2733,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Meg kell adnia egy vagy több hidat."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "elfogad"
@@ -2896,18 +2848,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Beállította a Tor-t Hídkapcsolati Elosztóként, a korlátozott  felhasználók "
-"Tor-hoz kapcsolódásának segítéséhez, viszont ez a Tor verzió nem támogatja a"
-" Hídkapcsolati Elosztást."
+msgstr "Beállította a Tor-t Hídkapcsolati Elosztóként, a korlátozott  felhasználók Tor-hoz kapcsolódásának segítéséhez, viszont ez a Tor verzió nem támogatja a Hídkapcsolati Elosztást."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Frissítse a Tor-t vagy állítsa be hagyományos Tor Elosztóként "
-"(közvetítÅ?ként)."
+msgstr "Frissítse a Tor-t vagy állítsa be hagyományos Tor Elosztóként (közvetítÅ?ként)."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2922,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Csak kliens indítása"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "A Tor hálózat forgalmának közvetítése (Elosztás)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "KözvetítÅ? port:"
 
@@ -2963,9 +2906,7 @@ msgstr "Az Elosztó neve"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"A port, amelyen más felhasználók és Elosztók kommunikálhatnak az �n "
-"Elosztójával"
+msgstr "A port, amelyen más felhasználók és Elosztók kommunikálhatnak az �n Elosztójával"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2979,9 +2920,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Gyors letöltés, de lassú feltöltés esetén adja meg a feltöltési sebességét "
-"itt."
+msgstr "Gyors letöltés, de lassú feltöltés esetén adja meg a feltöltési sebességét itt."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3039,9 +2978,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"A maximum sávszélességnek nagyobbnak kell lennie, mint az átlagosnak, de "
-"mindkét érték minimum 20 KB/s kell legyen."
+msgstr "A maximum sávszélességnek nagyobbnak kell lennie, mint az átlagosnak, de mindkét érték minimum 20 KB/s kell legyen."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3102,17 +3039,13 @@ msgstr "Kilépési szabályokkal kapcsolatos súgó témák megjelenítése"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak az Elosztón"
-" keresztül?"
+msgstr "Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak az Elosztón keresztül?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"A Tor továbbra is blokkolni fog néhány levelezÅ? és fájlmegosztó "
-"szolgáltatást, a spam és visszaélések megfékezése érdekében."
+msgstr "A Tor továbbra is blokkolni fog néhány levelezÅ? és fájlmegosztó szolgáltatást, a spam és visszaélések megfékezése érdekében."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3120,9 +3053,7 @@ msgstr "Kilépési szabályok"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a "
-"Hídkapcsolatával a Tor hálózathoz:"
+msgstr "Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a Hídkapcsolatával a Tor hálózathoz:"
 
 msgctxt "ServerPage"
 msgid ""
@@ -3145,9 +3076,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Hagyja futni az Elosztót, így a felhasználóknak jobb esélye van észlelni és "
-"használni azt."
+msgstr "Hagyja futni az Elosztót, így a felhasználóknak jobb esélye van észlelni és használni azt."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3161,9 +3090,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"A Tor szoftver egy rosszul formázott üzenetet adott vissza, mikor a Vidalia "
-"elkérte tÅ?le a Hídkapcsolat használat elÅ?zményeit."
+msgstr "A Tor szoftver egy rosszul formázott üzenetet adott vissza, mikor a Vidalia elkérte tÅ?le a Hídkapcsolat használat elÅ?zményeit."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3171,8 +3098,7 @@ msgstr "A visszaadott válasz: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"A korlátozott felhasználók segítése a Tor hálózathoz való kapcsolódáshoz"
+msgstr "A korlátozott felhasználók segítése a Tor hálózathoz való kapcsolódáshoz"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3187,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "A Hídkapcsolati címem automatikus terjesztése"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "A forgalom Tor hálózathoz történÅ? elosztása (kilépÅ?-elosztó)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "A forgalom Tor hálózaton belüli elosztása (nem kilépÅ?-elosztó)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Az Elosztó címtár tükrözése"
 
@@ -3194,9 +3128,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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."
+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"
@@ -3206,9 +3138,7 @@ 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."
+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"
@@ -3228,9 +3158,7 @@ msgstr "A Virtuális port csak érvényes (1..65535) számokat tartalmazhat"
 
 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."
+msgstr "A cél cím a következÅ? formátumú lehet: cím:port vagy csak cím, vagy csak port."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
@@ -3305,10 +3233,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Kattintson a \"Tor indítása\" gombra a Vidalia VezérlÅ?pultban a Tor szoftver"
-" elindításához. Ha a Tor váratlanul lépett ki, akkor válassza a Speciális "
-"fület a megjelent hibák részleteinek megismeréséhez."
+msgstr "Kattintson a \"Tor indítása\" gombra a Vidalia VezérlÅ?pultban a Tor szoftver elindításához. Ha a Tor váratlanul lépett ki, akkor válassza a Speciális fület a megjelent hibák részleteinek megismeréséhez."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3316,10 +3241,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Jelenleg a Tor szoftver %1 verzióját használja, ami tovább már nem ajánlott."
-" Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és"
-" teljesítmény javításokat tartalmaz."
+msgstr "Jelenleg a Tor szoftver %1 verzióját használja, ami tovább már nem ajánlott. Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3327,10 +3249,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Jelenleg a Tor szoftver %1 verzióját használja, ami már nem működik az "
-"aktuális Tor hálózattal. Kérjük frissítse a legújabb verzióra, ami fontos "
-"biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
+msgstr "Jelenleg a Tor szoftver %1 verzióját használja, ami már nem működik az aktuális Tor hálózattal. Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3344,9 +3263,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Sikeresen csatlakoztunk a Tor hálózathoz. Most már csak az alkalmazásait "
-"kell beállítania, hogy névtelenül érje el az Internetet."
+msgstr "Sikeresen csatlakoztunk a Tor hálózathoz. Most már csak az alkalmazásait kell beállítania, hogy névtelenül érje el az Internetet."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3356,9 +3273,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"A Tor szoftver belsÅ? hibára futott. Kérjük jelezze az alább hibaüzenetet a "
-"Tor fejlesztÅ?inek a bugs.torproject.org oldalon: \"%1\"\n"
+msgstr "A Tor szoftver belsÅ? hibára futott. Kérjük jelezze az alább hibaüzenetet a Tor fejlesztÅ?inek a bugs.torproject.org oldalon: \"%1\"\n"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3366,10 +3281,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel vissza van "
-"állítva a \"%2\" idÅ?forráshoz képes. Ha az órája nem pontos, a Tor nem fog "
-"megfelelÅ?en működni. EllenÅ?rizze, hogy a számítógép a helyes idÅ?t mutatja."
+msgstr "A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel vissza van állítva a \"%2\" idÅ?forráshoz képes. Ha az órája nem pontos, a Tor nem fog megfelelÅ?en működni. EllenÅ?rizze, hogy a számítógép a helyes idÅ?t mutatja."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3377,10 +3289,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel elÅ?re van "
-"állítva a \"%2\" idÅ?forráshoz képes. Ha az órája nem pontos, a Tor nem fog "
-"megfelelÅ?en működni. EllenÅ?rizze, hogy a számítógép a helyes idÅ?t mutatja."
+msgstr "A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel elÅ?re van állítva a \"%2\" idÅ?forráshoz képes. Ha az órája nem pontos, a Tor nem fog megfelelÅ?en működni. EllenÅ?rizze, hogy a számítógép a helyes idÅ?t mutatja."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3392,21 +3301,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát "
-"létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ "
-"keresztül küldése a Tor hálózaton veszélyes és nem ajánlott. A biztonsága "
-"érdekében a Tor lezárta ezt a kapcsolatot."
+msgstr "Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ keresztül küldése a Tor hálózaton veszélyes és nem ajánlott. A biztonsága érdekében a Tor lezárta ezt a kapcsolatot."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát "
-"létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ "
-"keresztül küldése a Tor hálózaton veszélyes és nem ajánlott."
+msgstr "Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ keresztül küldése a Tor hálózaton veszélyes és nem ajánlott."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3418,11 +3320,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on a %1 "
-"irányba egy olyan protokollon keresztül, ami információt szivárogtathat az "
-"ön elérhetÅ?ségérÅ?l. EllenÅ?rizze, hogy az alkalmazása beállítása csak SOCKS4a"
-" vagy SOCKS5 protokollt használjon a távoli név feloldáshoz."
+msgstr "Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on a %1 irányba egy olyan protokollon keresztül, ami információt szivárogtathat az ön elérhetÅ?ségérÅ?l. EllenÅ?rizze, hogy az alkalmazása beállítása csak SOCKS4a vagy SOCKS5 protokollt használjon a távoli név feloldáshoz."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3433,11 +3331,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on egy "
-"olyan protokollon keresztül, amit a Tor nem tud értelmezni. EllenÅ?rizze, "
-"hogy az alkalmazása beállítása csak SOCKS4a vagy SOCKS5 protokollt "
-"használjon a távoli név feloldáshoz."
+msgstr "Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on egy olyan protokollon keresztül, amit a Tor nem tud értelmezni. EllenÅ?rizze, hogy az alkalmazása beállítása csak SOCKS4a vagy SOCKS5 protokollt használjon a távoli név feloldáshoz."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3448,10 +3342,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Az alkalmazásainak valamelyike megpróbált létrehozni egy egy kapcsolatot a "
-"Tor-on keresztül a \"%1\" címre, amit a Tor nem ismer fel érvényes host "
-"névnek. Kérjük ellenÅ?rizze az alkalmazás beállítását."
+msgstr "Az alkalmazásainak valamelyike megpróbált létrehozni egy egy kapcsolatot a Tor-on keresztül a \"%1\" címre, amit a Tor nem ismer fel érvényes host névnek. Kérjük ellenÅ?rizze az alkalmazás beállítását."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3462,10 +3353,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"A Tor azt észleltem hogy az Elosztó publikus IP címe jelenleg %1%2. Ha ez "
-"helytelen, akkor gondolkozzon el a 'Cím' beállítás használatáról az Elosztó "
-"beállításai között."
+msgstr "A Tor azt észleltem hogy az Elosztó publikus IP címe jelenleg %1%2. Ha ez helytelen, akkor gondolkozzon el a 'Cím' beállítás használatáról az Elosztó beállításai között."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3476,21 +3364,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"A Tor azt észlelte hogy a DNS szolgáltatója nem létezÅ? domainekre hamis "
-"válaszokat ad. Néhány internet szolgáltató vagy DNS szolgáltató, mint "
-"például az OpenDNS ismert arról, hogy ilyet tesz a saját reklám vagy keresÅ? "
-"oldalaik megjelenítése érdekében."
+msgstr "A Tor azt észlelte hogy a DNS szolgáltatója nem létezÅ? domainekre hamis válaszokat ad. Néhány internet szolgáltató vagy DNS szolgáltató, mint például az OpenDNS ismert arról, hogy ilyet tesz a saját reklám vagy keresÅ? oldalaik megjelenítése érdekében."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"A Tor azt észlelte hogy a DNS szolgáltatója hamis válaszokat ad jól ismert "
-"domainekre. Mivel a kliensek függnek a a pontos Tor Elosztó DNS válaszoktól,"
-" így az Elosztója nem lehet lesz KilépÅ? Elosztónak beállítva."
+msgstr "A Tor azt észlelte hogy a DNS szolgáltatója hamis válaszokat ad jól ismert domainekre. Mivel a kliensek függnek a a pontos Tor Elosztó DNS válaszoktól, így az Elosztója nem lehet lesz KilépÅ? Elosztónak beállítva."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3501,10 +3382,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"A Tor megpróbálja ellenÅ?rizni, hogy a Elosztó szerver port elérhetÅ?-e a Tor "
-"hálózatból, a %1:%2 helyre történÅ? visszacsatlakozással. A teszt lefutása "
-"néhány percet vehet igénybe."
+msgstr "A Tor megpróbálja ellenÅ?rizni, hogy a Elosztó szerver port elérhetÅ?-e a Tor hálózatból, a %1:%2 helyre történÅ? visszacsatlakozással. A teszt lefutása néhány percet vehet igénybe."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3524,11 +3402,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Az Elosztó szerver portja nem elérhetÅ? más Tor kliensek által. Ezt "
-"okozhatja, hogy tűzfal vagy router mögött található, ahol a port továbbítást"
-" be kell állítania. Ha %1:%2 nem a helyes IP címe és portja, akkor "
-"ellenÅ?rizze az Elosztó beállításait."
+msgstr "Az Elosztó szerver portja nem elérhetÅ? más Tor kliensek által. Ezt okozhatja, hogy tűzfal vagy router mögött található, ahol a port továbbítást be kell állítania. Ha %1:%2 nem a helyes IP címe és portja, akkor ellenÅ?rizze az Elosztó beállításait."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3539,10 +3413,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"A Tor megpróbálja ellenÅ?rizni, hogy a Elosztó címtár port elérhetÅ?-e a Tor "
-"hálózatból, a %1:%2 helyre történÅ? visszacsatlakozással. A teszt lefutása "
-"néhány percet vehet igénybe."
+msgstr "A Tor megpróbálja ellenÅ?rizni, hogy a Elosztó címtár port elérhetÅ?-e a Tor hálózatból, a %1:%2 helyre történÅ? visszacsatlakozással. A teszt lefutása néhány percet vehet igénybe."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3562,11 +3433,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Az Elosztó címtár portja nem elérhetÅ? más Tor kliensek által. Ezt okozhatja,"
-" hogy tűzfal vagy router mögött található, ahol a port továbbítást be kell "
-"állítania. Ha %1:%2 nem a helyes IP címe és címtár portja, akkor ellenÅ?rizze"
-" az Elosztó beállításait."
+msgstr "Az Elosztó címtár portja nem elérhetÅ? más Tor kliensek által. Ezt okozhatja, hogy tűzfal vagy router mögött található, ahol a port továbbítást be kell állítania. Ha %1:%2 nem a helyes IP címe és címtár portja, akkor ellenÅ?rizze az Elosztó beállításait."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3576,10 +3443,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Elosztó leíró amely a kliensek csatlakozását teszi lehetÅ?vé visszautasításra"
-" került a címtár a %1:%2 címen elérhetÅ? címtár szerver által. A "
-"visszautasítás oka: %3"
+msgstr "Elosztó leíró amely a kliensek csatlakozását teszi lehetÅ?vé visszautasításra került a címtár a %1:%2 címen elérhetÅ? címtár szerver által. A visszautasítás oka: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3591,11 +3455,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Az Elosztója Online és elérhetÅ? a többi kliens számára. EmelkedÅ? hálózati "
-"forgalmat kell látnia a Sávszélesség diagramon néhány órán belül, ahogy "
-"újabb kliensek szereznek tudomást az Elosztójáról. Köszönjük a "
-"hozzájárulását a Tor hálózathoz."
+msgstr "Az Elosztója Online és elérhetÅ? a többi kliens számára. EmelkedÅ? hálózati forgalmat kell látnia a Sávszélesség diagramon néhány órán belül, ahogy újabb kliensek szereznek tudomást az Elosztójáról. Köszönjük a hozzájárulását a Tor hálózathoz."
 
 msgctxt "Stream"
 msgid "New"
@@ -3657,9 +3517,7 @@ 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."
+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"
@@ -3699,9 +3557,7 @@ 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."
+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\""
@@ -3775,17 +3631,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"A Vidalia nem tudta ellenÅ?rizni az elérhetÅ? szoftver frissítéseket, mert nem"
-" találta a következÅ?t: '%1'."
+msgstr "A Vidalia nem tudta ellenÅ?rizni az elérhetÅ? szoftver frissítéseket, mert nem találta a következÅ?t: '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"A Vidalia nem tudta ellenÅ?rizni az elérhetÅ? szoftverfrissítéseket, mert a "
-"Tor frissítési folyamat nem várt módon megszakadt."
+msgstr "A Vidalia nem tudta ellenÅ?rizni az elérhetÅ? szoftverfrissítéseket, mert a Tor frissítési folyamat nem várt módon megszakadt."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3960,10 +3812,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Valószínűleg egy másik Vidalia folyamat is fut. Ha biztosan nem fut Vidalia folyamat, akkor választhatja a folytatás mindenképp lehetÅ?séget.\n"
-"\n"
-"Szeretné folyatni a Vidalia indítását?"
+msgstr "Valószínűleg egy másik Vidalia folyamat is fut. Ha biztosan nem fut Vidalia folyamat, akkor választhatja a folytatás mindenképp lehetÅ?séget.\n\nSzeretné folyatni a Vidalia indítását?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3996,5 +3845,3 @@ msgstr "%1 óra"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 perc"
-
-
diff --git a/src/vidalia/i18n/po/hy/qt_hy.po b/src/vidalia/i18n/po/hy/qt_hy.po
index 6de81fe..7231c6f 100644
--- a/src/vidalia/i18n/po/hy/qt_hy.po
+++ b/src/vidalia/i18n/po/hy/qt_hy.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/hy/vidalia_hy.po b/src/vidalia/i18n/po/hy/vidalia_hy.po
index 22b0f4e..57a8cf1 100644
--- a/src/vidalia/i18n/po/hy/vidalia_hy.po
+++ b/src/vidalia/i18n/po/hy/vidalia_hy.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/id/qt_id.po b/src/vidalia/i18n/po/id/qt_id.po
index de80115..70fc514 100644
--- a/src/vidalia/i18n/po/id/qt_id.po
+++ b/src/vidalia/i18n/po/id/qt_id.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 telah ada.\n"
-"Anda ingin menggantinya?"
+msgstr "%1 telah ada.\nAnda ingin menggantinya?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"File tidak ditemukan.\n"
-"Mohon verifikasi nama file yang diberikan."
+msgstr "%1\nFile tidak ditemukan.\nMohon verifikasi nama file yang diberikan."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"51\n"
-"Direktori tidak ditemukan.\n"
-"Mohon verifikasi nama direktori."
+msgstr "51\nDirektori tidak ditemukan.\nMohon verifikasi nama direktori."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' diproteksi.\n"
-"Anda ingin menghapusnya?"
+msgstr "'%1' diproteksi.\nAnda ingin menghapusnya?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b> nama \"%1\" tidak dapat digunakan.</b><p>Coba gunakan nama lain, dengan "
-"karakter yang lebih sedikit atau tanpa tanda baca.</p>"
+msgstr "<b> nama \"%1\" tidak dapat digunakan.</b><p>Coba gunakan nama lain, dengan karakter yang lebih sedikit atau tanpa tanda baca.</p>"
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/id/vidalia_id.po b/src/vidalia/i18n/po/id/vidalia_id.po
index c4123c9..def376e 100755
--- a/src/vidalia/i18n/po/id/vidalia_id.po
+++ b/src/vidalia/i18n/po/id/vidalia_id.po
@@ -1,15 +1,16 @@
 # 
 # Translators:
 # daweng  <thedaweng@xxxxxxxxx>, 2011.
+#   <deni.komputer@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #   <thedaweng@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: daweng <thedaweng@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-23 07:03+0000\n"
+"Last-Translator: lukman <deni.komputer@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,9 +46,7 @@ msgstr "'%1' bukanlah alamat IP yang valid."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Anda memilih 'Password' authentication, tetapi Anda tidak memberikan "
-"password."
+msgstr "Anda memilih 'Password' authentication, tetapi Anda tidak memberikan password."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -139,8 +138,7 @@ msgstr "Simpan data untuk software Tor  pada direktori berikut ini"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Pilih direktori yang digunakan untuk menyimpan data pada software Tor."
+msgstr "Pilih direktori yang digunakan untuk menyimpan data pada software Tor."
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -174,17 +172,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Lokasi file konfigurasi Tor yang ditentukan berisi karakter yang tidak dapat"
-" diwakili dalam pengkodean karakter saat sistem anda 8-bit."
+msgstr "Lokasi file konfigurasi Tor yang ditentukan berisi karakter yang tidak dapat diwakili dalam pengkodean karakter saat sistem anda 8-bit."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Lokasi direktori data Tor yang ditentukan berisi karakter yang tidak dapat "
-"diwakili dalam pengkodean karakter saat sistem anda 8-bit."
+msgstr "Lokasi direktori data Tor yang ditentukan berisi karakter yang tidak dapat diwakili dalam pengkodean karakter saat sistem anda 8-bit."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -204,6 +198,13 @@ msgstr "Pilih file untuk digunakan untuk path soket Tor"
 
 msgctxt "AdvancedPage"
 msgid "Configure ControlPort automatically"
+msgstr "Konfigurasi otomatis Port Kendali"
+
+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"
@@ -211,9 +212,7 @@ msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Vidalia tidak dapat menghapus layanan Tor. Anda mungkin perlu menghapus "
-"secara manual."
+msgstr "Vidalia tidak dapat menghapus layanan Tor. Anda mungkin perlu menghapus secara manual."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -235,6 +234,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:"
@@ -455,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia telah tersambung ke Tor proses berjalan yang membutuhkan password. "
-"Silakan masukkan sandi kendali Anda:"
+msgstr "Vidalia telah tersambung ke Tor proses berjalan yang membutuhkan password. Silakan masukkan sandi kendali Anda:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1295,32 +1309,30 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Kami tidak dapat secara otomatis restart Vidalia. Silahkan restart Vidalia "
-"secara manual."
+msgstr "Kami tidak dapat secara otomatis restart Vidalia. Silahkan restart Vidalia secara manual."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
-msgstr ""
+msgstr "Mohon isi tiket masuk:"
 
 msgctxt "CrashReportDialog"
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
+msgstr "Laporan error telah dibuat yang dapat anda kirimkan ke developer Vidalia untuk membantu mengidentifikasi dan memperbaiki permasalahan. Laporan yang dikirim tidak berisi informasi dan biodata pribadi."
 
 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 ""
+msgstr "dengan deskripsi dari apa yang sedang anda lakukan sebelum aplikasi error, bersama dengan file yang terkait dengan laporan error:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1539,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia dapat membuka tautan yang Anda pilih melalui default browser. Jika "
-"browser Anda tidak dikonfigurasi untuk penggunaan Tor maka aktivitas "
-"browsing Anda tidak anonymous lagi."
+msgstr "Vidalia dapat membuka tautan yang Anda pilih melalui default browser. Jika browser Anda tidak dikonfigurasi untuk penggunaan Tor maka aktivitas browsing Anda tidak anonymous lagi."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1556,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia tidak bisa membuka tautan yang dipilih pada browser Anda. Anda dapat"
-" menyalin URL dan menempelkannya pada browser Anda."
+msgstr "Vidalia tidak bisa membuka tautan yang dipilih pada browser Anda. Anda dapat menyalin URL dan menempelkannya pada browser Anda."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1769,10 +1776,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"
 
@@ -1840,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia tidak bisa menjalankan Tor. Periksa pengaturan Anda untuk memastikan"
-" nama dan lokasi yang benar dari executable Tor Anda."
+msgstr "Vidalia tidak bisa menjalankan Tor. Periksa pengaturan Anda untuk memastikan nama dan lokasi yang benar dari executable Tor Anda."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1880,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Perangkat lunak Tor memerlukan Vidalia untuk mengirim isi dari cookie "
-"otentikasi, tapi Vidalia tidak dapat menemukannya."
+msgstr "Perangkat lunak Tor memerlukan Vidalia untuk mengirim isi dari cookie otentikasi, tapi Vidalia tidak dapat menemukannya."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1904,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia tidak dapat mendaftar untuk beberapa bagian. Banyak fitur Vidalia "
-"mungkin tidak tersedia."
+msgstr "Vidalia tidak dapat mendaftar untuk beberapa bagian. Banyak fitur Vidalia mungkin tidak tersedia."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1928,9 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan. "
-"Silakan kunjungi website Tor untuk mendownload versi terbaru."
+msgstr "Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan. Silakan kunjungi website Tor untuk mendownload versi terbaru."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2035,23 +2030,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia mencoba untuk mereset password kontrol Tor, tetapi tidak dapat me-"
-"restart perangkat lunak Tor. Silakan cek Task Manager untuk memastikan tidak"
-" ada proses Tor lain yang berjalan."
+msgstr "Vidalia mencoba untuk mereset password kontrol Tor, tetapi tidak dapat me-restart perangkat lunak Tor. Silakan cek Task Manager untuk memastikan tidak ada proses Tor lain yang berjalan."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan."
+msgstr "Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Apakah Anda ingin memeriksa apakah paket baru tersedia untuk instalasi?"
+msgstr "Apakah Anda ingin memeriksa apakah paket baru tersedia untuk instalasi?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2075,9 +2065,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Tidak ada paket perangkat lunak baru Tor tersedia untuk komputer Anda saat "
-"ini."
+msgstr "Tidak ada paket perangkat lunak baru Tor tersedia untuk komputer Anda saat ini."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2096,10 +2084,25 @@ 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."
-msgstr ""
-"Segala yang dikirim melalui koneksi ini bisa dipantau. Mohon periksa "
-"konfigurasi aplikasi Anda dan hanya menggunakan protokol terenkripsi, "
-"seperti SSL, jika memungkinkan."
+msgstr "Segala yang dikirim melalui koneksi ini bisa dipantau. Mohon periksa konfigurasi aplikasi Anda dan hanya menggunakan protokol terenkripsi, seperti SSL, jika memungkinkan."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc from %1 to %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(kemungkinan Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(kemungkinan email client)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Salah satu dari aplikasi anda %1 tampaknya tidak ter-enskripsi dan menggunakan koneksi yang tidak aman ke port %2"
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2109,11 +2112,21 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
+msgstr "relay Anda munutup. Klik 'Stop' lagi untuk menghentikan relay Anda sekarang."
+
+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 ""
-"relay Anda munutup. Klik 'Stop' lagi untuk menghentikan relay Anda sekarang."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2121,33 +2134,14 @@ msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
 "Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Anda sedang menjalankan relay. Mengakhiri relay Anda akan mengganggu koneksi"
-" buka dari klien. Apakah Anda ingin matikan secara sopan dan memberikan "
-"klien waktu untuk mencari relay baru?"
+msgstr "Anda sedang menjalankan relay. Mengakhiri relay Anda akan mengganggu koneksi buka dari klien. Apakah Anda ingin matikan secara sopan dan memberikan klien waktu untuk mencari relay baru?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia mendeteksi bahwa perangkat lunak Tor keluar tak terduga. Silakan "
-"memeriksa log pesan untuk peringatan terbaru atau pesan kesalahan."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Vidalia mendeteksi bahwa perangkat lunak Tor keluar tak terduga. Silakan memeriksa log pesan untuk peringatan terbaru atau pesan kesalahan."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2171,9 +2165,7 @@ msgstr "Log Filename Diperlukan"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Anda harus memasukkan sebuah nama berkas untuk dapat menyimpan pesan log ke "
-"sebuah file."
+msgstr "Anda harus memasukkan sebuah nama berkas untuk dapat menyimpan pesan log ke sebuah file."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2423,9 +2415,7 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Pesan yang muncul ketika sesuatu telah sangat salah dan Tor tidak dapat "
-"dilanjutkan."
+msgstr "Pesan yang muncul ketika sesuatu telah sangat salah dan Tor tidak dapat dilanjutkan."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2439,9 +2429,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Pesan yang muncul jarang selama operasi Tor normal dan tidak dianggap "
-"sebagai kesalahan, tetapi Anda mungkin peduli."
+msgstr "Pesan yang muncul jarang selama operasi Tor normal dan tidak dianggap sebagai kesalahan, tetapi Anda mungkin peduli."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2460,10 +2448,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Tidak dapat menulis file %1\n"
-"\n"
-"%2."
+msgstr "Tidak dapat menulis file %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2570,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl + F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Kesalahan Penghubung"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Identifier Penghubung yang ditentukan tidak valid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Salin (Ctrl + C)"
 
@@ -2585,17 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk "
-"mengkonfigurasi Tor untuk menggunakan proxy untuk mengakses Internet."
+msgstr "Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk mengkonfigurasi Tor untuk menggunakan proxy untuk mengakses Internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Anda harus menentukan satu atau lebih port yang diizinkan firewall Anda "
-"untuk terhubung."
+msgstr "Anda harus menentukan satu atau lebih port yang diizinkan firewall Anda untuk terhubung."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2603,8 +2576,7 @@ msgstr "'%1' bukan nomor port yang valid."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Periksa apakah jaringan lokal Anda memerlukan proxy untuk mengakses Internet"
+msgstr "Periksa apakah jaringan lokal Anda memerlukan proxy untuk mengakses Internet"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2628,9 +2600,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Periksa untuk hanya melakukan koneksi ke relay menggunakan port diizinkan "
-"oleh firewall Anda"
+msgstr "Periksa untuk hanya melakukan koneksi ke relay menggunakan port diizinkan oleh firewall Anda"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2652,9 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Periksa untuk mengenkripsi permintaan direktori dan, opsional, gunakan relay"
-" jembatan untuk mengakses jaringan Tor"
+msgstr "Periksa untuk mengenkripsi permintaan direktori dan, opsional, gunakan relay jembatan untuk mengakses jaringan Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2682,28 +2650,21 @@ msgstr "Cari Penghubung Sekarang"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">Bagaimana lagi saya bisa menemukan "
-"penghubung?</a>"
+msgstr "<a href=\"bridges.finding\">Bagaimana lagi saya bisa menemukan penghubung?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">Bagaimana saya dapat menemukan penghubung?</a>"
+msgstr "<a href=\"bridges.finding\">Bagaimana saya dapat menemukan penghubung?</a>"
 
 msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Tidak ada penghubung baru yang saat ini tersedia. Anda dapat menunggu "
-"beberapa saat lalu coba lagi, atau mencoba metode lain untuk menemukan "
-"penghubung baru."
+msgstr "Tidak ada penghubung baru yang saat ini tersedia. Anda dapat menunggu beberapa saat lalu coba lagi, atau mencoba metode lain untuk menemukan penghubung baru."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Klik Bantuan untuk melihat metode lain untuk menemukan penghubung baru."
+msgstr "Klik Bantuan untuk melihat metode lain untuk menemukan penghubung baru."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2726,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "terima"
@@ -2889,17 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Anda telah mengkonfigurasi Tor untuk bertindak sebagai penghubung relay "
-"untuk pengguna disensor, namun versi Anda Tor tidak mendukung penghubung."
+msgstr "Anda telah mengkonfigurasi Tor untuk bertindak sebagai penghubung relay untuk pengguna disensor, namun versi Anda Tor tidak mendukung penghubung."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Silakan meng-upgrade perangkat lunak atau mengkonfigurasi Tor untuk "
-"bertindak sebagai relay Tor normal."
+msgstr "Silakan meng-upgrade perangkat lunak atau mengkonfigurasi Tor untuk bertindak sebagai relay Tor normal."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2914,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Jalankan hanya sebagai klien"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Lalu lintas relay untuk jaringan Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port Relay:"
 
@@ -2955,8 +2908,7 @@ msgstr "Nama relay Anda"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Port di mana pengguna dan relay lain dapat berkomunikasi dengan relay Anda"
+msgstr "Port di mana pengguna dan relay lain dapat berkomunikasi dengan relay Anda"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2970,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Untuk koneksi Internet dengan kecepatan download cepat tetapi lambat upload,"
-" silahkan isi di sini kecepatan upload anda."
+msgstr "Untuk koneksi Internet dengan kecepatan download cepat tetapi lambat upload, silahkan isi di sini kecepatan upload anda."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3030,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Kecepatan bandwidth maksimum Anda harus lebih besar dari atau sama dengan "
-"bandwidth rata-rata. Kedua nilai harus minimal 20 KB / s."
+msgstr "Kecepatan bandwidth maksimum Anda harus lebih besar dari atau sama dengan bandwidth rata-rata. Kedua nilai harus minimal 20 KB / s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3093,16 +3041,13 @@ msgstr "Tampilkan topik bantuan mengenai kebijakan keluar"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Apa sumber daya Internet harus pengguna akan dapat Anda akses dari relay?"
+msgstr "Apa sumber daya Internet harus pengguna akan dapat Anda akses dari relay?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor masih akan memblokir beberapa surat keluar dan file berbagi aplikasi "
-"secara default untuk mengurangi spam dan penyalahgunaan lainnya."
+msgstr "Tor masih akan memblokir beberapa surat keluar dan file berbagi aplikasi secara default untuk mengurangi spam dan penyalahgunaan lainnya."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3110,15 +3055,12 @@ msgstr "Kebijakan Keluar "
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Biarkan orang lain akses penghubung Anda dengan memberikan mereka baris ini:"
+msgstr "Biarkan orang lain akses penghubung Anda dengan memberikan mereka baris ini:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Ini adalah identitas relay penghubung yang dapat Anda berikan kepada orang "
-"lain"
+msgstr "Ini adalah identitas relay penghubung yang dapat Anda berikan kepada orang lain"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3136,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Tinggalkan relay Anda berjalan sehingga klien memiliki kesempatan yang lebih"
-" baik untuk menemukan dan menggunakannya."
+msgstr "Tinggalkan relay Anda berjalan sehingga klien memiliki kesempatan yang lebih baik untuk menemukan dan menggunakannya."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3152,9 +3092,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor kembali respon tidak diformat dengan benar ketika diminta Vidalia "
-"sejarah penggunaan penghubung Anda."
+msgstr "Tor kembali respon tidak diformat dengan benar ketika diminta Vidalia sejarah penggunaan penghubung Anda."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3166,8 +3104,7 @@ msgstr "Bantu pengguna disensor menjangkau jaringan Tor"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr ""
-"<a href=\"#bridgeUsage\">Siapa yang telah menggunakan penghubung saya?</a>"
+msgstr "<a href=\"#bridgeUsage\">Siapa yang telah menggunakan penghubung saya?</a>"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeHelp\">What's this?</a>"
@@ -3178,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Secara otomatis mendistribusikan alamat penghubung saya"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Mirror Direktori Relay"
 
@@ -3185,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Alamat email di mana Anda bisa dihubungi jika ada masalah dengan relay Anda."
-" Anda juga mungkin mencakup sidik jari Anda PGP atau GPG."
+msgstr "Alamat email di mana Anda bisa dihubungi jika ada masalah dengan relay Anda. Anda juga mungkin mencakup sidik jari Anda PGP atau GPG."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3197,9 +3140,7 @@ 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 ""
-"Harap mengkonfigurasi setidaknya sebuah direktori layanan dan port virtual "
-"untuk setiap layanan yang ingin Anda simpan. Lepaskan yang lain."
+msgstr "Harap mengkonfigurasi setidaknya sebuah direktori layanan dan port virtual untuk setiap layanan yang ingin Anda simpan. Lepaskan yang lain."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3267,9 +3208,7 @@ msgstr "Salin alamat onion layanan terpilih ke clipboard"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Jelajahi dalam sistem file lokal dan direktori memilih untuk layanan yang "
-"dipilih"
+msgstr "Jelajahi dalam sistem file lokal dan direktori memilih untuk layanan yang dipilih"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3296,10 +3235,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Klik \"Start Tor\" di Vidalia Control Panel untuk me-restart perangkat lunak"
-" Tor. Jika Tor keluar tak terduga, pilih \"Advanced\" tab di atas untuk "
-"rincian tentang kesalahan apapun yang dihadapi."
+msgstr "Klik \"Start Tor\" di Vidalia Control Panel untuk me-restart perangkat lunak Tor. Jika Tor keluar tak terduga, pilih \"Advanced\" tab di atas untuk rincian tentang kesalahan apapun yang dihadapi."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3307,10 +3243,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang tidak "
-"lagi dianjurkan. Silakan upgrade ke versi terbaru yang mungkin berisi "
-"keamanan, kehandalan dan perbaikan kinerja yang lebih baik."
+msgstr "Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang tidak lagi dianjurkan. Silakan upgrade ke versi terbaru yang mungkin berisi keamanan, kehandalan dan perbaikan kinerja yang lebih baik."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3318,11 +3251,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang mungkin "
-"tidak lagi bekerja dengan jaringan Tor saat ini. Silakan upgrade ke versi "
-"terbaru dari perangkat lunak, yang mungkin berisi keamanan , kehandalan dan "
-"perbaikan kinerja yang lebih baik."
+msgstr "Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang mungkin tidak lagi bekerja dengan jaringan Tor saat ini. Silakan upgrade ke versi terbaru dari perangkat lunak, yang mungkin berisi keamanan , kehandalan dan perbaikan kinerja yang lebih baik."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3336,9 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Kami berhasil membuat sambungan ke jaringan Tor. Anda sekarang dapat "
-"mengkonfigurasi aplikasi Anda untuk menggunakan Internet secara anonim."
+msgstr "Kami berhasil membuat sambungan ke jaringan Tor. Anda sekarang dapat mengkonfigurasi aplikasi Anda untuk menggunakan Internet secara anonim."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3348,10 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Perangkat lunak Tor mengalami sebuah bug internal. Silahkan melaporkan pesan"
-" kesalahan berikut ini untuk para pengembang Tor di bugs.torproject.org: "
-"\"%1\"\n"
+msgstr "Perangkat lunak Tor mengalami sebuah bug internal. Silahkan melaporkan pesan kesalahan berikut ini untuk para pengembang Tor di bugs.torproject.org: \"%1\"\n"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3359,11 +3283,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di "
-"masa lalu dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor "
-"tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan waktu"
-" yang tepat."
+msgstr "Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di masa lalu dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan waktu yang tepat."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3371,11 +3291,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di "
-"masa depan dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor"
-" tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan "
-"waktu yang tepat."
+msgstr "Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di masa depan dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan waktu yang tepat."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3387,21 +3303,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat "
-"koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi "
-"enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan. Untuk "
-"perlindungan anda, Tor secara otomatis menutup koneksi ini."
+msgstr "Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan. Untuk perlindungan anda, Tor secara otomatis menutup koneksi ini."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat "
-"koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi "
-"enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan."
+msgstr "Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3413,11 +3322,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Salah satu aplikasi Anda membentuk koneksi melalui Tor untuk \"%1\" "
-"menggunakan sebuah protokol yang dapat bocor informasi tentang tujuan Anda. "
-"Pastikan Anda mengkonfigurasi aplikasi Anda untuk menggunakan hanya SOCKS4a "
-"atau SOCKS5 dengan resolusi hostname remote."
+msgstr "Salah satu aplikasi Anda membentuk koneksi melalui Tor untuk \"%1\" menggunakan sebuah protokol yang dapat bocor informasi tentang tujuan Anda. Pastikan Anda mengkonfigurasi aplikasi Anda untuk menggunakan hanya SOCKS4a atau SOCKS5 dengan resolusi hostname remote."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3428,11 +3333,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Salah satu aplikasi Anda mencoba untuk membuat sambungan melalui Tor "
-"menggunakan protokol yang Tor tidak mengerti. Pastikan Anda mengkonfigurasi "
-"aplikasi Anda untuk menggunakan hanya SOCKS4a atau SOCKS5 dengan resolusi "
-"hostname remote."
+msgstr "Salah satu aplikasi Anda mencoba untuk membuat sambungan melalui Tor menggunakan protokol yang Tor tidak mengerti. Pastikan Anda mengkonfigurasi aplikasi Anda untuk menggunakan hanya SOCKS4a atau SOCKS5 dengan resolusi hostname remote."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3443,10 +3344,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Salah satu aplikasi Anda mencoba untuk membuat koneksi melalui Tor untuk "
-"\"%1\", yang Tor tidak mengakui sebagai nama host yang valid. Silakan "
-"periksa konfigurasi aplikasi Anda."
+msgstr "Salah satu aplikasi Anda mencoba untuk membuat koneksi melalui Tor untuk \"%1\", yang Tor tidak mengakui sebagai nama host yang valid. Silakan periksa konfigurasi aplikasi Anda."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3457,10 +3355,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor telah menetapkan alamat publik IP relay anda saat ini %1%2. Jika itu "
-"tidak benar, silakan mempertimbangkan pengaturan opsi 'Alamat' pada "
-"konfigurasi relay Anda."
+msgstr "Tor telah menetapkan alamat publik IP relay anda saat ini %1%2. Jika itu tidak benar, silakan mempertimbangkan pengaturan opsi 'Alamat' pada konfigurasi relay Anda."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3471,22 +3366,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu "
-"untuk domain yang tidak ada. Beberapa ISP dan lainnya DNS penyedia, seperti "
-"OpenDNS, diketahui untuk melakukan ini dalam rangka untuk menampilkan "
-"pencarian mereka sendiri atau halaman iklan."
+msgstr "Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu untuk domain yang tidak ada. Beberapa ISP dan lainnya DNS penyedia, seperti OpenDNS, diketahui untuk melakukan ini dalam rangka untuk menampilkan pencarian mereka sendiri atau halaman iklan."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu "
-"untuk domain terkenal. Karena klien mengandalkan jaringan Tor relay untuk "
-"memberikan repsonses akurat DNS, relay Anda tidak akan dikonfigurasi sebagai"
-" relay keluar."
+msgstr "Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu untuk domain terkenal. Karena klien mengandalkan jaringan Tor relay untuk memberikan repsonses akurat DNS, relay Anda tidak akan dikonfigurasi sebagai relay keluar."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3497,10 +3384,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor sedang mencoba untuk menentukan apakah port server relay anda dapat "
-"dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. "
-"Tes ini bisa memakan waktu beberapa menit."
+msgstr "Tor sedang mencoba untuk menentukan apakah port server relay anda dapat dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. Tes ini bisa memakan waktu beberapa menit."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3520,11 +3404,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"port server relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya. "
-"Hal ini dapat terjadi jika Anda berada di belakang router atau firewall yang"
-" mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak benar "
-"alamat IP dan port server, periksa konfigurasi relay Anda."
+msgstr "port server relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya. Hal ini dapat terjadi jika Anda berada di belakang router atau firewall yang mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak benar alamat IP dan port server, periksa konfigurasi relay Anda."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3535,10 +3415,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor sedang mencoba untuk menentukan apakah port direktori relay Anda dapat "
-"dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. "
-"Tes ini bisa memakan waktu beberapa menit."
+msgstr "Tor sedang mencoba untuk menentukan apakah port direktori relay Anda dapat dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. Tes ini bisa memakan waktu beberapa menit."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3558,11 +3435,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Direktori port relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya."
-" Hal ini dapat terjadi jika Anda berada di belakang router atau firewall "
-"yang mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak "
-"benar alamat IP dan port direktori, periksa konfigurasi relay Anda."
+msgstr "Direktori port relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya. Hal ini dapat terjadi jika Anda berada di belakang router atau firewall yang mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak benar alamat IP dan port direktori, periksa konfigurasi relay Anda."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3572,9 +3445,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"deskripsi relay Anda, yang memungkinkan klien untuk terhubung ke relay Anda,"
-" ditolak oleh server direktori di %1:%2. Alasan yang diberikan adalah:%3"
+msgstr "deskripsi relay Anda, yang memungkinkan klien untuk terhubung ke relay Anda, ditolak oleh server direktori di %1:%2. Alasan yang diberikan adalah:%3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3586,11 +3457,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"relay Anda sekarang online dan tersedia untuk Tor klien untuk digunakan. "
-"Anda akan melihat peningkatan lalu lintas jaringan yang ditampilkan oleh "
-"Grafik Bandwidth dalam beberapa jam sebagai klien lebih belajar tentang "
-"relay Anda. Terima kasih atas kontribusi ke jaringan Tor!"
+msgstr "relay Anda sekarang online dan tersedia untuk Tor klien untuk digunakan. Anda akan melihat peningkatan lalu lintas jaringan yang ditampilkan oleh Grafik Bandwidth dalam beberapa jam sebagai klien lebih belajar tentang relay Anda. Terima kasih atas kontribusi ke jaringan Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3652,9 +3519,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Simpan pengaturan. Jika dicentang itu hanya akan menerapkan setelan ke "
-"instance Tor saat ini."
+msgstr "Simpan pengaturan. Jika dicentang itu hanya akan menerapkan setelan ke instance Tor saat ini."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3694,8 +3559,7 @@ msgstr "Kesalahan koneksi ke Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Seleksi kosong. Silakan pilih beberapa teks, atau periksa \"Terapkan semua\""
+msgstr "Seleksi kosong. Silakan pilih beberapa teks, atau periksa \"Terapkan semua\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3769,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia tidak dapat memeriksa pembaruan perangkat lunak yang tersedia karena"
-" tidak bisa menemukan '%1'."
+msgstr "Vidalia tidak dapat memeriksa pembaruan perangkat lunak yang tersedia karena tidak bisa menemukan '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia tidak mampu untuk memeriksa pembaruan perangkat lunak yang tersedia "
-"karena proses update Tor tertutup secara tak terduga."
+msgstr "Vidalia tidak mampu untuk memeriksa pembaruan perangkat lunak yang tersedia karena proses update Tor tertutup secara tak terduga."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3935,7 +3795,7 @@ msgstr "Tidak dapat membuka '%1' log file: %2"
 
 msgctxt "Vidalia"
 msgid "Value required for parameter :"
-msgstr ""
+msgstr "Nilai yang dibutuhkan untuk parameter:"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
@@ -3954,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Proses lain Vidalia ini mungkin sudah berjalan. Jika tidak benar ada proses "
-"lain Vidalia berjalan, Anda dapat memilih untuk melanjutkan pula. Apakah "
-"Anda ingin melanjutkan mulai Vidalia?"
+msgstr "Proses lain Vidalia ini mungkin sudah berjalan. Jika tidak benar ada proses lain Vidalia berjalan, Anda dapat memilih untuk melanjutkan pula. Apakah Anda ingin melanjutkan mulai Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3990,5 +3847,3 @@ msgstr "%1 jam"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 menit"
-
-
diff --git a/src/vidalia/i18n/po/is/qt_is.po b/src/vidalia/i18n/po/is/qt_is.po
index 9a8b15a..40f520f 100644
--- a/src/vidalia/i18n/po/is/qt_is.po
+++ b/src/vidalia/i18n/po/is/qt_is.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/is/vidalia_is.po b/src/vidalia/i18n/po/is/vidalia_is.po
index 0326b2e..6e13a97 100755
--- a/src/vidalia/i18n/po/is/vidalia_is.po
+++ b/src/vidalia/i18n/po/is/vidalia_is.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -193,6 +194,17 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
@@ -219,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia tókst ekki að hlaða inn valdri þýðingu."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Síðan:"
@@ -1262,24 +1291,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 ""
 
@@ -1297,16 +1308,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+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..."
+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..."
+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 "GeneralPage"
@@ -1751,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -2060,15 +2078,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2083,24 +2113,31 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2515,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2655,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2839,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3087,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3665,14 +3698,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 ""
@@ -3766,6 +3791,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 ""
 
@@ -3815,5 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/it/qt_it.po b/src/vidalia/i18n/po/it/qt_it.po
index de88c57..8ae6cd5 100644
--- a/src/vidalia/i18n/po/it/qt_it.po
+++ b/src/vidalia/i18n/po/it/qt_it.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #   <tru74368@xxxxxxxxx>, 2011.
@@ -7,9 +7,9 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-10-25 20:22+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: fetidyoo <tru74368@xxxxxxxxx>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 esiste già.\n"
-"Vuoi sostituirlo?"
+msgstr "%1 esiste già.\nVuoi sostituirlo?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"File non trovato.\n"
-" Verifica qual'è il nome corretto del file"
+msgstr "%1\nFile non trovato.\n Verifica qual'è il nome corretto del file"
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Cartella non trovata.\n"
-"Controlla il nome corretto della cartella."
+msgstr "%1\nCartella non trovata.\nControlla il nome corretto della cartella."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' è di sola lettura.\n"
-"Vuoi comunque cancellare?"
+msgstr "'%1' è di sola lettura.\nVuoi comunque cancellare?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Il nome \"%1\" non può essere utilizzato.</b><p>Prova a utilizzare un "
-"altro nome, con meno caratteri o senza segni di interpunzione."
+msgstr "<b>Il nome \"%1\" non può essere utilizzato.</b><p>Prova a utilizzare un altro nome, con meno caratteri o senza segni di interpunzione."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 byte"
-
-
diff --git a/src/vidalia/i18n/po/it/vidalia_it.po b/src/vidalia/i18n/po/it/vidalia_it.po
index b2ad472..b0ba038 100644
--- a/src/vidalia/i18n/po/it/vidalia_it.po
+++ b/src/vidalia/i18n/po/it/vidalia_it.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-11-14 20:06+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: n0on3 <a.n0on3@xxxxxxxxx>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,9 +46,7 @@ msgstr "'%1' non è un indirizzo IP valido."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Hai scelto l'autenticazione tramite password, ma non ne hai specificata "
-"nessuna."
+msgstr "Hai scelto l'autenticazione tramite password, ma non ne hai specificata nessuna."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -174,19 +172,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Il file di configurazione di Tor presente alla locazione specificata "
-"contiene caratteri che non possono essere rappresentati nell'attuale schema "
-"di codifica ad 8-bit del tuo sistema."
+msgstr "Il file di configurazione di Tor presente alla locazione specificata contiene caratteri che non possono essere rappresentati nell'attuale schema di codifica ad 8-bit del tuo sistema."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"La locazione specificata per la directory dati Tor contiene caratteri che "
-"non possono essere rappresentati nell'attuale schema di codifica ad 8-bit "
-"del tuo sistema."
+msgstr "La locazione specificata per la directory dati Tor contiene caratteri che non possono essere rappresentati nell'attuale schema di codifica ad 8-bit del tuo sistema."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -210,13 +202,17 @@ msgstr "Configura la porta di controllo automaticamente"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Vidalia non ha potuto rimuovere il servizio Tor.\n"
-"\n"
-"Dovresti rimuoverlo manualmente."
+msgstr "Vidalia non ha potuto rimuovere il servizio Tor.\n\nDovresti rimuoverlo manualmente."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -236,8 +232,24 @@ msgstr "Scegliere lo stile dell'interfaccia di Vidalia"
 
 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 ""
-"Vidalia non è in grado di caricare la traduzione della lingua prescelta"
 
 msgctxt "BandwidthGraph"
 msgid "Since:"
@@ -459,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia si è collegato a un processo Tor in corse che richiede una password."
-" Inserisci la tua password di controllo:"
+msgstr "Vidalia si è collegato a un processo Tor in corse che richiede una password. Inserisci la tua password di controllo:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -473,8 +483,7 @@ msgstr "Errore nell'invio del comando di controllo. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Il socket si è disconnesso durante il tentativo di leggere una riga di dati."
+msgstr "Il socket si è disconnesso durante il tentativo di leggere una riga di dati."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
@@ -1300,9 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Non è stato possibile riavviare Vidalia automaticamente. Si prega di "
-"riavviare Vidalia manualmente."
+msgstr "Non è stato possibile riavviare Vidalia automaticamente. Si prega di riavviare Vidalia manualmente."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1312,28 +1319,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Un rapporto di crash è stato creato; è possibile inviare il rapporto agli "
-"sviluppatori di Vidalia per aiutare ad identifare e risolvere il problema. I"
-" rapporti inviati non contengono alcuna informazione personale."
+msgstr "Un rapporto di crash è stato creato; è possibile inviare il rapporto agli sviluppatori di Vidalia per aiutare ad identifare e risolvere il problema. I rapporti inviati non contengono alcuna informazione personale."
 
 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 ""
-"con una descrizione di cosa si stava facendo al momento del crash "
-"dell'applicazione, insieme ai seguenti files corrispondenti al rapporto del "
-"crash:"
+msgstr "con una descrizione di cosa si stava facendo al momento del crash dell'applicazione, insieme ai seguenti files corrispondenti al rapporto del crash:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1552,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia può aprire il collegamento che hai scelto dentro il tuo browser web "
-"predefinito. Se il tuo browser non è configurato per usare Tor, la richiesta"
-" non sarà anonima."
+msgstr "Vidalia può aprire il collegamento che hai scelto dentro il tuo browser web predefinito. Se il tuo browser non è configurato per usare Tor, la richiesta non sarà anonima."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1569,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia non è riuscito ad aprire il collegamento nel tuo browser web. Puoi "
-"sempre copiare l'indirizzo e incollarlo nel tuo browser."
+msgstr "Vidalia non è riuscito ad aprire il collegamento nel tuo browser web. Puoi sempre copiare l'indirizzo e incollarlo nel tuo browser."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1782,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Connesso alla rete Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Stato di avvio non riconosciuto"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "varie"
 
@@ -1853,10 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia non è riuscito ad avviare Tor. Controlla le impostazioni per "
-"assicurarti di aver specificato nome e posizione corretti per l'eseguibile "
-"di Tor."
+msgstr "Vidalia non è riuscito ad avviare Tor. Controlla le impostazioni per assicurarti di aver specificato nome e posizione corretti per l'eseguibile di Tor."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1894,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor richiede Vidalia per mandare i contenuti di un cookie di autenticazione,"
-" ma Vidalia non è stato in grado di trovarne uno."
+msgstr "Tor richiede Vidalia per mandare i contenuti di un cookie di autenticazione, ma Vidalia non è stato in grado di trovarne uno."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1918,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia non è stato in grado di registrare alcuni eventi. Alcune funzioni di"
-" Vidalia potrebbero non essere disponibili"
+msgstr "Vidalia non è stato in grado di registrare alcuni eventi. Alcune funzioni di Vidalia potrebbero non essere disponibili"
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1932,8 +1915,7 @@ msgstr "Vidalia non è riuscito ad autenticarsi al software Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Verificare le impostazioni di autenticazione per la porta di controllo."
+msgstr "Verificare le impostazioni di autenticazione per la porta di controllo."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1943,9 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per "
-"favore visita il sito di Tor per scaricare l'ultima versione."
+msgstr "L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per favore visita il sito di Tor per scaricare l'ultima versione."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2050,18 +2030,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia ha provato a resettare la password di controllo di Tor, ma non è "
-"riuscito a riavviare Tor. Controlla il tuo Task Manager per assicurarsi che "
-"non vi sono altri processi Tor in esecuzione"
+msgstr "Vidalia ha provato a resettare la password di controllo di Tor, ma non è riuscito a riavviare Tor. Controlla il tuo Task Manager per assicurarsi che non vi sono altri processi Tor in esecuzione"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per "
-"favore visita il sito di Tor per scaricare l'ultima versione."
+msgstr "L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per favore visita il sito di Tor per scaricare l'ultima versione."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2076,9 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor ha chiuso automaticamente la connessione per proteggere il tuo "
-"anonimato."
+msgstr "Tor ha chiuso automaticamente la connessione per proteggere il tuo anonimato."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2111,10 +2084,25 @@ 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."
-msgstr ""
-"Ogni dato inviato attraverso questa connessione potrebbe essere monitorato. "
-"Si consiglia di controllare la configurazione della propria applicazione e "
-"se possibile di usare esclusivamente protocolli crittografici come SSL."
+msgstr "Ogni dato inviato attraverso questa connessione potrebbe essere monitorato. Si consiglia di controllare la configurazione della propria applicazione e se possibile di usare esclusivamente protocolli crittografici come SSL."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc da %1 a %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probabilmente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(probabilmente un programma per le email)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Una delle applicazioni %1 sembra effettuare una connessione non criptata e non sicura verso la porta %2. "
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2124,49 +2112,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Il tuo relay si sta spegnendo.\n"
-"Fai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc da %1 a %2"
+msgstr "Il tuo relay si sta spegnendo.\nFai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ""
-"Hai realizzato un relay Tor. Se lo spegni tutte le connessioni aperte dai client verranno interrotte.\n"
-"\n"
-"Vuoi chiuderlo gradualmente per dare ai client il tempo di trovare un nuovo relay?"
 
 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 ""
-"Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n"
-"\n"
-"Controlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probabilmente Telnet)"
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probabilmente un programma per le email)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Hai realizzato un relay Tor. Se lo spegni tutte le connessioni aperte dai client verranno interrotte.\n\nVuoi chiuderlo gradualmente per dare ai client il tempo di trovare un nuovo relay?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Una delle applicazioni %1 sembra effettuare una connessione non criptata e "
-"non sicura verso la porta %2. "
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n\nControlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2440,17 +2415,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Messaggi che compaiono quando qualcosa è andato \n"
-"davvero storto e Tor non può continuare a funzionare."
+msgstr "Messaggi che compaiono quando qualcosa è andato \ndavvero storto e Tor non può continuare a funzionare."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Messaggi che compaiono solo quando \n"
-"qualcosa è andato storto con Tor."
+msgstr "Messaggi che compaiono solo quando \nqualcosa è andato storto con Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2458,37 +2429,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Messaggi che compaiono di rado \n"
-"durante il normale funzionamento \n"
-"di Tor e non sono considerati errori, \n"
-"ma potrebbero comunque interessarti."
+msgstr "Messaggi che compaiono di rado \ndurante il normale funzionamento \ndi Tor e non sono considerati errori, \nma potrebbero comunque interessarti."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Messaggi che compaiono spesso \n"
-"durante il funzionamento di Tor."
+msgstr "Messaggi che compaiono spesso \ndurante il funzionamento di Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Messaggi molto prolissi che interessano \n"
-"principalmente gli sviluppatori di Tor."
+msgstr "Messaggi molto prolissi che interessano \nprincipalmente gli sviluppatori di Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Non riesco a scrivere il file %1\n"
-"\n"
-"%2."
+msgstr "Non riesco a scrivere il file %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2595,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge non valido"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "L'identifier del bridge specificat non è valido."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copia (Ctrl+C)"
 
@@ -2610,16 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Devi indicare sia un indirizzo IP o un nome host, sia un numero di porta per"
-" configurare Tor e usare un proxy per accedere a Internet"
+msgstr "Devi indicare sia un indirizzo IP o un nome host, sia un numero di porta per configurare Tor e usare un proxy per accedere a Internet"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Devi indicare una o più porte a cui il tuo firewall permette di connettersi"
+msgstr "Devi indicare una o più porte a cui il tuo firewall permette di connettersi"
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2627,9 +2576,7 @@ msgstr "'%1' non è un numero di porta valido."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Seleziona nel caso che la tua rete locale richieda un proxy per accedere a "
-"Internet"
+msgstr "Seleziona nel caso che la tua rete locale richieda un proxy per accedere a Internet"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2653,9 +2600,7 @@ msgstr "Porta:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Seleziona per connetterti ai relay solo attraverso le porte consentite dal "
-"tuo firewall"
+msgstr "Seleziona per connetterti ai relay solo attraverso le porte consentite dal tuo firewall"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2677,9 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Seleziona per cifrare le richieste di directory e, facoltativamente, usare "
-"bridge relay per accedere alla rete Tor"
+msgstr "Seleziona per cifrare le richieste di directory e, facoltativamente, usare bridge relay per accedere alla rete Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2717,9 +2660,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, "
-"oppure cerca un altro modo per trovare dei bridge"
+msgstr "Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, oppure cerca un altro modo per trovare dei bridge"
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2746,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accetta"
@@ -2909,16 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Hai configurato Tor per fare da bridge relay per utendi censurati, ma la tua"
-" versione di Tor non supporta i bridge."
+msgstr "Hai configurato Tor per fare da bridge relay per utendi censurati, ma la tua versione di Tor non supporta i bridge."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor"
+msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor"
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2933,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Usa solo come client"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Fai da relay e scambia traffico per la rete Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta relay:"
 
@@ -2974,8 +2908,7 @@ msgstr "Nome del tuo relay"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Porta tramite cui utenti e altri relay possono comunicare con il tuo relay"
+msgstr "Porta tramite cui utenti e altri relay possono comunicare con il tuo relay"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2989,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Se hai una connessione ad internet con molta banda in download ma poca in "
-"upload, inserisci la tua velocità di upload qui."
+msgstr "Se hai una connessione ad internet con molta banda in download ma poca in upload, inserisci la tua velocità di upload qui."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3019,8 +2950,7 @@ msgstr "Personalizzata"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Seleziona la voce che si avvicina di più alla tua connessione internet"
+msgstr "Seleziona la voce che si avvicina di più alla tua connessione internet"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
@@ -3050,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"La banda massima deve essere maggiore o uguale alla banda allocata media. "
-"Entrambi i valori devono essere almeno 20 KB/s."
+msgstr "La banda massima deve essere maggiore o uguale alla banda allocata media. Entrambi i valori devono essere almeno 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3113,17 +3041,13 @@ msgstr "Mostra l'aiuto sulle exit policy"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"A quali risorse di internet gli utenti possono accedere tramite il tuo "
-"relay?"
+msgstr "A quali risorse di internet gli utenti possono accedere tramite il tuo relay?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor bloccherà di default alcune mail in uscita e programmi di condivisione "
-"file per ridurre spam ed altri abusi"
+msgstr "Tor bloccherà di default alcune mail in uscita e programmi di condivisione file per ridurre spam ed altri abusi"
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3131,15 +3055,12 @@ msgstr "Exit policy"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Consenti agli altri di accedere al tuo bridge dando loro questa riga di "
-"testo:"
+msgstr "Consenti agli altri di accedere al tuo bridge dando loro questa riga di testo:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Questa è l'identità del tuo bridge relay che puoi dare a altre persone"
+msgstr "Questa è l'identità del tuo bridge relay che puoi dare a altre persone"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3157,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Mantieni attivo il tuo relay così che i client possano meglio trovarlo ed "
-"usarlo."
+msgstr "Mantieni attivo il tuo relay così che i client possano meglio trovarlo ed usarlo."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3173,9 +3092,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor ha dato una risposta malformata quando Vidalia ha chiesto lo storico "
-"d'utilizzo del tuo bridge."
+msgstr "Tor ha dato una risposta malformata quando Vidalia ha chiesto lo storico d'utilizzo del tuo bridge."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3183,9 +3100,7 @@ msgstr "La risposta fornita è stata: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"Aiuta gli utenti sotto censura a raggiungere la rete Tor (Tor 0.2.0.8-alpha "
-"o più recente)"
+msgstr "Aiuta gli utenti sotto censura a raggiungere la rete Tor (Tor 0.2.0.8-alpha o più recente)"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3200,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuisci automaticamente l'indirizzo del mio bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Offri un mirror della directory dei relay"
 
@@ -3207,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"L'indirizzo email per contattarti se ci fosse un \n"
-"problema col tuo relay. Puoi inserire anche il tuo fingerprint PGP o GPG."
+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"
@@ -3219,9 +3140,7 @@ 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."
+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"
@@ -3237,8 +3156,7 @@ 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]."
+msgstr "La porta virtuale può solo contenere numeri di porta validi [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
@@ -3290,9 +3208,7 @@ msgstr "Copia l'indirizzo onion selezionato negli appunti"
 
 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"
+msgstr "Esplora nei file di sistema locali e scegli una cartella per i servizi selezionati"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3319,11 +3235,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Fare click su \"Avvia Tor\" nel pannello di controllo di vidalia per "
-"riavviare Tor. Se l'esecuzione di Tor è terminata in modo inatteso, si "
-"selezioni la pagina \"Avanzate\" per ulteriori dettagli sugli errori "
-"riscontrati."
+msgstr "Fare click su \"Avvia Tor\" nel pannello di controllo di vidalia per riavviare Tor. Se l'esecuzione di Tor è terminata in modo inatteso, si selezioni la pagina \"Avanzate\" per ulteriori dettagli sugli errori riscontrati."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3331,10 +3243,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Stai attualmente eseguendo la versione \"%1\" del software Tor, che risulta "
-"obsoleta. Si prega di aggiornare alla versione più recente, che può "
-"contenere importanti aggiornamenti di sicurezza, affidabilità e prestazioni."
+msgstr "Stai attualmente eseguendo la versione \"%1\" del software Tor, che risulta obsoleta. Si prega di aggiornare alla versione più recente, che può contenere importanti aggiornamenti di sicurezza, affidabilità e prestazioni."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3342,11 +3251,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Stai attualmente eseguendo la versione \"%1\" del software Tor, che potrebbe"
-" non essere più in grado di funzionare con la rete Tor. Si prega di "
-"aggiornare alla versione più recente, che può contenere importanti "
-"aggiornamenti di sicurezza, affidabilità e prestazioni."
+msgstr "Stai attualmente eseguendo la versione \"%1\" del software Tor, che potrebbe non essere più in grado di funzionare con la rete Tor. Si prega di aggiornare alla versione più recente, che può contenere importanti aggiornamenti di sicurezza, affidabilità e prestazioni."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3360,10 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Connessione stabilita con successo verso la rete Tor. Adesso si possono "
-"configurare le proprie applicazioni per accedere ad internet in modo "
-"anonimo."
+msgstr "Connessione stabilita con successo verso la rete Tor. Adesso si possono configurare le proprie applicazioni per accedere ad internet in modo anonimo."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3373,10 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Tor ha riscontrato un malfunzionamento interno. Si prega di riportare il "
-"seguente messaggio di errore agli sviluppatori del progetto Tor "
-"all'indirizzo bugs.torproject.org: \"%1\""
+msgstr "Tor ha riscontrato un malfunzionamento interno. Si prega di riportare il seguente messaggio di errore agli sviluppatori del progetto Tor all'indirizzo bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3384,12 +3283,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor ha rilevato che l'orologio del vostro computer potrebbe essere "
-"configurato con %1 secondi di ritardo rispetto alla sorgente \"%2\". Se il "
-"vostro orologio non è configurato correttamente, Tor non sarà in grado di "
-"funzionare. Si prega di verificare che il proprio computer visualizzi "
-"l'orario corretto."
+msgstr "Tor ha rilevato che l'orologio del vostro computer potrebbe essere configurato con %1 secondi di ritardo rispetto alla sorgente \"%2\". Se il vostro orologio non è configurato correttamente, Tor non sarà in grado di funzionare. Si prega di verificare che il proprio computer visualizzi l'orario corretto."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3397,11 +3291,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor ha rilevato che l'orologio del vostro computer potrebbe essere %1 "
-"secondi indietro rispetto a \"%2\". Se l'orologio non è configurato "
-"correttamente, Tor non sarà in grado di funzionare. Si prega di verificare "
-"che il computer visualizzi l'orario corretto."
+msgstr "Tor ha rilevato che l'orologio del vostro computer potrebbe essere %1 secondi indietro rispetto a \"%2\". Se l'orologio non è configurato correttamente, Tor non sarà in grado di funzionare. Si prega di verificare che il computer visualizzi l'orario corretto."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3413,23 +3303,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Una delle applicazioni sul vostro computer potrebbe aver tentato di "
-"stabilire una connessione non crittografata tramite Tor alla porta %1. "
-"L'invio di informazioni non crittografate attraverso la rete Tor è "
-"pericoloso e non raccomandato. Per la vostra sicurezza, Tor ha "
-"automaticamente chiuso questa connessione."
+msgstr "Una delle applicazioni sul vostro computer potrebbe aver tentato di stabilire una connessione non crittografata tramite Tor alla porta %1. L'invio di informazioni non crittografate attraverso la rete Tor è pericoloso e non raccomandato. Per la vostra sicurezza, Tor ha automaticamente chiuso questa connessione."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Una delle applicazioni sul vostro computer potrebbe aver tentato di "
-"stabilire una connessione non crittografata tramite Tor alla porta %1. "
-"L'invio di informazioni non crittografate attraverso la rete Tor è "
-"pericoloso e non raccomandato."
+msgstr "Una delle applicazioni sul vostro computer potrebbe aver tentato di stabilire una connessione non crittografata tramite Tor alla porta %1. L'invio di informazioni non crittografate attraverso la rete Tor è pericoloso e non raccomandato."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3441,12 +3322,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Una delle vostre applicazioni ha stabilito una connessione attraverso Tor a "
-"\"%1\" utilizzando un protocollo che potrebbe rivelare informazioni sulla "
-"vostra destinazione. Assicuratevi di configurare le applicazioni affinché "
-"utilizzino esclusivamente socks4a o SOCKS5 con risoluzione remota "
-"dell'hostname."
+msgstr "Una delle vostre applicazioni ha stabilito una connessione attraverso Tor a \"%1\" utilizzando un protocollo che potrebbe rivelare informazioni sulla vostra destinazione. Assicuratevi di configurare le applicazioni affinché utilizzino esclusivamente socks4a o SOCKS5 con risoluzione remota dell'hostname."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3457,11 +3333,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Una delle vostre applicazioni ha stabilito una connessione attraverso Tor "
-"utilizzando un protocollo che Tor non è in grado di comprendere. "
-"Assicuratevi di configurare le applicazioni affinché utilizzino "
-"esclusivamente socks4a o SOCKS5 con risoluzione remota dell'hostname."
+msgstr "Una delle vostre applicazioni ha stabilito una connessione attraverso Tor utilizzando un protocollo che Tor non è in grado di comprendere. Assicuratevi di configurare le applicazioni affinché utilizzino esclusivamente socks4a o SOCKS5 con risoluzione remota dell'hostname."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3472,10 +3344,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Una delle vostre applicazioni ha stabilito una connessione attraverso Tor a "
-"\"%1\", che Tor non riconosce come un hostname valido. Si prega di "
-"controllare la configurazione della vostra applicazione."
+msgstr "Una delle vostre applicazioni ha stabilito una connessione attraverso Tor a \"%1\", che Tor non riconosce come un hostname valido. Si prega di controllare la configurazione della vostra applicazione."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3486,10 +3355,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor ha rilevato che l'indirizzo IP pubblico del proprio relay è attualmente "
-"%1%2. Se tale informazione non è corretta, si consiglia di configurare "
-"l'indirizzo nel campo 'Address' nella schermata di configurazione del relay."
+msgstr "Tor ha rilevato che l'indirizzo IP pubblico del proprio relay è attualmente %1%2. Se tale informazione non è corretta, si consiglia di configurare l'indirizzo nel campo 'Address' nella schermata di configurazione del relay."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3500,22 +3366,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor ha rilevato che il server DNS utilizzato sta fornendo falsi responsi per"
-" domini che non esistono. Alcuni ISP ed altri DNS provider come OpenDNS sono"
-" noti per tale pratica al fine di visualizzare risultati di ricerca o "
-"pubblicità."
+msgstr "Tor ha rilevato che il server DNS utilizzato sta fornendo falsi responsi per domini che non esistono. Alcuni ISP ed altri DNS provider come OpenDNS sono noti per tale pratica al fine di visualizzare risultati di ricerca o pubblicità."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor ha rilevato che il server DNS utilizzato sta fornendo falsi responsi per"
-" domini noti. Poiché gli utenti si affidano ai relay della rete Tor per "
-"risolvere accuratamente le query ai DNS, il vostro relay non verrà "
-"configurato come un relay di uscita. "
+msgstr "Tor ha rilevato che il server DNS utilizzato sta fornendo falsi responsi per domini noti. Poiché gli utenti si affidano ai relay della rete Tor per risolvere accuratamente le query ai DNS, il vostro relay non verrà configurato come un relay di uscita. "
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3526,15 +3384,11 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor sta cercando di rilevare se la porta del vostro server relay è "
-"raggiungibile dalla rete Tor connettendosi a %1:%2. L'operazione può "
-"richiedere diversi minuti."
+msgstr "Tor sta cercando di rilevare se la porta del vostro server relay è raggiungibile dalla rete Tor connettendosi a %1:%2. L'operazione può richiedere diversi minuti."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
-msgstr ""
-"Il controllo della raggiungibilità della porta server ha avuto successo!"
+msgstr "Il controllo della raggiungibilità della porta server ha avuto successo!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
@@ -3542,8 +3396,7 @@ msgstr "La porta server del vostro relay è raggiungibile dalla rete Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
-msgstr ""
-"Il controllo della raggiungibilità della porta server non ha avuto successo!"
+msgstr "Il controllo della raggiungibilità della porta server non ha avuto successo!"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3551,12 +3404,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"La porta del vostro server relay non è raggiungibile dagli altri utenti Tor."
-" Questa condizione può verificarsi se ci si trova al di la di un router o di"
-" un firewall che richiede la configurazione del port forwarding. Se %1:%2 "
-"non è il vostro corretto indirizzo IP e porta del server, si prega di "
-"controllare la configurazione del proprio relay."
+msgstr "La porta del vostro server relay non è raggiungibile dagli altri utenti Tor. Questa condizione può verificarsi se ci si trova al di la di un router o di un firewall che richiede la configurazione del port forwarding. Se %1:%2 non è il vostro corretto indirizzo IP e porta del server, si prega di controllare la configurazione del proprio relay."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3567,10 +3415,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor sta tentando di determinare se la directory port configurata è "
-"raggiungibile dalla rete Tor connettendosi a %1:%2. Questa operazione può "
-"richiedere diversi minuti."
+msgstr "Tor sta tentando di determinare se la directory port configurata è raggiungibile dalla rete Tor connettendosi a %1:%2. Questa operazione può richiedere diversi minuti."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3590,12 +3435,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"La directory port del vostro relay non è raggiungibile dagli altri utenti "
-"Tor. Questa condizione può verificarsi se ci si trova al di la di un router "
-"o di un firewall che richiede la configurazione del port forwarding. Se "
-"%1:%2 non è il vostro corretto indirizzo IP e porta del server, si prega di "
-"controllare la configurazione del proprio relay."
+msgstr "La directory port del vostro relay non è raggiungibile dagli altri utenti Tor. Questa condizione può verificarsi se ci si trova al di la di un router o di un firewall che richiede la configurazione del port forwarding. Se %1:%2 non è il vostro corretto indirizzo IP e porta del server, si prega di controllare la configurazione del proprio relay."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3605,10 +3445,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"La descrizione del vostro relay, che permette agli altri utenti di "
-"connettervisi, è stata rifiutata dal directory server presso %1:%2. La "
-"ragione specificata è: %3"
+msgstr "La descrizione del vostro relay, che permette agli altri utenti di connettervisi, è stata rifiutata dal directory server presso %1:%2. La ragione specificata è: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3620,11 +3457,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Il vostro relay è ora online e disponibile per l'uso da parte dei client "
-"Tor. Dovreste vedere un aumento del traffico di rete mostrato dal Grafico "
-"dell'ampiezza di banda entro poche ore, quando più client si accorgeranno "
-"del vostro relay. Grazie per il vostro contributo alla rete Tor!"
+msgstr "Il vostro relay è ora online e disponibile per l'uso da parte dei client Tor. Dovreste vedere un aumento del traffico di rete mostrato dal Grafico dell'ampiezza di banda entro poche ore, quando più client si accorgeranno del vostro relay. Grazie per il vostro contributo alla rete Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3686,9 +3519,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Salva la configurazione. Se non selezionato, i cambiamenti saranno applicati"
-" solamente all'istanza corrente di Tor."
+msgstr "Salva la configurazione. Se non selezionato, i cambiamenti saranno applicati solamente all'istanza corrente di Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3728,9 +3559,7 @@ msgstr "Errore durante la connessione a Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Nessuna selezione effettuata. Si prega di selezionare del testo o di "
-"spuntare l'opzione \"Applica tutti\"."
+msgstr "Nessuna selezione effettuata. Si prega di selezionare del testo o di spuntare l'opzione \"Applica tutti\"."
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3804,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia non ha potuto controllare gli aggiornamenti software perché non ha "
-"trovato '%1'."
+msgstr "Vidalia non ha potuto controllare gli aggiornamenti software perché non ha trovato '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia non ha potuto controllare gli aggiornamenti software perché il "
-"processo di aggiurnamento di Tor si è interrotto inaspettatamente."
+msgstr "Vidalia non ha potuto controllare gli aggiornamenti software perché il processo di aggiurnamento di Tor si è interrotto inaspettatamente."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3989,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n"
-"\n"
-"Vuoi continuare ed avviare Vidalia?"
+msgstr "Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n\nVuoi continuare ed avviare Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4025,5 +3847,3 @@ msgstr "%1 ore"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minuti"
-
-
diff --git a/src/vidalia/i18n/po/ja/qt_ja.po b/src/vidalia/i18n/po/ja/qt_ja.po
index bf95d21..7ec5561 100644
--- a/src/vidalia/i18n/po/ja/qt_ja.po
+++ b/src/vidalia/i18n/po/ja/qt_ja.po
@@ -1,11 +1,16 @@
-# 
+# Translators:
+# Translators:
+# 5人ã?®ã?¢ã??ã??ã??ã?¹  <>, 2012.
+# Chris Harris <praisebe4him@xxxxxxxxx>, 2012.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# siomiz  <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2012-02-21 07:11+0000\n"
+"Last-Translator: Chris Harris <praisebe4him@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -199,9 +204,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1ã?¯ã??ã?§ã?«å­?å?¨ã??ã?¾ã??ã??\n"
-"ç½®ã??æ??ã??ã?¾ã??ã???"
+msgstr "%1ã?¯ã??ã?§ã?«å­?å?¨ã??ã?¾ã??ã??\nç½®ã??æ??ã??ã?¾ã??ã???"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -209,10 +212,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã??\n"
-"æ­£ã??ã??ã??ã?¡ã?¤ã?«å??ã??å?¥å??ã??ã??ã??ã??ã?©ã??ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??"
+msgstr "%1\nã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã??\næ­£ã??ã??ã??ã?¡ã?¤ã?«å??ã??å?¥å??ã??ã??ã??ã??ã?©ã??ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??"
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -270,19 +270,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"ã??ã?£ã?¬ã?¯ã??ã?ªã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã??\n"
-"æ­£ã??ã??ã??ã?£ã?¬ã?¯ã??ã?ªå??ã??å?¥å??ã??ã??ã??ã??ã?©ã??ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??"
+msgstr "%1\nã??ã?£ã?¬ã?¯ã??ã?ªã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã??\næ­£ã??ã??ã??ã?£ã?¬ã?¯ã??ã?ªå??ã??å?¥å??ã??ã??ã??ã??ã?©ã??ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??"
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' ã?¯æ?¸ã??è¾¼ã?¿ã??ç¦?æ­¢ã??ã??ã?¦ã??ã?¾ã??ã??\n"
-"æ?¬å½?ã?«å??é?¤ã??ã?¾ã??ã??ï¼?"
+msgstr "'%1' ã?¯æ?¸ã??è¾¼ã?¿ã??ç¦?æ­¢ã??ã??ã?¦ã??ã?¾ã??ã??\næ?¬å½?ã?«å??é?¤ã??ã?¾ã??ã??ï¼?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -342,12 +337,12 @@ msgstr "æ?°ã??ã??ã??ã?©ã?«ã??"
 #: qfiledialog.cpp:465
 msgctxt "QFileDialog"
 msgid "&New Folder"
-msgstr ""
+msgstr "æ?°ã??ã??ã??ã?©ã?«ã??(&F)"
 
 #: qfiledialog.cpp:917
 msgctxt "QFileDialog"
 msgid "&Choose"
-msgstr ""
+msgstr "é?¸æ??(&S)"
 
 #: qsidebar.cpp:388
 msgctxt "QFileDialog"
@@ -372,14 +367,14 @@ msgstr "æ?°ã??ã??ã??ã?©ã?«ã??ã?®ä½?æ??"
 #: qfilesystemmodel.cpp:761
 msgctxt "QFileSystemModel"
 msgid "Invalid filename"
-msgstr ""
+msgstr "ä¸?æ­£ã?ªã??ã?¡ã?¤ã?«å??"
 
 #: qfilesystemmodel.cpp:763
 msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
+msgstr "<b>\"%1\" ã?¨ã??ã??å??å??ã?¯ä½¿ã??ã?¾ã??ã??ã??</b><p>å??å??ã??ç?­ã??ã??ã??ã??ã??è¨?å?·ã??å?«ã?¾ã?ªã??å?¥ã?®å??å??ã?§è©¦ã??ã?¦ã??ã? ã??ã??ã??</p>"
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -414,29 +409,29 @@ msgstr "ã??ã?¤ ã?³ã?³ã??ã?¥ã?¼ã?¿"
 #: qfilesystemmodel_p.h:200
 msgctxt "QFileSystemModel"
 msgid "Computer"
-msgstr ""
+msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿"
 
 #: qfilesystemmodel.cpp:677
 msgctxt "QFileSystemModel"
 msgid "%1 TB"
-msgstr ""
+msgstr "%1 TB"
 
 #: qfilesystemmodel.cpp:679
 msgctxt "QFileSystemModel"
 msgid "%1 GB"
-msgstr ""
+msgstr "%1 GB"
 
 #: qfilesystemmodel.cpp:681
 msgctxt "QFileSystemModel"
 msgid "%1 MB"
-msgstr ""
+msgstr "%1 MB"
 
 #: qfilesystemmodel.cpp:683
 msgctxt "QFileSystemModel"
 msgid "%1 KB"
-msgstr ""
+msgstr "%1 KB"
 
 #: qfilesystemmodel.cpp:684
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
-msgstr ""
+msgstr "%1 ã??ã?¤ã??"
diff --git a/src/vidalia/i18n/po/ja/vidalia_ja.po b/src/vidalia/i18n/po/ja/vidalia_ja.po
index 6541a26..f728394 100644
--- a/src/vidalia/i18n/po/ja/vidalia_ja.po
+++ b/src/vidalia/i18n/po/ja/vidalia_ja.po
@@ -1,16 +1,26 @@
+# 
+# Translators:
+# ��  <>, 2012.
+# Chris Harris <praisebe4him@xxxxxxxxx>, 2012.
+# Eshin Kunishima <kaoru@xxxxxxxxxxxxx>, 2012.
+#   <kaoru@xxxxxxxxxxxxx>, 2012.
+#   <pentive@xxxxxxxxx>, 2012.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# siomiz  <>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: 2010-04-10 02:06-0600\n"
-"Last-Translator: Shinji R. Yamane <s-yamane@xxxxxxxxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-08 09:44+0000\n"
+"Last-Translator: Eshin Kunishima <kaoru@xxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
 msgid "About Vidalia"
@@ -32,28 +42,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr "Qt 4.4.2"
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr "Qt"
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr "version"
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr "'%1' ã?¯æ??å?¹ã?ª IP ã?¢ã??ã?¬ã?¹ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr "'ã??ã?¹ã?¯ã?¼ã??' èª?証ã??é?¸æ??ã??ã?¾ã??ã??ã??ã??ã??ã?¹ã?¯ã?¼ã??ã??æ??å®?ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
 msgctxt "AdvancedPage"
@@ -93,10 +88,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr "Vidalia ã?¯ Tor ã?µã?¼ã??ã?¹ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr "å?¶å¾¡ã??ã?¼ã??"
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr "�証:"
 
@@ -146,17 +137,85 @@ msgstr "ã??ã?¼ã?¿ã??ã?£ã?¬ã?¯ã??ã?ª"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr ""
+msgstr "Torã?¯ã?©ã?¤ã?¢ã?³ã??ã?«é?¢ã??ã??ã??ã?¼ã?¿ã??ä¿?å­?ã??ã??ã??ã?£ã?¬ã?¯ã??ã?ª"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
+msgstr "Torã?¯ã?©ã?¤ã?¢ã?³ã??ã?«é?¢ã??ã??ã??ã?¼ã?¿ã??ä¿?å­?ã??ã??ã??ã?£ã?¬ã?¯ã??ã?ªã??é?¸ã?¶"
+
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr "ç?¾å?¨ã?®torrcã??ç·¨é??ã??ã?¾ã??"
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr "è­¦å??"
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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 ""
+msgstr "Vidaliaã?¯Torã?µã?¼ã??ã?¹ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??\n\næ??å??ã?§å??é?¤ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??"
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -176,6 +235,23 @@ msgstr "Vidalia ã?®ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ ã?¹ã?¿ã?¤ã?«ã??é?¸æ??ã??ã?¾ã??"
 
 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"
@@ -236,15 +312,15 @@ msgstr "�����"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr ""
+msgstr "HTTPSã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??中..."
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "%1:%2 ���中..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr ""
+msgstr "HTTPSã?ªã?¯ã?¨ã?¹ã??ã??ã??ã?ªã??ã?¸ã?«é??信中..."
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
@@ -252,15 +328,15 @@ msgstr "ã??ã?ªã??ã?¸ã?®ã?ªã?¹ã??ã??ã??ã?¦ã?³ã?­ã?¼ã??..."
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Downloading Bridges"
-msgstr ""
+msgstr "ã??ã?ªã??ã?¸ã??ã??ã?¦ã?³ã?­ã?¼ã??中"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Unable to download bridges: %1"
-msgstr ""
+msgstr "ã??ã?ªã??ã?¸ã??ã??ã?¦ã?³ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??: %1"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Retrying bridge request..."
-msgstr ""
+msgstr "ã??ã?ªã??ã?¸ã?ªã?¯ã?¨ã?¹ã??ã??å??é??信中..."
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
@@ -268,19 +344,19 @@ msgstr "å?½"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
-msgstr ""
+msgstr "ã?¯ã?©ã?¤ã?¢ã?³ã??æ?°"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
+msgstr "%1 以é??ã??ã??ã?ªã??ã?®ã?ªã?¬ã?¼ã??å?©ç?¨ã??ã??å?½å?¥ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
-msgstr ""
+msgstr "ã??ã?ªã??ã?¸å?©ç?¨æ¦?è¦?"
 
 msgctxt "BridgeUsageDialog"
 msgid "Client Summary"
-msgstr ""
+msgstr "ã?¯ã?©ã?¤ã?¢ã?³ã??æ¦?è¦?"
 
 msgctxt "Circuit"
 msgid "New"
@@ -344,7 +420,7 @@ msgstr "å?±æ??"
 
 msgctxt "ConfigDialog"
 msgid "Services"
-msgstr ""
+msgstr "ã?µã?¼ã??ã?¹"
 
 msgctxt "ConfigDialog"
 msgid "Appearance"
@@ -388,15 +464,17 @@ msgstr "ã?³ã?³ã??ã?­ã?¼ã?« ã?½ã?±ã??ã??ã?¯æ?¥ç¶?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
-msgstr ""
+msgstr "è¦?ã??ã?¹ã?¯ã?¼ã??"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Remember my password"
-msgstr ""
+msgstr "ã??ã?¹ã?¯ã?¼ã??ã??è¨?æ?¶"
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
-msgstr ""
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
+msgstr "Vidaliaã?¯ã??ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?ã?ªTorã??ã?­ã?»ã?¹ã?«æ?¥ç¶?ã??ã?¾ã??ã??ã??管ç??ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -416,275 +494,275 @@ msgstr "ä¸?æ­£ã?ªã?³ã?³ã??ã?­ã?¼ã?«è¿?ä¿¡ã?§ã??ã??[%1]"
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
-msgstr ""
+msgstr "ã?¢ã??ã?¬ã??ã?¹ã?¿ã?³"
 
 msgctxt "CountryInfo"
 msgid "Andorra"
-msgstr ""
+msgstr "ã?¢ã?³ã??ã?©"
 
 msgctxt "CountryInfo"
 msgid "Angola"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "ã?¢ã?³ã??ã?°ã?¢ & ã??ã?¼ã??ã?¼ã??"
 
 msgctxt "CountryInfo"
 msgid "Argentina"
-msgstr ""
+msgstr "ã?¢ã?«ã?¼ã?³ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "ã?¢ã?«ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "ã?ªã?¼ã?¹ã??ã?©ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "ã?¢ã?¼ã?«ã??ã?¤ã?¸ã?£ã?³"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "ã??ã??ã??å?½"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "ã??ã?³ã?°ã?©ã??ã?·ã?¥"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "ã??ã?«ã??ã??ã?¹"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "ã??ã?©ã?«ã?¼ã?·"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "ã??ã?«ã?®ã?¼"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "ã??ã?ªã?¼ã?º"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "ã??ã?¼ã?¿ã?³"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "ã??ã?ªã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "ã??ã?¹ã??ã?¢ã?»ã??ã?«ã??ã?§ã?´ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "ã??ã??ã?¯ã??"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "ã??ã?©ã?¸ã?«"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "ã??ã?«ã??ã?¤ã?»ã??ã?«ã?µã?©ã?¼ã? å?½"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "ã??ã?«ã?¬ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "ã??ã?«ã?­ã??ã??ã?¡ã?½"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "ã??ã?«ã?³ã?¸"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "ã?«ã?³ã??ã?¸ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "�����"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "ã?«ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "ã?«ã??ã??ã?«ã??"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "中央ã?¢ã??ã?ªã?«å?±å??å?½"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "ã??ã?£ã??"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "ã??ã?ª"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "中�"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "ã?³ã?­ã?³ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "ã?³ã?³ã?´ æ°?主å?±å??å?½"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr ""
+msgstr "�����"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "ã?³ã?¼ã??ã?¸ã??ã?¯ã?¼ã?«"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "ã?¯ã?­ã?¢ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "ã?­ã?¥ã?¼ã??"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "ã?­ã??ã?­ã?¹"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "ã??ã?§ã?³"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "ã??ã?³ã??ã?¼ã?¯"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "ã?¸ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "ã??ã??ã??ã?«"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "ã??ã??ã??ã?«å?±å??å?½"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "ã?¨ã?¯ã?¢ã??ã?«"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "ã?¨ã?¸ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "ã?¨ã?«ã?µã?«ã??ã??ã?«"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "赤é??ã?®ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "ã?¨ã?ªã??ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "ã?¨ã?¹ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "ã??ã?©ã?³ã?¹"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "ã?¬ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "ã?¬ã?³ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr ""
+msgstr "ã??ã?¤ã??"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr ""
+msgstr "ã?¬ã?¼ã??"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
-msgstr ""
+msgstr "ã?°ã?¬ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Guatemala"
-msgstr ""
+msgstr "ã?°ã?¢ã??ã??ã?©"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr ""
+msgstr "ã?®ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "ã?®ã??ã?¢ã??ã?µã?¦"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
-msgstr ""
+msgstr "ã?¬ã?¤ã?¢ã??"
 
 msgctxt "CountryInfo"
 msgid "Hong Kong"
-msgstr ""
+msgstr "�港"
 
 msgctxt "CountryInfo"
 msgid "Haiti"
-msgstr ""
+msgstr "ã??ã?¤ã??"
 
 msgctxt "CountryInfo"
 msgid "Honduras"
-msgstr ""
+msgstr "ã??ã?³ã?¸ã?¥ã?©ã?¹"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr ""
+msgstr "�����"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr ""
+msgstr "ã?¸ã?£ã??ã?¤ã?«"
 
 msgctxt "CountryInfo"
 msgid "Japan"
@@ -692,518 +770,571 @@ msgstr "��"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr ""
+msgstr "ã?¨ã?«ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr ""
+msgstr "ã?«ã?¶ã??ã?¹ã?¿ã?³"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr ""
+msgstr "ã?±ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
-msgstr ""
+msgstr "ã?­ã?ªã??ã?¹"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr ""
+msgstr "ã?¯ã?¦ã?§ã?¼ã??"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Laos"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr ""
+msgstr "ã?©ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr ""
+msgstr "ã?¬ã??ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr ""
+msgstr "ã?¬ã?½ã??"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr ""
+msgstr "ã?ªã??ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr ""
+msgstr "ã?ªã??ã??ã?³ã?·ã?¥ã?¿ã?¤ã?³"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr ""
+msgstr "ã?ªã??ã?¢ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr ""
+msgstr "ã?«ã?¯ã?»ã?³ã??ã?«ã?¯"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr ""
+msgstr "ã??ã?±ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr ""
+msgstr "ã??ã??ã?¬ã?¹ã?«ã?«"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
-msgstr ""
+msgstr "ã??ã?©ã?¦ã?¤"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr ""
+msgstr "ã??ã?¬ã?¼ã?·ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Mali"
-msgstr ""
+msgstr "ã??ã?ª"
 
 msgctxt "CountryInfo"
 msgid "Malta"
-msgstr ""
+msgstr "ã??ã?«ã?¿"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr ""
+msgstr "ã??ã?¼ã?·ã?£ã?«è«¸å³¶"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr ""
+msgstr "ã?¢ã?¼ã?ªã?¿ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
-msgstr ""
+msgstr "������"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr ""
+msgstr "ã??ã?¯ã?­ã??ã?·ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
-msgstr ""
+msgstr "ã?¢ã?«ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr ""
+msgstr "ã?¢ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr ""
+msgstr "ã?¢ã?³ã??ã??ã?°ã?­"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr ""
+msgstr "ã?¢ã?­ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr ""
+msgstr "ã?¢ã?¶ã?³ã??ã?¼ã?¯"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr ""
+msgstr "ã??ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
-msgstr ""
+msgstr "ã??ã?¦ã?«"
 
 msgctxt "CountryInfo"
 msgid "Nepal"
-msgstr ""
+msgstr "ã??ã??ã?¼ã?«"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr ""
+msgstr "ã?ªã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr ""
+msgstr "ã??ã?¥ã?¼ã?¸ã?¼ã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr ""
+msgstr "ã??ã?«ã?©ã?°ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "ã??ã?¸ã?§ã?¼ã?«"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "ã??ã?¤ã?¸ã?§ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "ã??ã?«ã?¦ã?§ã?¼"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "ã?ªã??ã?¼ã?³"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "ã??ã?­ã?¹ã?¿ã?³"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "ã??ã?©ã?ª"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "ã??ã?¬ã?¹ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "ã??ã??ã??"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "ã??ã??ã?¢ã??ã?¥ã?¼ã?®ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "ã??ã?©ã?°ã?¢ã?¤"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "ã??ã?«ã?¼"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "ã??ã?£ã?ªã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "ã??ã?¼ã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "ã??ã?«ã??ã?¬ã?«"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "ã?«ã?¼ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "ã?­ã?·ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "ã?«ã?¯ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "ã?»ã?³ã??ã?¯ã?ªã?¹ã??ã??ã?¡ã?¼ã?»ã??ã?¤ã??ã?¹"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
-msgstr ""
+msgstr "ã?»ã?³ã??ã?«ã?·ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "ã?»ã?³ã??ã??ã?³ã?»ã?³ã??ã?»ã?°ã?¬ã??ã??ã?£ã?¼ã?³"
 
 msgctxt "CountryInfo"
 msgid "Samoa"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "San Marino"
-msgstr ""
+msgstr "ã?µã?³ã??ã?ªã??"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "ã?µã?³ã??ã?¡ã?»ã??ã?ªã?³ã?·ã??"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "ã?µã?¦ã?¸ã?¢ã?©ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
-msgstr ""
+msgstr "ã?»ã??ã?¬ã?«"
 
 msgctxt "CountryInfo"
 msgid "Serbia"
-msgstr ""
+msgstr "ã?»ã?«ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr ""
+msgstr "�����"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
-msgstr ""
+msgstr "ã?·ã?¨ã?©ã?¬ã?ªã??"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr ""
+msgstr "ã?·ã?³ã?¬ã??ã?¼ã?«"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr ""
+msgstr "ã?¹ã?­ã??ã?­ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr ""
+msgstr "ã?¹ã?­ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr ""
+msgstr "����諸島"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr ""
+msgstr "ã?½ã??ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr ""
+msgstr "å??ã?¢ã??ã?ªã?«"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr ""
+msgstr "ã?¹ã??ã?¤ã?³"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
-msgstr ""
+msgstr "�����"
 
 msgctxt "CountryInfo"
 msgid "Sudan"
-msgstr ""
+msgstr "ã?¹ã?¼ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr ""
+msgstr "ã?¹ã?ªã??ã? "
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr ""
+msgstr "ã?¹ã?¯ã?¸ã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr ""
+msgstr "ã?¹ã?¦ã?§ã?¼ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr ""
+msgstr "������"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr ""
+msgstr "ã?¿ã?³ã?¶ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr ""
+msgstr "ã?¿ã?¤ç??å?½"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "æ?±ã??ã?£ã?¢ã?¼ã?«"
 
 msgctxt "CountryInfo"
 msgid "Togo"
-msgstr ""
+msgstr "ã??ã?¼ã?´"
 
 msgctxt "CountryInfo"
 msgid "Tonga"
-msgstr ""
+msgstr "ã??ã?³ã?¬"
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "ã??ã?ªã??ã??ã?¼ã??ã?»ã??ã??ã?´"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr ""
+msgstr "ã??ã?¥ã??ã?¸ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
-msgstr ""
+msgstr "ã??ã?«ã?³"
 
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
-msgstr ""
+msgstr "ã??ã?«ã?¯ã?¡ã??ã?¹ã?¿ã?³"
 
 msgctxt "CountryInfo"
 msgid "Tuvalu"
-msgstr ""
+msgstr "ã??ã??ã?«"
 
 msgctxt "CountryInfo"
 msgid "Uganda"
-msgstr ""
+msgstr "ã?¦ã?¬ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr ""
+msgstr "ã?¦ã?¯ã?©ã?¤ã??"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "ã?¢ã?©ã??é¦?é?·å?½é?£é?¦"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr ""
+msgstr "ã?¢ã?¡ã?ªã?«å??è¡?å?½"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
-msgstr ""
+msgstr "�����"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr ""
+msgstr "ã?¦ã?ºã??ã?­ã?¹ã?¿ã?³"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
-msgstr ""
+msgstr "ã??ã??ã?¢ã??"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr ""
+msgstr "ã??ã??ã?«ã?³"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
-msgstr ""
+msgstr "ã??ã??ã?ºã?¨ã?©"
 
 msgctxt "CountryInfo"
 msgid "Vietnam"
-msgstr ""
+msgstr "ã??ã??ã??ã? "
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr ""
+msgstr "西ã?µã??ã?©"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr ""
+msgstr "ã?¶ã?³ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
+msgstr "ã?¸ã?³ã??ã??ã?¨"
+
+msgctxt "CountryInfo"
+msgid "Zaire"
 msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr ""
+msgstr "ã?¢ã?«ã??ã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr ""
+msgstr "������"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr ""
+msgstr "ã?ªã?¼ã?¹ã??ã?ªã?¢"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr ""
+msgstr "ã??ã?¼ã?¬ã?¼ã?³"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr ""
+msgstr "ã??ã??ã?³"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr ""
+msgstr "ã?¨ã??ã?ªã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
-msgstr ""
+msgstr "ã??ã?£ã?¸ã?¼"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr ""
+msgstr "ã??ã?£ã?³ã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr ""
+msgstr "����"
 
 msgctxt "CountryInfo"
 msgid "Guam"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr ""
+msgstr "ã??ã?³ã?¬ã?ªã?¼"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr ""
+msgstr "ã?¢ã?¤ã?¹ã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr ""
+msgstr "ã?¤ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr ""
+msgstr "ã?¤ã?³ã??ã??ã?·ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Iran"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr ""
+msgstr "���"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr ""
+msgstr "ã?¢ã?¤ã?«ã?©ã?³ã??"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr ""
+msgstr "å??æ??é®®"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr ""
+msgstr "é??å?½"
 
 msgctxt "CountryInfo"
 msgid "Libya"
-msgstr ""
+msgstr "ã?ªã??ã?¢"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr ""
+msgstr "ã?¢ã?«ã??ã?£ã??"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr ""
+msgstr "ã?¡ã?­ã?·ã?³"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr ""
+msgstr "ã??ã?£ã?³ã??ã?¼"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
+msgstr "å?°æ¹¾"
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr "Vidaliaã??å??èµ·å??ã??ã?¾ã??"
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr "å??èµ·å??ã??ã?¾ã??ã??"
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
@@ -1216,17 +1347,13 @@ msgstr "Tor ã?¸ã?®ã??ã?¹ã?®é?¸æ??"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr ""
+msgstr "ã??ã?­ã?­ã?·ã?®å®?è¡?å?¯è?½ã??ã?¡ã?¤ã?«ã??é?¸æ??"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr "Tor ã?®å®?è¡?ã??ã?¡ã?¤ã?«ã?®å??å??ã??æ??å®?ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??"
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr "ã?·ã?¹ã??ã? ã?®èµ·å??æ??ã?«Vidaliaã??èµ·å??ã??ã??"
 
@@ -1244,27 +1371,27 @@ msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr ""
+msgstr "ã??ã?­ã?­ã?·ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ (ã?ªã??ã?·ã?§ã?³)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr ""
+msgstr "Torã??é??å§?ã??ã??ã?¨ã??ã?«ã??ã?­ã?­ã?·ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??èµ·å??"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr ""
+msgstr "ã??ã?­ã?­ã?·ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?®å¼?æ?°:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr ""
+msgstr "ã?½ã??ã??ã?¦ã?§ã?¢ã?¢ã??ã??ã??ã?¼ã??"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "æ?°ã??ã??ã?¢ã??ã??ã??ã?¼ã??ã??ã?ªã??ã??è?ªå??ç??ã?«ç¢ºèª?"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "ä»?ã??ã??確èª?"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
@@ -1284,11 +1411,11 @@ msgstr "%1 GB"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr ""
+msgstr "å??ä¿¡:"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
-msgstr ""
+msgstr "é??ä¿¡:"
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
@@ -1416,14 +1543,17 @@ msgstr "è¦?ã?¤ã??ã?£ã??ã??ã?­ã?¥ã?¡ã?³ã??"
 
 msgctxt "HelpBrowser"
 msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "ã??ã?«ã??ã?³ã?³ã??ã?³ã??ã?®èª­ã?¿è¾¼ã?¿ã?¨ã?©ã?¼:"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr ""
+msgstr "å¤?é?¨ã?ªã?³ã?¯ã??é??ã??"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1432,19 +1562,21 @@ msgstr ""
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
-msgstr ""
+msgstr "ã?ªã?³ã?¯ã??é??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
-msgstr ""
+msgstr "ã??ã?«ã??ã??ã?¡ã?¤ã?«ã?®è¡¨ç¤ºã?¨ã?©ã?¼:"
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr ""
+msgstr "ã?©ã?¤ã?»ã?³ã?¹æ??å ±"
 
 msgctxt "LicenseDialog"
 msgid "License"
@@ -1452,7 +1584,7 @@ msgstr "�����"
 
 msgctxt "LicenseDialog"
 msgid "Credits"
-msgstr ""
+msgstr "ã?¯ã?¬ã?¸ã??ã??"
 
 msgctxt "LogEvent"
 msgid "Debug"
@@ -1478,9 +1610,33 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr "æ??å ±"
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr "é??ç?¥"
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr "è­¦å??"
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr "���"
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr ""
+msgstr "Torã??å®?è¡?ã??ã??"
 
 msgctxt "MainWindow"
 msgid "Exit"
@@ -1568,7 +1724,7 @@ msgstr "Vidalia ã?¯æ§?æ??ã??ã??ã??ã?¦ã?§ã?? ã??ã?©ã?¦ã?¶ã??èµ·å??ã??ã??ã??ã?¨ã??
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr ""
+msgstr "IMã?¯ã?©ã?¤ã?¢ã?³ã??ã?®èµ·å??ã?¨ã?©ã?¼"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
@@ -1584,49 +1740,45 @@ msgstr "Vidalia ã?¯æ§?æ??ã??ã??ã??ã??ã?­ã?­ã?· ã?µã?¼ã??ã?¼ã??èµ·å??ã??ã??ã??ã?¨
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr ""
+msgstr "ã?ªã?¬ã?¼ã??ã?£ã?¬ã?¯ã??ã?ªã?¸æ?¥ç¶?"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr ""
+msgstr "æ??å?·å??ã??ã??ã??ã??ã?£ã?¬ã?¯ã??ã?ªã?¨ã?®æ?¥ç¶?ã??確ç«?"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
-msgstr ""
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??æ¤?索中"
 
 msgctxt "MainWindow"
 msgid "Loading network status"
-msgstr ""
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??読込中"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr ""
+msgstr "èª?証å±?ã?®ç½²å??ã??読込中"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr ""
+msgstr "ã?ªã?¬ã?¼æ??å ±ã??è¦?æ±?中"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr ""
+msgstr "ã?ªã?¬ã?¼æ??å ±ã??読込中"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr ""
+msgstr "Torã??ã??ã??ã?¯ã??ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
-msgstr ""
+msgstr "Torå??ç·?ã??設置ã??ã?¦ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr "Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¾ã??ã??!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1640,27 +1792,27 @@ msgstr "��"
 
 msgctxt "MainWindow"
 msgid "connection refused"
-msgstr ""
+msgstr "æ?¥ç¶?ã?«å¤±æ??"
 
 msgctxt "MainWindow"
 msgid "connection timeout"
-msgstr ""
+msgstr "æ?¥ç¶?ã?¿ã?¤ã? ã?¢ã?¦ã??"
 
 msgctxt "MainWindow"
 msgid "read/write error"
-msgstr ""
+msgstr "読ã?¿æ?¸ã??ã?¨ã?©ã?¼"
 
 msgctxt "MainWindow"
 msgid "no route to host"
-msgstr ""
+msgstr "ã??ã?¹ã??ã?¸ã?®çµ?è·¯ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
 msgctxt "MainWindow"
 msgid "insufficient resources"
-msgstr ""
+msgstr "���足"
 
 msgctxt "MainWindow"
 msgid "unknown"
-msgstr ""
+msgstr "ä¸?æ??"
 
 msgctxt "MainWindow"
 msgid "Tor is not running"
@@ -1672,35 +1824,37 @@ msgstr "Tor ã?¯ã?·ã?£ã??ã??ã??ã?¦ã?³ã??ã?¦ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr ""
+msgstr "Torã??ä»?ã??ã??ã?«å??æ­¢"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr ""
+msgstr "Torã??å??æ­¢"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
-msgstr ""
+msgstr "Torã?½ã??ã??ã?¦ã?§ã?¢ã??é??å§?中"
 
 msgctxt "MainWindow"
 msgid "Starting Tor"
-msgstr ""
+msgstr "Torã??é??å§?ã??ã?¦ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr "Tor ã?®é??å§?ã?¨ã?©ã?¼"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr "Vidalia ã?¯ Tor ã??é??å§?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??Tor ã?®å®?è¡?ã??ã?¡ã?¤ã?«ã?®æ­£ã??ã??å??å??ã?¨å ´æ??ã??æ??å®?ã??ã??ã?¦ã??ã??ã??ã?¨ã??確å®?ã?«ã??ã??ã?«ã?¯è¨­å®?ã??ã??ã?§ã??ã?¯ã??ã?¾ã??ã??"
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
-msgstr ""
+msgstr "Torã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Connection Error"
-msgstr ""
+msgstr "�����"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
@@ -1708,26 +1862,28 @@ msgstr "ã?ªã?¬ã?¼ã?¯æ??å?¹ã?§ã??"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
-msgstr ""
+msgstr "ã?·ã?£ã??ã??ã??ã?¦ã?³ã?¨ã?©ã?¼"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
-msgstr ""
+msgstr "Vidaliaã?¯Torã??å??æ­¢ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
 msgctxt "MainWindow"
 msgid "Unexpected Error"
-msgstr ""
+msgstr "äº?æ??ã??ã?ªã??ã?¨ã?©ã?¼"
 
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
-msgstr ""
+msgstr "Torã?«èª?証ã??è¡?ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr "Cookie èª?証ã??å¿?è¦?ã?§ã??"
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1740,19 +1896,21 @@ msgstr "ã??ã?¼ã?¿ã??ã?£ã?¬ã?¯ã??ã?ª"
 
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
-msgstr ""
+msgstr "ã?³ã?³ã??ã?­ã?¼ã?«Cookie (control_auth_cookie)"
 
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr "ã?¤ã??ã?³ã??ã?®ç?»é?²ã?¨ã?©ã?¼"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
-msgstr ""
+msgstr "�証���"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
@@ -1767,7 +1925,9 @@ msgid "Tor Update Available"
 msgstr "Tor ã?®æ?´æ?°ã??å?©ç?¨å?¯è?½ã?§ã??"
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr "Tor ã?®ç?¾å?¨ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã??ã??ã?¼ã?¸ã?§ã?³ã?¯æ??é??å??ã??ã?§ã??ã??ã??ã??ã??æ?¨å¥¨ã??ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??æ??æ?°ã?®ã??ã?¼ã?¸ã?§ã?³ã??ã??ã?¦ã?³ã?­ã?¼ã??ã??ã??ã?«ã?¯ Tor ã?®ã?¦ã?§ã??ã?µã?¤ã??ã??訪å??ã??ã?¦ã??ã? ã??ã??ã??"
 
 msgctxt "MainWindow"
@@ -1775,7 +1935,9 @@ msgid "Tor website: %1"
 msgstr "Tor ã?®ã?¦ã?§ã??ã?µã?¤ã??: %1"
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr "ã??ã?¹ã?¦é ?次æ?¥ç¶?ã?¯å?¤ã??æ?¥ç¶?ã?¨ç?°ã?ªã?£ã?¦ã??ã??ã??ã??ã?«ã?¿ã??ã?¾ã??ã??"
 
 msgctxt "MainWindow"
@@ -1784,7 +1946,7 @@ msgstr "æ?°ã??ã??è­?å?¥ã?®ä½?æ??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
-msgstr ""
+msgstr "ã??ã?¼ã??転é??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
@@ -1804,7 +1966,7 @@ msgstr "Vidalia ã?®ã?·ã?§ã?¼ã??ã?«ã??ã??"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "ã?ªã?¬ã?¼ã?®ã?»ã??ã??ã?¢ã??ã??"
+msgstr "ã?ªã?¬ã?¼ã?®ã?»ã??ã??ã?¢ã??ã??\n"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
@@ -1828,11 +1990,11 @@ msgstr "é ?次æ?¥ç¶?ã??æ?°ã??ã??ã?¿ã??ã??"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr ""
+msgstr "æ??è¿?ã?®å¸¯å??å¹?ã?®ä½¿ç?¨ç?¶æ³?ã??é?²è¦§"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr ""
+msgstr "ã?­ã?°ã?¡ã??ã?»ã?¼ã?¸ã?®å±¥æ­´ã??é?²è¦§"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
@@ -1840,7 +2002,7 @@ msgstr "ã??ã?«ã??è³?æ??ã??表示ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
-msgstr ""
+msgstr "Vidaliaã??設å®?ã??ã?¾ã??"
 
 msgctxt "MainWindow"
 msgid "View version and license information"
@@ -1867,15 +2029,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr "Tor ã?®ç?¾å?¨ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã??ã??ã?¼ã?¸ã?§ã?³ã?¯æ??é??å??ã??ã?§ã??ã??ã??ã??ã??æ?¨å¥¨ã??ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??æ??æ?°ã?®ã??ã?¼ã?¸ã?§ã?³ã??ã??ã?¦ã?³ã?­ã?¼ã??ã??ã??ã?«ã?¯ Tor ã?®ã?¦ã?§ã??ã?µã?¤ã??ã??訪å??ã??ã?¦ã??ã? ã??ã??ã??"
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2051,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2065,9 @@ msgid "Your software is up to date"
 msgstr "ã?½ã??ã??ã?¦ã?§ã?¢ã?¯æ??æ?°ç??ã?§ã??"
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2083,67 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Bootstrapping torrc from %1 to %2"
 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?"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr "Vidalia"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
-msgstr "Vidalia ã?«ã?¤ã??ã?¦"
+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 "Home"
-msgstr "ã??ã?¼ã? "
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2387,6 @@ msgid "messages"
 msgstr "件ã?®ã?¡ã??ã?»ã?¼ã?¸"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "常ã?«æ?°ã??ã??ã?­ã?° ã?¡ã??ã?»ã?¼ã?¸ã??ä¿?å­?"
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr "å??ç?§"
 
@@ -2220,34 +2399,56 @@ msgid "Automatically save new log messages to a file"
 msgstr "è?ªå??ç??ã?«ã??ã?¡ã?¤ã?«ã?¸æ?°ã??ã??ã?­ã?° ã?¡ã??ã?»ã?¼ã?¸ã??ä¿?å­?ã??ã?¾ã??"
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr "å?ºæ?¬ç??"
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2357,23 +2558,19 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "ä¸?æ­£ã?ªã??ã?ªã??ã?¸"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "æ??å®?ã??ã??ã??ã??ã?ªã??ã?¸è­?å?¥å­?ã?¯æ??å?¹ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "ã?³ã??ã?¼ (Ctrl+C)"
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr "ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?®ã?¢ã?¯ã?»ã?¹ã?«ã??ã?­ã?­ã?·ã??使ç?¨ã??ã??ã?«ã?¯ Tor ã?®æ§?æ??ã?¸ IP ã?¢ã??ã?¬ã?¹ã?¾ã??ã?¯ã??ã?¹ã??å??ã?¨ã??ã?¼ã??ç?ªå?·ã??両æ?¹æ??å®?ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??"
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr "ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??æ?¥ç¶?ã??許å?¯ã??ã?? 1 ã?¤ã??ã??å¤?ã??ã?®ã??ã?¼ã??ã??æ??å®?ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??"
 
 msgctxt "NetworkPage"
@@ -2393,18 +2590,10 @@ msgid "Proxy Settings"
 msgstr "ã??ã?­ã?­ã?·ã?®è¨­å®?"
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr "HTTP ã??ã?­ã?­ã?·:"
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr "ã?¦ã?¼ã?¶ã?¼å??:"
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr "HTTPS ã?«ã??ã??ã?®ã??ã?­ã?­ã?·ã??使ç?¨ã??ã??"
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr "ã??ã?¹ã?¯ã?¼ã??:"
 
@@ -2433,7 +2622,9 @@ msgid "80, 443"
 msgstr "80, 443"
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2442,21 +2633,13 @@ msgstr "ISP ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?­ã??ã?¯ã??ã??"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
+msgstr "ã??ã?ªã??ã?¸ã?®è¨­å®?"
 
 msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr "ã??ã?ªã??ã?¸ã?®è¿½å? :"
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr "<a href=\"bridges.finding\">ã??ã?ªã??ã?¸ã??è¦?ã?¤ã??ã??ã?«ã?¯?</a>"
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr "ä¸?覧ã??ã??é?¸æ??ã??ã??ã??ã??ã?ªã??ã?¸ã??å??é?¤ã??ã?¾ã??"
 
@@ -2466,7 +2649,7 @@ msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?¸é?¸æ??ã??ã??ã??ã??ã?ªã??ã?¸ã??ã?³ã??ã?¼ã??ã?¾ã??
 
 msgctxt "NetworkPage"
 msgid "Find Bridges Now"
-msgstr ""
+msgstr "ã??ã?ªã??ã?¸ã??æ¤?ç´¢ã??ã?¾ã??"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
@@ -2474,16 +2657,46 @@ msgstr ""
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">ã??ã?ªã??ã?¸ã??æ¤?ç´¢æ?¹æ³?</a>"
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr "ã?¢ã??ã?¬ã?¹:"
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "accept"
@@ -2550,11 +2763,11 @@ msgstr "ä¸?æ??"
 
 msgctxt "RouterInfoDialog"
 msgid "Relay Details"
-msgstr ""
+msgstr "���詳細"
 
 msgctxt "RouterInfoDialog"
 msgid "Summary"
-msgstr ""
+msgstr "��"
 
 msgctxt "RouterInfoDialog"
 msgid "Name:"
@@ -2637,11 +2850,15 @@ msgid "Bridge Support Unavailable"
 msgstr "ã??ã?ªã??ã?¸ ã?µã??ã?¼ã??ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr "æ¤?é?²ã??ã??ã??ã?¦ã?¼ã?¶ã?¼ã?®ã??ã?ªã??ã?¸ ã?ªã?¬ã?¼ã?¨ã?ªã??ã??ã?? Tor ã??æ§?æ??ã??ã?¦ã??ã?¾ã??ã??ã??Tor ã?®ã??ã?¼ã?¸ã?§ã?³ã??ã??ã?ªã??ã?¸ã??ã?µã??ã?¼ã??ã??ã?¾ã??ã??ã??"
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr "Tor ã?½ã??ã??ã?¦ã?§ã?¢ã??ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??ã??ã??é??常ã?® Tor ã?ªã?¬ã?¼ã?¨ã?ªã??ã??ã?? Tor ã??æ§?æ??ã??ã?¦ã??ã? ã??ã??ã??"
 
 msgctxt "ServerPage"
@@ -2657,10 +2874,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?®ã??ã?©ã??ã?£ã??ã?¯ã??ã?ªã?¬ã?¼ã??ã??"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "ã?ªã?¬ã?¼ã?®ã??ã?¼ã??:"
 
@@ -2709,7 +2922,9 @@ msgid "Basic Settings"
 msgstr "��設�"
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr "é«?é??ã?ªã??ã?¦ã?³ã?­ã?¼ã??ã?®é??度ã? ã??ä½?é??ã?ªã?¢ã??ã??ã?­ã?¼ã??ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?¯ã??ã??ã??ã?§ã?¢ã??ã??ã?­ã?¼ã??ã?®é??度ã??è¨?è¼?ã??ã?¦ã??ã? ã??ã??ã??"
 
 msgctxt "ServerPage"
@@ -2765,7 +2980,9 @@ msgid "Peak bandwidth rate limit"
 msgstr "ã??ã?¼ã?¯å¸¯å??å¹?ã?¬ã?¼ã??ã?®å?¶é??ã?§ã??"
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr "帯å??å¹?ã?®æ??大ã?¬ã?¼ã??ã?¯å¸¯å??å¹?ã?®å¹³å??ã?¬ã?¼ã??以ä¸?ã?§ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??両æ?¹ã?®å?¤ã?¯å°?ã?ªã??ã?¨ã?? 20 KB/s ã?§ã??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??"
 
 msgctxt "ServerPage"
@@ -2825,11 +3042,14 @@ msgid "Show help topic on exit policies"
 msgstr "çµ?äº?ã??ã?ªã?·ã?¼ã?®ã??ã?«ã?? ã??ã??ã??ã?¯ã??表示ã??ã?¾ã??"
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3061,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr "ã??ã?®ä»?ã??ã??ã?®è¡?ã?§ä¸?ã??ã?¦ã??ã?ªã??ã?¸ã??ã?¢ã?¯ã?»ã?¹ã??ã??ã??:"
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr "ã??ã??ã?¯ã??ã?®ä»?ã?®äººã??ã?¸ä¸?ã??ã??ã??ã??ã??ã?ªã??ã?¸ ã?ªã?¬ã?¼ã?®è­?å?¥ã?§ã??"
 
 msgctxt "ServerPage"
@@ -2857,7 +3078,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3092,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr "Vidalia ã?¯ %1 ã?®è¨­å®?ã??ä¿?å­?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3110,28 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr "<a href=\"bridges.finding\">ã??ã?ªã??ã?¸ã??è¦?ã?¤ã??ã??ã?«ã?¯?</a>"
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3140,9 @@ 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."
+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"
@@ -2927,7 +3171,7 @@ msgstr ""
 
 msgctxt "ServicePage"
 msgid "Form"
-msgstr ""
+msgstr "ã??ã?©ã?¼ã? "
 
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
@@ -2973,6 +3217,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr "Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr "Tor ã?½ã??ã??ã?¦ã?¨ã?¢ã?®ã?¨ã?©ã?¼"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr "DNSã??ã?¤ã?¸ã?£ã??ã?¯ã??æ¤?å?º"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr "��"
@@ -3025,9 +3514,71 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr "ã?³ã?³ã??ã?­ã?¼ã?« ã??ã?¹ã?¯ã?¼ã??ã?®ã??ã??ã?·ã?¥ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
+msgctxt "TorrcDialog"
+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 "å??ã??å??ã??"
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr "ã?³ã??ã?¼"
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr "è²¼ã??ä»?ã??"
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr "æ?»ã??"
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
-msgstr ""
+msgstr "æ??å??"
 
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
@@ -3055,7 +3606,7 @@ msgstr ""
 
 msgctxt "UPNPControl"
 msgid "Unknown error"
-msgstr ""
+msgstr "ä¸?æ??ã?ªã?¨ã?©ã?¼"
 
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
@@ -3082,11 +3633,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3099,7 +3654,7 @@ msgstr "é??表示ã?«ã??ã??"
 
 msgctxt "UpdateProgressDialog"
 msgid "Downloading updates..."
-msgstr ""
+msgstr "æ?´æ?°ã??ã??ã?¦ã?³ã?­ã?¼ã??ã??ã?¦ã??ã?¾ã??..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Installing updated software..."
@@ -3135,7 +3690,7 @@ msgstr ""
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Install"
-msgstr ""
+msgstr "ã?¤ã?³ã?¹ã??ã?¼ã?«"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
@@ -3242,6 +3797,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 ""
 
@@ -3254,7 +3813,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
diff --git a/src/vidalia/i18n/po/jv/qt_jv.po b/src/vidalia/i18n/po/jv/qt_jv.po
index 625a6e3..581ea6a 100644
--- a/src/vidalia/i18n/po/jv/qt_jv.po
+++ b/src/vidalia/i18n/po/jv/qt_jv.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/jv/vidalia_jv.po b/src/vidalia/i18n/po/jv/vidalia_jv.po
index 22b0f4e..c1faf19 100644
--- a/src/vidalia/i18n/po/jv/vidalia_jv.po
+++ b/src/vidalia/i18n/po/jv/vidalia_jv.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ka/qt_ka.po b/src/vidalia/i18n/po/ka/qt_ka.po
index 0304b2e..6fb4a0e 100644
--- a/src/vidalia/i18n/po/ka/qt_ka.po
+++ b/src/vidalia/i18n/po/ka/qt_ka.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ka/vidalia_ka.po b/src/vidalia/i18n/po/ka/vidalia_ka.po
index cd31a6d..ba7877f 100755
--- a/src/vidalia/i18n/po/ka/vidalia_ka.po
+++ b/src/vidalia/i18n/po/ka/vidalia_ka.po
@@ -1,2682 +1,3816 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-11-24 15:59+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:16
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr ""
 
-#: aboutdialog.ui:53
 msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-#: aboutdialog.ui:88
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-#: aboutdialog.ui:69
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-#: aboutdialog.cpp:53
-msgctxt "AboutDialog"
-msgid "Unavailable"
-msgstr ""
-
-#: aboutdialog.cpp:57
-msgctxt "AboutDialog"
-msgid "Not Running"
-msgstr ""
-
-#: aboutdialog.ui:81
-msgctxt "AboutDialog"
-msgid "0.2.0"
-msgstr ""
-
-#: aboutdialog.ui:106
-msgctxt "AboutDialog"
-msgid "0.2.0.31-alpha-dev (r123456)"
+msgid "License"
 msgstr ""
 
-#: aboutdialog.ui:131
 msgctxt "AboutDialog"
-msgid "4.4.2"
+msgid "Vidalia 0.2.0"
 msgstr ""
 
-#: aboutdialog.ui:107
 msgctxt "AboutDialog"
-msgid "License"
+msgid "Tor 0.2.0.32"
 msgstr ""
 
-#: aboutdialog.ui:163
 msgctxt "AboutDialog"
-msgid "version"
+msgid "Qt 4.4.2"
 msgstr ""
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
-#: advancedpage.cpp:120
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr ""
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr ""
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr ""
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr ""
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr ""
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr ""
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:289
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service."
-""
-"You may need to remove it manually."
-msgstr ""
-
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr ""
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
 msgstr ""
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr ""
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr ""
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
 msgstr ""
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ""
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr ""
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
 msgstr ""
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
 msgstr ""
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
 msgstr ""
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
 msgstr ""
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
 msgstr ""
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
-#: appearancepage.ui:22
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
 
-#: appearancepage.ui:37
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
 msgstr ""
 
-#: appearancepage.ui:75
 msgctxt "AppearancePage"
 msgid "Style"
 msgstr ""
 
-#: appearancepage.ui:103
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
 msgstr ""
 
-#: appearancepage.cpp:67
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
-#: bwgraph.cpp:166
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
 
-#: bwgraph.cpp:232
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
 msgstr ""
 
-#: bwgraph.ui:40
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
 msgstr ""
 
-#: bwgraph.ui:16
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
 msgstr ""
 
-#: bwgraph.ui:63
 msgctxt "BandwidthGraph"
 msgid "Reset"
 msgstr ""
 
-#: bwgraph.ui:151
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
 msgstr ""
 
-#: bwgraph.ui:170
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
 msgstr ""
 
-#: bwgraph.ui:183
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
 msgstr ""
 
-#: bwgraph.ui:234
 msgctxt "BandwidthGraph"
 msgid "Style"
 msgstr ""
 
-#: bwgraph.ui:284
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
 msgstr ""
 
-#: bwgraph.ui:368
 msgctxt "BandwidthGraph"
 msgid "100"
 msgstr ""
 
-#: bwgraph.ui:383
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
 msgstr ""
 
-#: bwgraph.ui:443
 msgctxt "BandwidthGraph"
 msgid "Save"
 msgstr ""
 
-#: bwgraph.ui:450
 msgctxt "BandwidthGraph"
 msgid "Cancel"
 msgstr ""
 
-#: circuit.cpp:112
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
 msgctxt "Circuit"
 msgid "New"
 msgstr ""
 
-#: circuit.cpp:113
 msgctxt "Circuit"
 msgid "Open"
 msgstr ""
 
-#: circuit.cpp:114
 msgctxt "Circuit"
 msgid "Building"
 msgstr ""
 
-#: circuit.cpp:115
 msgctxt "Circuit"
 msgid "Failed"
 msgstr ""
 
-#: circuit.cpp:116
 msgctxt "Circuit"
 msgid "Closed"
 msgstr ""
 
-#: circuit.cpp:117
 msgctxt "Circuit"
 msgid "Unknown"
 msgstr ""
 
-#: circuititem.cpp:39
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Connection"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Status"
 msgstr ""
 
-#: circuitlistwidget.cpp:87
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
 msgstr ""
 
-#: circuitlistwidget.cpp:89
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
 msgstr ""
 
-#: circuitlistwidget.cpp:110
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
 msgstr ""
 
-#: configdialog.cpp:77
 msgctxt "ConfigDialog"
 msgid "General"
 msgstr ""
 
-#: configdialog.cpp:81
 msgctxt "ConfigDialog"
 msgid "Network"
 msgstr ""
 
-#: configdialog.cpp:85
 msgctxt "ConfigDialog"
 msgid "Sharing"
 msgstr ""
 
-#: configdialog.cpp:89
 msgctxt "ConfigDialog"
 msgid "Services"
 msgstr ""
 
-#: configdialog.cpp:93
 msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
-#: configdialog.cpp:97
 msgctxt "ConfigDialog"
 msgid "Advanced"
 msgstr ""
 
-#: configdialog.cpp:111
 msgctxt "ConfigDialog"
 msgid "Help"
 msgstr ""
 
-#: configdialog.cpp:196
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
 msgstr ""
 
-#: configdialog.cpp:198
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
 msgstr ""
 
-#: configdialog.cpp:225
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
 msgstr ""
 
-#: configdialog.cpp:227
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
 msgstr ""
 
-#: configdialog.ui:16
 msgctxt "ConfigDialog"
 msgid "Settings"
 msgstr ""
 
-#: controlconnection.cpp:134
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
 msgstr ""
 
-#: controlconnection.cpp:331
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgid "Remember my password"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
 msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
-#: controlsocket.cpp:70
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlsocket.cpp:80
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
 msgstr ""
 
-#: controlsocket.cpp:117
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
 msgstr ""
 
-#: controlsocket.cpp:156
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
 msgstr ""
 
-#: generalpage.cpp:62
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "CountryInfo"
+msgid "Afghanistan"
 msgstr ""
 
-#: generalpage.cpp:75
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgctxt "CountryInfo"
+msgid "Andorra"
 msgstr ""
 
-#: generalpage.cpp:85
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgctxt "CountryInfo"
+msgid "Angola"
 msgstr ""
 
-#: generalpage.cpp:98
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
 msgstr ""
 
-#: generalpage.cpp:106
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
+msgctxt "CountryInfo"
+msgid "Argentina"
 msgstr ""
 
-#: generalpage.ui:28
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
+msgctxt "CountryInfo"
+msgid "Armenia"
 msgstr ""
 
-#: generalpage.ui:121
-msgctxt "GeneralPage"
-msgid "Browse"
+msgctxt "CountryInfo"
+msgid "Australia"
 msgstr ""
 
-#: generalpage.ui:57
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
 msgstr ""
 
-#: generalpage.ui:51
-msgctxt "GeneralPage"
-msgid "Tor"
+msgctxt "CountryInfo"
+msgid "Bahamas"
 msgstr ""
 
-#: generalpage.ui:93
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
+msgctxt "CountryInfo"
+msgid "Bangladesh"
 msgstr ""
 
-#: generalpage.ui:99
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
+msgctxt "CountryInfo"
+msgid "Barbados"
 msgstr ""
 
-#: generalpage.ui:135
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
+msgctxt "CountryInfo"
+msgid "Belarus"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv: "
+msgctxt "CountryInfo"
+msgid "Belgium"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "CountryInfo"
+msgid "Belize"
 msgstr ""
 
-#: graphframe.cpp:247
-msgctxt "GraphFrame"
-msgid "Sent: "
+msgctxt "CountryInfo"
+msgid "Bhutan"
 msgstr ""
 
-#: graphframe.cpp:259
-msgctxt "GraphFrame"
-msgid "%1 KB"
+msgctxt "CountryInfo"
+msgid "Bolivia"
 msgstr ""
 
-#: graphframe.cpp:262
-msgctxt "GraphFrame"
-msgid "%1 MB"
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
 msgstr ""
 
-#: graphframe.cpp:265
-msgctxt "GraphFrame"
-msgid "%1 GB"
+msgctxt "CountryInfo"
+msgid "Botswana"
 msgstr ""
 
-#: helpbrowser.cpp:135
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents: "
+msgctxt "CountryInfo"
+msgid "Brazil"
 msgstr ""
 
-#: helpbrowser.cpp:147
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
 msgstr ""
 
-#: helpbrowser.cpp:396
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
+msgctxt "CountryInfo"
+msgid "Bulgaria"
 msgstr ""
 
-#: helpbrowser.cpp:398
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
 msgstr ""
 
-#: helpbrowser.cpp:400
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
+msgctxt "CountryInfo"
+msgid "Burundi"
 msgstr ""
 
-#: helpbrowser.cpp:445
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
+msgctxt "CountryInfo"
+msgid "Cambodia"
 msgstr ""
 
-#: helpbrowser.ui:33
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cameroon"
 msgstr ""
 
-#: helpbrowser.ui:484
-msgctxt "HelpBrowser"
-msgid "Back"
+msgctxt "CountryInfo"
+msgid "Canada"
 msgstr ""
 
-#: helpbrowser.ui:487
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
+msgctxt "CountryInfo"
+msgid "Cape Verde"
 msgstr ""
 
-#: helpbrowser.ui:490
-msgctxt "HelpBrowser"
-msgid "Backspace"
+msgctxt "CountryInfo"
+msgid "Central African Republic"
 msgstr ""
 
-#: helpbrowser.ui:498
-msgctxt "HelpBrowser"
-msgid "Forward"
+msgctxt "CountryInfo"
+msgid "Chad"
 msgstr ""
 
-#: helpbrowser.ui:501
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
+msgctxt "CountryInfo"
+msgid "Chile"
 msgstr ""
 
-#: helpbrowser.ui:504
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
+msgctxt "CountryInfo"
+msgid "China"
 msgstr ""
 
-#: helpbrowser.ui:512
-msgctxt "HelpBrowser"
-msgid "Home"
+msgctxt "CountryInfo"
+msgid "Colombia"
 msgstr ""
 
-#: helpbrowser.ui:515
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
+msgctxt "CountryInfo"
+msgid "Comoros"
 msgstr ""
 
-#: helpbrowser.ui:518
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
-#: helpbrowser.ui:535
-msgctxt "HelpBrowser"
-msgid "Find"
+msgctxt "CountryInfo"
+msgid "Congo"
 msgstr ""
 
-#: helpbrowser.ui:538
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgctxt "CountryInfo"
+msgid "Costa Rica"
 msgstr ""
 
-#: helpbrowser.ui:541
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
+msgctxt "CountryInfo"
+msgid "Cote d�Ivoire"
 msgstr ""
 
-#: helpbrowser.ui:549
-msgctxt "HelpBrowser"
-msgid "Close"
+msgctxt "CountryInfo"
+msgid "Croatia"
 msgstr ""
 
-#: helpbrowser.ui:552
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cuba"
 msgstr ""
 
-#: helpbrowser.ui:555
-msgctxt "HelpBrowser"
-msgid "Esc"
+msgctxt "CountryInfo"
+msgid "Cyprus"
 msgstr ""
 
-#: helpbrowser.ui:152
-msgctxt "HelpBrowser"
-msgid "Find:"
+msgctxt "CountryInfo"
+msgid "Czech Republic"
 msgstr ""
 
-#: helpbrowser.ui:174
-msgctxt "HelpBrowser"
-msgid "Find Previous"
+msgctxt "CountryInfo"
+msgid "Denmark"
 msgstr ""
 
-#: helpbrowser.ui:187
-msgctxt "HelpBrowser"
-msgid "Find Next"
+msgctxt "CountryInfo"
+msgid "Djibouti"
 msgstr ""
 
-#: helpbrowser.ui:221
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
+msgctxt "CountryInfo"
+msgid "Dominica"
 msgstr ""
 
-#: helpbrowser.ui:231
-msgctxt "HelpBrowser"
-msgid "Whole words only"
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
 msgstr ""
 
-#: helpbrowser.ui:305
-msgctxt "HelpBrowser"
-msgid "Help Topics"
+msgctxt "CountryInfo"
+msgid "Ecuador"
 msgstr ""
 
-#: helpbrowser.ui:260
-msgctxt "HelpBrowser"
-msgid "Contents"
+msgctxt "CountryInfo"
+msgid "Egypt"
 msgstr ""
 
-#: helpbrowser.ui:350
-msgctxt "HelpBrowser"
-msgid "Search"
+msgctxt "CountryInfo"
+msgid "El Salvador"
 msgstr ""
 
-#: helpbrowser.ui:362
-msgctxt "HelpBrowser"
-msgid "Searching for:"
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
 msgstr ""
 
-#: helpbrowser.ui:405
-msgctxt "HelpBrowser"
-msgid "Found Documents"
+msgctxt "CountryInfo"
+msgid "Eritrea"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file: "
+msgctxt "CountryInfo"
+msgid "Estonia"
 msgstr ""
 
-#: helptextbrowser.cpp:72
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
+msgctxt "CountryInfo"
+msgid "France"
 msgstr ""
 
-#: helptextbrowser.cpp:76
-msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgctxt "CountryInfo"
+msgid "Gabon"
 msgstr ""
 
-#: helptextbrowser.cpp:78
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
+msgctxt "CountryInfo"
+msgid "Gambia"
 msgstr ""
 
-#: helptextbrowser.cpp:88
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
+msgctxt "CountryInfo"
+msgid "Georgia"
 msgstr ""
 
-#: helptextbrowser.cpp:90
-msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgctxt "CountryInfo"
+msgid "Germany"
 msgstr ""
 
-#: licensedialog.ui:13
-msgctxt "LicenseDialog"
-msgid "License Information"
+msgctxt "CountryInfo"
+msgid "Ghana"
 msgstr ""
 
-#: licensedialog.ui:43
-msgctxt "LicenseDialog"
-msgid "License"
+msgctxt "CountryInfo"
+msgid "Grenada"
 msgstr ""
 
-#: licensedialog.ui:76
-msgctxt "LicenseDialog"
-msgid "Credits"
+msgctxt "CountryInfo"
+msgid "Guatemala"
 msgstr ""
 
-#: logevent.cpp:57
-msgctxt "LogEvent"
-msgid "Debug"
+msgctxt "CountryInfo"
+msgid "Guinea"
 msgstr ""
 
-#: logevent.cpp:58
-msgctxt "LogEvent"
-msgid "Info"
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
 msgstr ""
 
-#: logevent.cpp:59
-msgctxt "LogEvent"
-msgid "Notice"
+msgctxt "CountryInfo"
+msgid "Guyana"
 msgstr ""
 
-#: logevent.cpp:60
-msgctxt "LogEvent"
-msgid "Warning"
+msgctxt "CountryInfo"
+msgid "Hong Kong"
 msgstr ""
 
-#: logevent.cpp:61
-msgctxt "LogEvent"
-msgid "Error"
+msgctxt "CountryInfo"
+msgid "Haiti"
 msgstr ""
 
-#: logevent.cpp:62
-msgctxt "LogEvent"
-msgid "Unknown"
+msgctxt "CountryInfo"
+msgid "Honduras"
 msgstr ""
 
-#: mainwindow.ui:233
-msgctxt "MainWindow"
-msgid "Start Tor"
+msgctxt "CountryInfo"
+msgid "Israel"
 msgstr ""
 
-#: mainwindow.ui:443
-msgctxt "MainWindow"
-msgid "Exit"
+msgctxt "CountryInfo"
+msgid "Italy"
 msgstr ""
 
-#: mainwindow.ui:304
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
+msgctxt "CountryInfo"
+msgid "Jamaica"
 msgstr ""
 
-#: mainwindow.ui:317
-msgctxt "MainWindow"
-msgid "Message Log"
+msgctxt "CountryInfo"
+msgid "Japan"
 msgstr ""
 
-#: mainwindow.cpp:348
-msgctxt "MainWindow"
-msgid "Network Map"
+msgctxt "CountryInfo"
+msgid "Jordan"
 msgstr ""
 
-#: mainwindow.cpp:354
-msgctxt "MainWindow"
-msgid "Control Panel"
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
 msgstr ""
 
-#: mainwindow.ui:380
-msgctxt "MainWindow"
-msgid "Settings"
+msgctxt "CountryInfo"
+msgid "Kenya"
 msgstr ""
 
-#: mainwindow.ui:430
-msgctxt "MainWindow"
-msgid "About"
+msgctxt "CountryInfo"
+msgid "Kiribati"
 msgstr ""
 
-#: mainwindow.ui:367
-msgctxt "MainWindow"
-msgid "Help"
+msgctxt "CountryInfo"
+msgid "Kuwait"
 msgstr ""
 
-#: mainwindow.cpp:1391
-msgctxt "MainWindow"
-msgid "New Identity"
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
 msgstr ""
 
-#: mainwindow.cpp:437
-msgctxt "MainWindow"
-msgid "Ctrl+T"
+msgctxt "CountryInfo"
+msgid "Laos"
 msgstr ""
 
-#: mainwindow.cpp:438
-msgctxt "MainWindow"
-msgid "Ctrl+B"
+msgctxt "CountryInfo"
+msgid "Latvia"
 msgstr ""
 
-#: mainwindow.cpp:439
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:440
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:441
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:442
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:443
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:463
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
-#: mainwindow.cpp:468
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:476
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:527
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:528
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:540
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:541
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:562
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:563
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:579
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:583
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:586
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:589
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:592
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:595
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:598
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1132
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:605
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1297
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:612
 msgctxt "MainWindow"
 msgid "Unrecognized startup status"
 msgstr ""
 
-#: mainwindow.cpp:619
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:622
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:625
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:628
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:631
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:634
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:637
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:640
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:643
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:645
-msgctxt "MainWindow"
-msgid " failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:686
-msgctxt "MainWindow"
-msgid "Your relay is shutting down."
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-#: mainwindow.cpp:688
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:693
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:695
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:711
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:859
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:862
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:896
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:906
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:938
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:943
-msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
-""
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-
-#: mainwindow.cpp:965
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:966
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:997
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1001
-msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly."
-""
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-#: mainwindow.cpp:1055
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1075
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1078
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1080
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1087
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1089
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1141
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1143
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1222
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1224
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1226
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1330
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1394
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
-#: mainwindow.cpp:1409
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1458
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1459
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
-msgid "View log message history"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+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."
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1213
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
-#: messagelog.cpp:126
-msgctxt "MessageLog"
-msgid "Messages that appear when something has "
-"gone very wrong and Tor cannot proceed."
+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?"
 msgstr ""
 
-#: messagelog.cpp:128
-msgctxt "MessageLog"
-msgid "Messages that only appear when "
-"something has gone wrong with Tor."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:132
-msgctxt "MessageLog"
-msgid "Messages that appear infrequently "
-"during normal Tor operation and are "
-"not considered errors, but you may "
-"care about."
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr ""
 
-#: messagelog.cpp:310
-msgctxt "MessageLog"
-msgid "Cannot write file %1"
-""
-"%2."
-msgstr ""
-
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
 msgstr ""
 
-#: messagelog.ui:371
 msgctxt "MessageLog"
-msgid "Browse"
+msgid ""
+"Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
+msgid ""
+"Messages that only appear when \n"
+"something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
+msgid ""
+"Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Cannot write file %1\n"
+"\n"
+"%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: networkpage.cpp:193
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid "Invalid Bridge"
 msgstr ""
 
-#: networkpage.cpp:194
 msgctxt "NetworkPage"
 msgid "The specified bridge identifier is not valid."
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgid "Add a Bridge:"
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Remove the selected bridges from the list"
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Copy the selected bridges to the clipboard"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Find Bridges Now"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:139
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:143
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:144
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:148
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:150
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:156
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:100
 msgctxt "RouterDescriptorView"
-msgid "%1 days "
+msgid "Copy"
 msgstr ""
 
-#: routerdescriptorview.cpp:103
-msgctxt "RouterDescriptorView"
-msgid "%1 hours "
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
-msgctxt "RouterDescriptorView"
-msgid "%1 mins "
+msgctxt "RouterInfoDialog"
+msgid "Online"
 msgstr ""
 
-#: routerdescriptorview.cpp:109
-msgctxt "RouterDescriptorView"
-msgid "%1 secs"
+msgctxt "RouterInfoDialog"
+msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:48
-msgctxt "RouterDescriptorView"
-msgid "Copy"
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:140
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:143
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
-#: serverpage.cpp:199
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:263
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:25
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:32
 msgctxt "ServerPage"
 msgid "Relay traffic for the Tor network"
 msgstr ""
 
-#: serverpage.ui:39
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
-msgstr ""
-
-#: serverpage.ui:91
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:110
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:113
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory "
-msgstr ""
-
-#: serverpage.ui:139
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:154
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:164
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:204
-msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-
-#: serverpage.ui:234
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:267
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:279
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:337
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:370
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:380
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:76
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:435
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:466
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:471
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:476
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:481
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:486
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:491
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:456
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
 msgstr ""
 
-#: serverpage.ui:502
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
 msgstr ""
 
-#: serverpage.ui:591
 msgctxt "ServerPage"
-msgid "Average Rate"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:708
 msgctxt "ServerPage"
-msgid "KB/s"
+msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:666
 msgctxt "ServerPage"
-msgid "Maximum Rate"
+msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:695
 msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
+msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:737
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:400
 msgctxt "ServerPage"
-msgid "Bandwidth Limits"
+msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:802
 msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:805
 msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:815
 msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
+msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:818
 msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
+msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:828
 msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:831
 msgctxt "ServerPage"
-msgid "Misc Other Services"
+msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.ui:841
 msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.ui:844
 msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.ui:854
 msgctxt "ServerPage"
-msgid "Port 443"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
-#: serverpage.ui:857
 msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Bridge History"
 msgstr ""
 
-#: serverpage.ui:867
 msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:870
 msgctxt "ServerPage"
-msgid "Websites"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:896
 msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:969
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:979
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
 msgstr ""
 
-#: serverpage.ui:1015
 msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Automatically distribute my bridge address"
 msgstr ""
 
-#: serverpage.ui:1039
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid "Mirror the Relay Directory"
 msgstr ""
 
-#: serverpage.ui:1061
 msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:116
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:123
 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."
+msgid ""
+"Please configure at least a service directory and a virtual port for each "
+"service you want to save. Remove the other ones."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:452
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:458
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:547
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:578
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:598
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:384
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr ""
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:143
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:161
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:103
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: vmessagebox.cpp:77
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr ""
+
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr ""
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:75
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:89
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: main.cpp:95
-msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
-""
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-#: vidalia.cpp:169
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:171
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:173
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:175
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:177
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:180
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:183
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:186
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:190
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:238
 msgctxt "Vidalia"
-msgid "Invalid language code specified: "
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:245
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified: "
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
 msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/km/qt_km.po b/src/vidalia/i18n/po/km/qt_km.po
index ef3663a..e7467ac 100644
--- a/src/vidalia/i18n/po/km/qt_km.po
+++ b/src/vidalia/i18n/po/km/qt_km.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/km/vidalia_km.po b/src/vidalia/i18n/po/km/vidalia_km.po
index cd31a6d..de3a625 100755
--- a/src/vidalia/i18n/po/km/vidalia_km.po
+++ b/src/vidalia/i18n/po/km/vidalia_km.po
@@ -1,2682 +1,3816 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-11-24 15:59+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:16
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr ""
 
-#: aboutdialog.ui:53
 msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-#: aboutdialog.ui:88
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-#: aboutdialog.ui:69
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-#: aboutdialog.cpp:53
-msgctxt "AboutDialog"
-msgid "Unavailable"
-msgstr ""
-
-#: aboutdialog.cpp:57
-msgctxt "AboutDialog"
-msgid "Not Running"
-msgstr ""
-
-#: aboutdialog.ui:81
-msgctxt "AboutDialog"
-msgid "0.2.0"
-msgstr ""
-
-#: aboutdialog.ui:106
-msgctxt "AboutDialog"
-msgid "0.2.0.31-alpha-dev (r123456)"
+msgid "License"
 msgstr ""
 
-#: aboutdialog.ui:131
 msgctxt "AboutDialog"
-msgid "4.4.2"
+msgid "Vidalia 0.2.0"
 msgstr ""
 
-#: aboutdialog.ui:107
 msgctxt "AboutDialog"
-msgid "License"
+msgid "Tor 0.2.0.32"
 msgstr ""
 
-#: aboutdialog.ui:163
 msgctxt "AboutDialog"
-msgid "version"
+msgid "Qt 4.4.2"
 msgstr ""
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
-#: advancedpage.cpp:120
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr ""
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr ""
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr ""
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr ""
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr ""
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr ""
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:289
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service."
-""
-"You may need to remove it manually."
-msgstr ""
-
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr ""
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
 msgstr ""
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr ""
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr ""
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
 msgstr ""
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ""
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr ""
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
 msgstr ""
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
 msgstr ""
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
 msgstr ""
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
 msgstr ""
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
 msgstr ""
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
-#: appearancepage.ui:22
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
 
-#: appearancepage.ui:37
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
 msgstr ""
 
-#: appearancepage.ui:75
 msgctxt "AppearancePage"
 msgid "Style"
 msgstr ""
 
-#: appearancepage.ui:103
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
 msgstr ""
 
-#: appearancepage.cpp:67
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
-#: bwgraph.cpp:166
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
 
-#: bwgraph.cpp:232
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
 msgstr ""
 
-#: bwgraph.ui:40
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
 msgstr ""
 
-#: bwgraph.ui:16
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
 msgstr ""
 
-#: bwgraph.ui:63
 msgctxt "BandwidthGraph"
 msgid "Reset"
 msgstr ""
 
-#: bwgraph.ui:151
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
 msgstr ""
 
-#: bwgraph.ui:170
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
 msgstr ""
 
-#: bwgraph.ui:183
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
 msgstr ""
 
-#: bwgraph.ui:234
 msgctxt "BandwidthGraph"
 msgid "Style"
 msgstr ""
 
-#: bwgraph.ui:284
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
 msgstr ""
 
-#: bwgraph.ui:368
 msgctxt "BandwidthGraph"
 msgid "100"
 msgstr ""
 
-#: bwgraph.ui:383
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
 msgstr ""
 
-#: bwgraph.ui:443
 msgctxt "BandwidthGraph"
 msgid "Save"
 msgstr ""
 
-#: bwgraph.ui:450
 msgctxt "BandwidthGraph"
 msgid "Cancel"
 msgstr ""
 
-#: circuit.cpp:112
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
 msgctxt "Circuit"
 msgid "New"
 msgstr ""
 
-#: circuit.cpp:113
 msgctxt "Circuit"
 msgid "Open"
 msgstr ""
 
-#: circuit.cpp:114
 msgctxt "Circuit"
 msgid "Building"
 msgstr ""
 
-#: circuit.cpp:115
 msgctxt "Circuit"
 msgid "Failed"
 msgstr ""
 
-#: circuit.cpp:116
 msgctxt "Circuit"
 msgid "Closed"
 msgstr ""
 
-#: circuit.cpp:117
 msgctxt "Circuit"
 msgid "Unknown"
 msgstr ""
 
-#: circuititem.cpp:39
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Connection"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Status"
 msgstr ""
 
-#: circuitlistwidget.cpp:87
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
 msgstr ""
 
-#: circuitlistwidget.cpp:89
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
 msgstr ""
 
-#: circuitlistwidget.cpp:110
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
 msgstr ""
 
-#: configdialog.cpp:77
 msgctxt "ConfigDialog"
 msgid "General"
 msgstr ""
 
-#: configdialog.cpp:81
 msgctxt "ConfigDialog"
 msgid "Network"
 msgstr ""
 
-#: configdialog.cpp:85
 msgctxt "ConfigDialog"
 msgid "Sharing"
 msgstr ""
 
-#: configdialog.cpp:89
 msgctxt "ConfigDialog"
 msgid "Services"
 msgstr ""
 
-#: configdialog.cpp:93
 msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
-#: configdialog.cpp:97
 msgctxt "ConfigDialog"
 msgid "Advanced"
 msgstr ""
 
-#: configdialog.cpp:111
 msgctxt "ConfigDialog"
 msgid "Help"
 msgstr ""
 
-#: configdialog.cpp:196
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
 msgstr ""
 
-#: configdialog.cpp:198
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
 msgstr ""
 
-#: configdialog.cpp:225
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
 msgstr ""
 
-#: configdialog.cpp:227
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
 msgstr ""
 
-#: configdialog.ui:16
 msgctxt "ConfigDialog"
 msgid "Settings"
 msgstr ""
 
-#: controlconnection.cpp:134
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
 msgstr ""
 
-#: controlconnection.cpp:331
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgid "Remember my password"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
 msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
-#: controlsocket.cpp:70
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlsocket.cpp:80
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
 msgstr ""
 
-#: controlsocket.cpp:117
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
 msgstr ""
 
-#: controlsocket.cpp:156
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
 msgstr ""
 
-#: generalpage.cpp:62
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "CountryInfo"
+msgid "Afghanistan"
 msgstr ""
 
-#: generalpage.cpp:75
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgctxt "CountryInfo"
+msgid "Andorra"
 msgstr ""
 
-#: generalpage.cpp:85
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgctxt "CountryInfo"
+msgid "Angola"
 msgstr ""
 
-#: generalpage.cpp:98
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
 msgstr ""
 
-#: generalpage.cpp:106
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
+msgctxt "CountryInfo"
+msgid "Argentina"
 msgstr ""
 
-#: generalpage.ui:28
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
+msgctxt "CountryInfo"
+msgid "Armenia"
 msgstr ""
 
-#: generalpage.ui:121
-msgctxt "GeneralPage"
-msgid "Browse"
+msgctxt "CountryInfo"
+msgid "Australia"
 msgstr ""
 
-#: generalpage.ui:57
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
 msgstr ""
 
-#: generalpage.ui:51
-msgctxt "GeneralPage"
-msgid "Tor"
+msgctxt "CountryInfo"
+msgid "Bahamas"
 msgstr ""
 
-#: generalpage.ui:93
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
+msgctxt "CountryInfo"
+msgid "Bangladesh"
 msgstr ""
 
-#: generalpage.ui:99
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
+msgctxt "CountryInfo"
+msgid "Barbados"
 msgstr ""
 
-#: generalpage.ui:135
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
+msgctxt "CountryInfo"
+msgid "Belarus"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv: "
+msgctxt "CountryInfo"
+msgid "Belgium"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "CountryInfo"
+msgid "Belize"
 msgstr ""
 
-#: graphframe.cpp:247
-msgctxt "GraphFrame"
-msgid "Sent: "
+msgctxt "CountryInfo"
+msgid "Bhutan"
 msgstr ""
 
-#: graphframe.cpp:259
-msgctxt "GraphFrame"
-msgid "%1 KB"
+msgctxt "CountryInfo"
+msgid "Bolivia"
 msgstr ""
 
-#: graphframe.cpp:262
-msgctxt "GraphFrame"
-msgid "%1 MB"
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
 msgstr ""
 
-#: graphframe.cpp:265
-msgctxt "GraphFrame"
-msgid "%1 GB"
+msgctxt "CountryInfo"
+msgid "Botswana"
 msgstr ""
 
-#: helpbrowser.cpp:135
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents: "
+msgctxt "CountryInfo"
+msgid "Brazil"
 msgstr ""
 
-#: helpbrowser.cpp:147
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
 msgstr ""
 
-#: helpbrowser.cpp:396
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
+msgctxt "CountryInfo"
+msgid "Bulgaria"
 msgstr ""
 
-#: helpbrowser.cpp:398
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
 msgstr ""
 
-#: helpbrowser.cpp:400
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
+msgctxt "CountryInfo"
+msgid "Burundi"
 msgstr ""
 
-#: helpbrowser.cpp:445
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
+msgctxt "CountryInfo"
+msgid "Cambodia"
 msgstr ""
 
-#: helpbrowser.ui:33
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cameroon"
 msgstr ""
 
-#: helpbrowser.ui:484
-msgctxt "HelpBrowser"
-msgid "Back"
+msgctxt "CountryInfo"
+msgid "Canada"
 msgstr ""
 
-#: helpbrowser.ui:487
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
+msgctxt "CountryInfo"
+msgid "Cape Verde"
 msgstr ""
 
-#: helpbrowser.ui:490
-msgctxt "HelpBrowser"
-msgid "Backspace"
+msgctxt "CountryInfo"
+msgid "Central African Republic"
 msgstr ""
 
-#: helpbrowser.ui:498
-msgctxt "HelpBrowser"
-msgid "Forward"
+msgctxt "CountryInfo"
+msgid "Chad"
 msgstr ""
 
-#: helpbrowser.ui:501
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
+msgctxt "CountryInfo"
+msgid "Chile"
 msgstr ""
 
-#: helpbrowser.ui:504
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
+msgctxt "CountryInfo"
+msgid "China"
 msgstr ""
 
-#: helpbrowser.ui:512
-msgctxt "HelpBrowser"
-msgid "Home"
+msgctxt "CountryInfo"
+msgid "Colombia"
 msgstr ""
 
-#: helpbrowser.ui:515
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
+msgctxt "CountryInfo"
+msgid "Comoros"
 msgstr ""
 
-#: helpbrowser.ui:518
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
-#: helpbrowser.ui:535
-msgctxt "HelpBrowser"
-msgid "Find"
+msgctxt "CountryInfo"
+msgid "Congo"
 msgstr ""
 
-#: helpbrowser.ui:538
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgctxt "CountryInfo"
+msgid "Costa Rica"
 msgstr ""
 
-#: helpbrowser.ui:541
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
+msgctxt "CountryInfo"
+msgid "Cote d�Ivoire"
 msgstr ""
 
-#: helpbrowser.ui:549
-msgctxt "HelpBrowser"
-msgid "Close"
+msgctxt "CountryInfo"
+msgid "Croatia"
 msgstr ""
 
-#: helpbrowser.ui:552
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cuba"
 msgstr ""
 
-#: helpbrowser.ui:555
-msgctxt "HelpBrowser"
-msgid "Esc"
+msgctxt "CountryInfo"
+msgid "Cyprus"
 msgstr ""
 
-#: helpbrowser.ui:152
-msgctxt "HelpBrowser"
-msgid "Find:"
+msgctxt "CountryInfo"
+msgid "Czech Republic"
 msgstr ""
 
-#: helpbrowser.ui:174
-msgctxt "HelpBrowser"
-msgid "Find Previous"
+msgctxt "CountryInfo"
+msgid "Denmark"
 msgstr ""
 
-#: helpbrowser.ui:187
-msgctxt "HelpBrowser"
-msgid "Find Next"
+msgctxt "CountryInfo"
+msgid "Djibouti"
 msgstr ""
 
-#: helpbrowser.ui:221
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
+msgctxt "CountryInfo"
+msgid "Dominica"
 msgstr ""
 
-#: helpbrowser.ui:231
-msgctxt "HelpBrowser"
-msgid "Whole words only"
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
 msgstr ""
 
-#: helpbrowser.ui:305
-msgctxt "HelpBrowser"
-msgid "Help Topics"
+msgctxt "CountryInfo"
+msgid "Ecuador"
 msgstr ""
 
-#: helpbrowser.ui:260
-msgctxt "HelpBrowser"
-msgid "Contents"
+msgctxt "CountryInfo"
+msgid "Egypt"
 msgstr ""
 
-#: helpbrowser.ui:350
-msgctxt "HelpBrowser"
-msgid "Search"
+msgctxt "CountryInfo"
+msgid "El Salvador"
 msgstr ""
 
-#: helpbrowser.ui:362
-msgctxt "HelpBrowser"
-msgid "Searching for:"
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
 msgstr ""
 
-#: helpbrowser.ui:405
-msgctxt "HelpBrowser"
-msgid "Found Documents"
+msgctxt "CountryInfo"
+msgid "Eritrea"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file: "
+msgctxt "CountryInfo"
+msgid "Estonia"
 msgstr ""
 
-#: helptextbrowser.cpp:72
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
+msgctxt "CountryInfo"
+msgid "France"
 msgstr ""
 
-#: helptextbrowser.cpp:76
-msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgctxt "CountryInfo"
+msgid "Gabon"
 msgstr ""
 
-#: helptextbrowser.cpp:78
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
+msgctxt "CountryInfo"
+msgid "Gambia"
 msgstr ""
 
-#: helptextbrowser.cpp:88
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
+msgctxt "CountryInfo"
+msgid "Georgia"
 msgstr ""
 
-#: helptextbrowser.cpp:90
-msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgctxt "CountryInfo"
+msgid "Germany"
 msgstr ""
 
-#: licensedialog.ui:13
-msgctxt "LicenseDialog"
-msgid "License Information"
+msgctxt "CountryInfo"
+msgid "Ghana"
 msgstr ""
 
-#: licensedialog.ui:43
-msgctxt "LicenseDialog"
-msgid "License"
+msgctxt "CountryInfo"
+msgid "Grenada"
 msgstr ""
 
-#: licensedialog.ui:76
-msgctxt "LicenseDialog"
-msgid "Credits"
+msgctxt "CountryInfo"
+msgid "Guatemala"
 msgstr ""
 
-#: logevent.cpp:57
-msgctxt "LogEvent"
-msgid "Debug"
+msgctxt "CountryInfo"
+msgid "Guinea"
 msgstr ""
 
-#: logevent.cpp:58
-msgctxt "LogEvent"
-msgid "Info"
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
 msgstr ""
 
-#: logevent.cpp:59
-msgctxt "LogEvent"
-msgid "Notice"
+msgctxt "CountryInfo"
+msgid "Guyana"
 msgstr ""
 
-#: logevent.cpp:60
-msgctxt "LogEvent"
-msgid "Warning"
+msgctxt "CountryInfo"
+msgid "Hong Kong"
 msgstr ""
 
-#: logevent.cpp:61
-msgctxt "LogEvent"
-msgid "Error"
+msgctxt "CountryInfo"
+msgid "Haiti"
 msgstr ""
 
-#: logevent.cpp:62
-msgctxt "LogEvent"
-msgid "Unknown"
+msgctxt "CountryInfo"
+msgid "Honduras"
 msgstr ""
 
-#: mainwindow.ui:233
-msgctxt "MainWindow"
-msgid "Start Tor"
+msgctxt "CountryInfo"
+msgid "Israel"
 msgstr ""
 
-#: mainwindow.ui:443
-msgctxt "MainWindow"
-msgid "Exit"
+msgctxt "CountryInfo"
+msgid "Italy"
 msgstr ""
 
-#: mainwindow.ui:304
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
+msgctxt "CountryInfo"
+msgid "Jamaica"
 msgstr ""
 
-#: mainwindow.ui:317
-msgctxt "MainWindow"
-msgid "Message Log"
+msgctxt "CountryInfo"
+msgid "Japan"
 msgstr ""
 
-#: mainwindow.cpp:348
-msgctxt "MainWindow"
-msgid "Network Map"
+msgctxt "CountryInfo"
+msgid "Jordan"
 msgstr ""
 
-#: mainwindow.cpp:354
-msgctxt "MainWindow"
-msgid "Control Panel"
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
 msgstr ""
 
-#: mainwindow.ui:380
-msgctxt "MainWindow"
-msgid "Settings"
+msgctxt "CountryInfo"
+msgid "Kenya"
 msgstr ""
 
-#: mainwindow.ui:430
-msgctxt "MainWindow"
-msgid "About"
+msgctxt "CountryInfo"
+msgid "Kiribati"
 msgstr ""
 
-#: mainwindow.ui:367
-msgctxt "MainWindow"
-msgid "Help"
+msgctxt "CountryInfo"
+msgid "Kuwait"
 msgstr ""
 
-#: mainwindow.cpp:1391
-msgctxt "MainWindow"
-msgid "New Identity"
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
 msgstr ""
 
-#: mainwindow.cpp:437
-msgctxt "MainWindow"
-msgid "Ctrl+T"
+msgctxt "CountryInfo"
+msgid "Laos"
 msgstr ""
 
-#: mainwindow.cpp:438
-msgctxt "MainWindow"
-msgid "Ctrl+B"
+msgctxt "CountryInfo"
+msgid "Latvia"
 msgstr ""
 
-#: mainwindow.cpp:439
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:440
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:441
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:442
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:443
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:463
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
-#: mainwindow.cpp:468
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:476
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:527
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:528
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:540
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:541
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:562
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:563
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:579
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:583
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:586
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:589
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:592
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:595
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:598
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1132
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:605
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1297
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:612
 msgctxt "MainWindow"
 msgid "Unrecognized startup status"
 msgstr ""
 
-#: mainwindow.cpp:619
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:622
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:625
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:628
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:631
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:634
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:637
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:640
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:643
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:645
-msgctxt "MainWindow"
-msgid " failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:686
-msgctxt "MainWindow"
-msgid "Your relay is shutting down."
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-#: mainwindow.cpp:688
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:693
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:695
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:711
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:859
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:862
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:896
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:906
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:938
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:943
-msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
-""
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-
-#: mainwindow.cpp:965
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:966
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:997
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1001
-msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly."
-""
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-#: mainwindow.cpp:1055
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1075
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1078
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1080
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1087
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1089
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1141
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1143
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1222
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1224
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1226
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1330
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1394
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
-#: mainwindow.cpp:1409
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1458
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1459
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
-msgid "View log message history"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+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."
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1213
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
-#: messagelog.cpp:126
-msgctxt "MessageLog"
-msgid "Messages that appear when something has "
-"gone very wrong and Tor cannot proceed."
+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?"
 msgstr ""
 
-#: messagelog.cpp:128
-msgctxt "MessageLog"
-msgid "Messages that only appear when "
-"something has gone wrong with Tor."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:132
-msgctxt "MessageLog"
-msgid "Messages that appear infrequently "
-"during normal Tor operation and are "
-"not considered errors, but you may "
-"care about."
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr ""
 
-#: messagelog.cpp:310
-msgctxt "MessageLog"
-msgid "Cannot write file %1"
-""
-"%2."
-msgstr ""
-
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
 msgstr ""
 
-#: messagelog.ui:371
 msgctxt "MessageLog"
-msgid "Browse"
+msgid ""
+"Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
+msgid ""
+"Messages that only appear when \n"
+"something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
+msgid ""
+"Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Cannot write file %1\n"
+"\n"
+"%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: networkpage.cpp:193
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid "Invalid Bridge"
 msgstr ""
 
-#: networkpage.cpp:194
 msgctxt "NetworkPage"
 msgid "The specified bridge identifier is not valid."
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgid "Add a Bridge:"
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Remove the selected bridges from the list"
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Copy the selected bridges to the clipboard"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Find Bridges Now"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:139
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:143
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:144
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:148
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:150
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:156
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:100
 msgctxt "RouterDescriptorView"
-msgid "%1 days "
+msgid "Copy"
 msgstr ""
 
-#: routerdescriptorview.cpp:103
-msgctxt "RouterDescriptorView"
-msgid "%1 hours "
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
-msgctxt "RouterDescriptorView"
-msgid "%1 mins "
+msgctxt "RouterInfoDialog"
+msgid "Online"
 msgstr ""
 
-#: routerdescriptorview.cpp:109
-msgctxt "RouterDescriptorView"
-msgid "%1 secs"
+msgctxt "RouterInfoDialog"
+msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:48
-msgctxt "RouterDescriptorView"
-msgid "Copy"
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:140
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:143
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
-#: serverpage.cpp:199
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:263
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:25
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:32
 msgctxt "ServerPage"
 msgid "Relay traffic for the Tor network"
 msgstr ""
 
-#: serverpage.ui:39
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
-msgstr ""
-
-#: serverpage.ui:91
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:110
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:113
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory "
-msgstr ""
-
-#: serverpage.ui:139
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:154
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:164
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:204
-msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-
-#: serverpage.ui:234
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:267
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:279
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:337
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:370
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:380
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:76
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:435
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:466
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:471
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:476
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:481
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:486
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:491
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:456
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
 msgstr ""
 
-#: serverpage.ui:502
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
 msgstr ""
 
-#: serverpage.ui:591
 msgctxt "ServerPage"
-msgid "Average Rate"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:708
 msgctxt "ServerPage"
-msgid "KB/s"
+msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:666
 msgctxt "ServerPage"
-msgid "Maximum Rate"
+msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:695
 msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
+msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:737
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:400
 msgctxt "ServerPage"
-msgid "Bandwidth Limits"
+msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:802
 msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:805
 msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:815
 msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
+msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:818
 msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
+msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:828
 msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:831
 msgctxt "ServerPage"
-msgid "Misc Other Services"
+msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.ui:841
 msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.ui:844
 msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.ui:854
 msgctxt "ServerPage"
-msgid "Port 443"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
-#: serverpage.ui:857
 msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Bridge History"
 msgstr ""
 
-#: serverpage.ui:867
 msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:870
 msgctxt "ServerPage"
-msgid "Websites"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:896
 msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:969
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:979
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
 msgstr ""
 
-#: serverpage.ui:1015
 msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Automatically distribute my bridge address"
 msgstr ""
 
-#: serverpage.ui:1039
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid "Mirror the Relay Directory"
 msgstr ""
 
-#: serverpage.ui:1061
 msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:116
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:123
 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."
+msgid ""
+"Please configure at least a service directory and a virtual port for each "
+"service you want to save. Remove the other ones."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:452
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:458
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:547
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:578
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:598
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:384
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr ""
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:143
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:161
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:103
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: vmessagebox.cpp:77
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr ""
+
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr ""
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:75
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:89
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: main.cpp:95
-msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
-""
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-#: vidalia.cpp:169
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:171
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:173
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:175
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:177
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:180
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:183
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:186
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:190
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:238
 msgctxt "Vidalia"
-msgid "Invalid language code specified: "
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:245
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified: "
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
 msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/kn/qt_kn.po b/src/vidalia/i18n/po/kn/qt_kn.po
index 9b47f9e..7c449df 100644
--- a/src/vidalia/i18n/po/kn/qt_kn.po
+++ b/src/vidalia/i18n/po/kn/qt_kn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/kn/vidalia_kn.po b/src/vidalia/i18n/po/kn/vidalia_kn.po
index 98e8628..c1c67e9 100644
--- a/src/vidalia/i18n/po/kn/vidalia_kn.po
+++ b/src/vidalia/i18n/po/kn/vidalia_kn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ko/qt_ko.po b/src/vidalia/i18n/po/ko/qt_ko.po
index 02a7095..1599c8d 100644
--- a/src/vidalia/i18n/po/ko/qt_ko.po
+++ b/src/vidalia/i18n/po/ko/qt_ko.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <cwt967@xxxxxxxxx>, 2011.
 msgid ""
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-09-04 05:17+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: cwt96 <cwt967@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -432,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/ko/vidalia_ko.po b/src/vidalia/i18n/po/ko/vidalia_ko.po
index 4444f3e..386085d 100755
--- a/src/vidalia/i18n/po/ko/vidalia_ko.po
+++ b/src/vidalia/i18n/po/ko/vidalia_ko.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-03 07:12+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: cwt96 <cwt967@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -201,13 +201,17 @@ 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"
-"ì??ë??ì ?ì?¼ë¡? ì ?ê±°í?´ 주ì?­ì??ì?¤."
+msgstr "Vidaliaë?? Tor ì??ë¹?ì?¤ë¥¼ ì ?ê°?í??ì§? 못í??ì?µë??ë?¤.\n\nì??ë??ì ?ì?¼ë¡? ì ?ê±°í?´ 주ì?­ì??ì?¤."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -229,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidaliaë?? ì? í??ë?? ì?¸ì?´ ë²?ì?­ì?? ì?½ì§? 못í??ì?µë??ë?¤."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "since:"
@@ -1297,18 +1318,14 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"문ì ?를 ì??ë³?í??ê³  í?´ê²°ì?? ë??ì??ì?´ ë??ë?? 충ë?? ë³´ê³ ì??ë?? Vidalia ê°?ë°?ì??ì??ê²? ë³´ë?¼ ì?? ì??ê²? ë§?ë?¤ì?´ì¡?ì?µë??ë?¤. ì ?ì¶?ë?? ë³´ê³ ì??ë?? ê°?ì?¸ ì??ë³? "
-"ì ?보를 í?¬í?¨í??ì§? ì??ì?µë??ë?¤."
+msgstr "문ì ?를 ì??ë³?í??ê³  í?´ê²°ì?? ë??ì??ì?´ ë??ë?? 충ë?? ë³´ê³ ì??ë?? Vidalia ê°?ë°?ì??ì??ê²? ë³´ë?¼ ì?? ì??ê²? ë§?ë?¤ì?´ì¡?ì?µë??ë?¤. ì ?ì¶?ë?? ë³´ê³ ì??ë?? ê°?ì?¸ ì??ë³? ì ?보를 í?¬í?¨í??ì§? ì??ì?µë??ë?¤."
 
 msgctxt "CrashReportDialog"
 msgid ""
@@ -1533,9 +1550,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidaliaë?? ë?¹ì? ì?? 기본 ë¸?ë?¼ì?°ì ?ì??ì?? ì? í??í?? ë§?í?¬ë¥¼ ì?´ì?? ì??ì?µë??ë?¤. ë§?ì?½ ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?ê°? Tor를 ì?¬ì?©í?  ì?? ì??ê²? ì?¤ì ?ë??ì?´ì??ë?¤ "
-"ì??ë?¤ë©´ ë§?í?¬ì?? ì??ì²­ì?? ì?µëª?í??ê°? ì?? ë??ì??ì??ì?? ì??ì?µë??ë?¤."
+msgstr "Vidaliaë?? ë?¹ì? ì?? 기본 ë¸?ë?¼ì?°ì ?ì??ì?? ì? í??í?? ë§?í?¬ë¥¼ ì?´ì?? ì??ì?µë??ë?¤. ë§?ì?½ ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?ê°? Tor를 ì?¬ì?©í?  ì?? ì??ê²? ì?¤ì ?ë??ì?´ì??ë?¤ ì??ë?¤ë©´ ë§?í?¬ì?? ì??ì²­ì?? ì?µëª?í??ê°? ì?? ë??ì??ì??ì?? ì??ì?µë??ë?¤."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1549,8 +1564,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidaliaë?? ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?ì??ì?? ì? í??í?? ë§?í?¬ë¥¼ ì?¬ë??ë?° ì?¤í?¨í??ì??ì?µë??ë?¤. ê·¸ë??ë?? URLì?? ë³µì?¬í??ì?¬ ë¸?ë?¼ì?°ì ?ë¡? ì?¬ì?¤ ì?? ì??ì?µë??ë?¤"
+msgstr "Vidaliaë?? ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?ì??ì?? ì? í??í?? ë§?í?¬ë¥¼ ì?¬ë??ë?° ì?¤í?¨í??ì??ì?µë??ë?¤. ê·¸ë??ë?? URLì?? ë³µì?¬í??ì?¬ ë¸?ë?¼ì?°ì ?ë¡? ì?¬ì?¤ ì?? ì??ì?µë??ë?¤"
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1761,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²° ì?±ê³µ!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "ì?? ì??ì??ë?? ì??ì?? ì??í??"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "ì?¡ë??ì?¬ë??"
 
@@ -1914,8 +1924,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"ì§?ê¸? ì?¤ì¹?ë?? Torì?? ë²?ì ?ì?? ë? ì§?ê°? ì§?ë??ì?? ë??ì?´ì?? ì¶?ì²?ë??ì§? ì??ì?µë??ë?¤. Tor ì?¹ì?¬ì?´í?¸ì?? ì ?ì??í??ì??ì?? ìµ?ì?  ë²?ì ?ì?? ë°?ì?? 주ì?­ì??ì?¤."
+msgstr "ì§?ê¸? ì?¤ì¹?ë?? Torì?? ë²?ì ?ì?? ë? ì§?ê°? ì§?ë??ì?? ë??ì?´ì?? ì¶?ì²?ë??ì§? ì??ì?µë??ë?¤. Tor ì?¹ì?¬ì?´í?¸ì?? ì ?ì??í??ì??ì?? ìµ?ì?  ë²?ì ?ì?? ë°?ì?? 주ì?­ì??ì?¤."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2020,9 +2029,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidaliaë?? Tor ì ?ì?´ ë¹?ë°?ë²?í?¸ë¥¼ ë³?ê²½í??ë ¤ í??ì§?ë§?, Tor ì??í??í?¸ì?¨ì?´ë¥¼ ì?¬ì??ì?? í?  ì?? ì??ì?µë??ë?¤. í??ë¡?ì?¸ì?¤ê°? ì??ë??ì¤?ì?¸ì§? ì??ì?? "
-"ê´?리ì??ì??ì?? í??ì?¸í??ì?¬ 주ì?­ì??ì?¤,."
+msgstr "Vidaliaë?? Tor ì ?ì?´ ë¹?ë°?ë²?í?¸ë¥¼ ë³?ê²½í??ë ¤ í??ì§?ë§?, Tor ì??í??í?¸ì?¨ì?´ë¥¼ ì?¬ì??ì?? í?  ì?? ì??ì?µë??ë?¤. í??ë¡?ì?¸ì?¤ê°? ì??ë??ì¤?ì?¸ì§? ì??ì?? ê´?리ì??ì??ì?? í??ì?¸í??ì?¬ 주ì?­ì??ì?¤,."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2076,9 +2083,25 @@ 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."
-msgstr ""
-"ì?´ ì?°ê²°ì?? í?µí?´ ë³´ë?¸ ì??무ê²?ì?´ë?? 모ë??í?°ë§? í?  ì?? ì??ì?µë??ë?¤. ê°?ë?¥í??ë©´ ì??ì?© í??ë¡?ê·¸ë?¨ì?? ì?¤ì ?ì?? í??ì?¸ SSL (Secure Socket "
-"Layer)ê°?ì?? ì??í?¸í??ë?? í??ë¡?í? ì½? ë§?ì?? ì?¬ì?©í??ì??기 ë°?ë??ë??ë?¤."
+msgstr "ì?´ ì?°ê²°ì?? í?µí?´ ë³´ë?¸ ì??무ê²?ì?´ë?? 모ë??í?°ë§? í?  ì?? ì??ì?µë??ë?¤. ê°?ë?¥í??ë©´ ì??ì?© í??ë¡?ê·¸ë?¨ì?? ì?¤ì ?ì?? í??ì?¸ SSL (Secure Socket Layer)ê°?ì?? ì??í?¸í??ë?? í??ë¡?í? ì½? ë§?ì?? ì?¬ì?©í??ì??기 ë°?ë??ë??ë?¤."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "%1ì??ì?? %2ë¡? ë¶?í?? "
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(probably Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(ì??ë§? ì?´ë©?ì?¼ í?´ë?¼ì?´ì?¸í?¸)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "ì??ì?© í??ë¡?ê·¸ë?¨ %1 ì¤? í??ë??ë?? í?¬í?¸ %2ì?? ì? ì?¬ì ?ì?¼ë¡? ì??í?¸í??ë??ì§? ì??ê³  ì??ì ?í??ì§? ì??ì?? ì?°ê²°ì?? ë§?ë??ë?? ê²? ê°?ì?µë??ë?¤."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2091,41 +2114,33 @@ msgid ""
 msgstr "í??ì?¬ ì¤?ê³?ê°? ì¢?ë£?ì¤?ì??ë??ë?¤. ì¤?ê³?를 ì§?ê¸? ì¢?ë£?í??려면 ë©?춤 ë²?í?¼ì?? ë?¤ì?? ë??ë?¬ì£¼ì?­ì??ì?¤."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1ì??ì?? %2ë¡? ë¶?í?? "
-
-msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ""
-"Vidaliaë?? Torê°? ì??기ì¹? 못í??ê²? ì¢?ë£?ë?? ê²?ì?? ê°?ì§?í??ì?µë??ë?¤.\n"
-"\n"
-"ìµ?ê·¼ì?? 경고ë?? ì?¤ë¥? ë©?ì??ì§?를 í??ì?¸í??ì?¬ 주ì?­ì??ì?¤."
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probably Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(ì??ë§? ì?´ë©?ì?¼ í?´ë?¼ì?´ì?¸í?¸)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "ì¤?ê³?ê°? í??ì?¬ ì??ë??ì¤? ì??ë??ë?¤. ì¤?ê³?를 ì¤?ë?¨í??ì??ë©´ í?´ë?¼ì?´ì?¸í?¸ì??ì?? ê²°ì?´ ë??ì?´ì§?ë??ë?¤. í?´ë?¼ì?´ì?¸í?¸ê°? ì??ë¡?ì?´ 릴ë ?ì?´ë¥¼ ì°¾ì?? ì?? ì??ê²? ì??ê°?ì?? 주ì??ê² ì?µë??ê¹??"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "ì??ì?© í??ë¡?ê·¸ë?¨ %1 ì¤? í??ë??ë?? í?¬í?¸ %2ì?? ì? ì?¬ì ?ì?¼ë¡? ì??í?¸í??ë??ì§? ì??ê³  ì??ì ?í??ì§? ì??ì?? ì?°ê²°ì?? ë§?ë??ë?? ê²? ê°?ì?µë??ë?¤."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidaliaë?? Torê°? ì??기ì¹? 못í??ê²? ì¢?ë£?ë?? ê²?ì?? ê°?ì§?í??ì?µë??ë?¤.\n\nìµ?ê·¼ì?? 경고ë?? ì?¤ë¥? ë©?ì??ì§?를 í??ì?¸í??ì?¬ 주ì?­ì??ì?¤."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2321,9 +2336,7 @@ msgstr "ë©?ì??ì§? ë¡?ì?¤ ì?¤ì ? ì ?ì?¥"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
-msgstr ""
-"ì¤?ê³?ê°? í??ì?¬ ì??ë??ì¤? ì??ë??ë?¤. ì¤?ê³?를 ì¤?ë?¨í??ì??ë©´ í?´ë?¼ì?´ì?¸í?¸ì??ì?? ê²°ì?´ ë??ì?´ì§?ë??ë?¤. í?´ë?¼ì?´ì?¸í?¸ê°? ì??ë¡?ì?´ 릴ë ?ì?´ë¥¼ ì°¾ì?? ì?? ì??ê²? ì??ê°?ì?? "
-"주ì??ê² ì?µë??ê¹??"
+msgstr "ì¤?ê³?ê°? í??ì?¬ ì??ë??ì¤? ì??ë??ë?¤. ì¤?ê³?를 ì¤?ë?¨í??ì??ë©´ í?´ë?¼ì?´ì?¸í?¸ì??ì?? ê²°ì?´ ë??ì?´ì§?ë??ë?¤. í?´ë?¼ì?´ì?¸í?¸ê°? ì??ë¡?ì?´ 릴ë ?ì?´ë¥¼ ì°¾ì?? ì?? ì??ê²? ì??ê°?ì?? 주ì??ê² ì?µë??ê¹??"
 
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
@@ -2434,10 +2447,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"í??ì?¼ %1를(ì??) ì?¸ ì?? ì??ì?µë??ë?¤.\n"
-"\n"
-"%2."
+msgstr "í??ì?¼ %1를(ì??) ì?¸ ì?? ì??ì?µë??ë?¤.\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2544,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "ì??못ë?? ë¸?릿ì§?"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "주ì?´ì§? Bridge ì??ë³?ì??ë?? ë¶?ë??ì??ë??ë?¤."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "복� (Ctrl+C)"
 
@@ -2684,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "ë??ì??"
@@ -2868,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "í?´ë?¼ì?´ì?¸í?¸ë§? ì??ë??"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr " Tor ë?¤í?¸ì??í?¬ë¥¼ ì??í??ì?¬ í?¸ë??í?½ì?? ì¤?ê³?í?©ë??ë?¤.(ì¶?ì²?)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "�� ��"
 
@@ -3116,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "ì??ë??ì ?ì?¼ë¡? ë??ì?? ë¸?릿ì§? 주ì?? ë°°í?¬"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "ì¤?ê³?ì?? 목ë¡?를 미ë?¬"
 
@@ -3123,8 +3129,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"ê·?í??ì?? ì¤?ê³?ì?? ë??í?? 문ì ?ê°? ì??ì?? ê²½ì?° ì?°ë?½ì?? ë°?ì?? ì?? ì??ë?? ì?´ë©?ì?¼ 주ì??:ê·?í??ë?? ë??í?? PGPë?? GPG ì?¸ì¦?ë²?í?¸ë¥¼ í?¬í?¨í?  ì??ë?? ì??ì?µë??ë?¤."
+msgstr "ê·?í??ì?? ì¤?ê³?ì?? ë??í?? 문ì ?ê°? ì??ì?? ê²½ì?° ì?°ë?½ì?? ë°?ì?? ì?? ì??ë?? ì?´ë©?ì?¼ 주ì??:ê·?í??ë?? ë??í?? PGPë?? GPG ì?¸ì¦?ë²?í?¸ë¥¼ í?¬í?¨í?  ì??ë?? ì??ì?µë??ë?¤."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3229,9 +3234,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"í? ë¥´ ì??í??í?¸ì?¨ì?´ë¥¼ ë?¤ì?? ì??ì??í??려면 Vidalia ì ?ì?´í??ì??ì?? \"í? ë¥´ ì??ì??\"ì?? í?´ë¦­í??ì?­ì??ì?¤. í? ë¥´ê°? ì??기ì¹? ì??ê²? ì¢?ë£?í?? ê²½ì?°, ë°?ì??í?? "
-"ì?¤ë¥?ì?? ë??í?? ì??ì?¸í?? ë?´ì?©ì?? ì??ì?? \"ê³ ê¸?\"í?­ì?? ì? í??í?©ë??ë?¤."
+msgstr "í? ë¥´ ì??í??í?¸ì?¨ì?´ë¥¼ ë?¤ì?? ì??ì??í??려면 Vidalia ì ?ì?´í??ì??ì?? \"í? ë¥´ ì??ì??\"ì?? í?´ë¦­í??ì?­ì??ì?¤. í? ë¥´ê°? ì??기ì¹? ì??ê²? ì¢?ë£?í?? ê²½ì?°, ë°?ì??í?? ì?¤ë¥?ì?? ë??í?? ì??ì?¸í?? ë?´ì?©ì?? ì??ì?? \"ê³ ê¸?\"í?­ì?? ì? í??í?©ë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3239,9 +3242,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"í??ì?¬ ë?? ì?´ì?? ì¶?ì²?ë??ì§? ì??ë?? Tor ë²?ì ? \"%1\"ì?? ì?¬ì?©í??ê³  ì??ì?µë??ë?¤. ì¤?ì??í?? ë³´ì??, ì??ì ?ì?± ë°? ì?±ë?¥ ì??ì ?ì?? í?¬í?¨í?  ì?? ì??ë?? "
-"ì??í??í?¸ì?¨ì?´ì?? ê°?ì?¥ ìµ?ê·¼ ë²?ì ?ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í??ì?­ì??ì?¤."
+msgstr "í??ì?¬ ë?? ì?´ì?? ì¶?ì²?ë??ì§? ì??ë?? Tor ë²?ì ? \"%1\"ì?? ì?¬ì?©í??ê³  ì??ì?µë??ë?¤. ì¤?ì??í?? ë³´ì??, ì??ì ?ì?± ë°? ì?±ë?¥ ì??ì ?ì?? í?¬í?¨í?  ì?? ì??ë?? ì??í??í?¸ì?¨ì?´ì?? ê°?ì?¥ ìµ?ê·¼ ë²?ì ?ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í??ì?­ì??ì?¤."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3249,9 +3250,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"í??ì?¬ ë?? ì?´ì?? Tor ë?¤í?¸ì??í?¬ì?? ì?¬ì?©ë?  ì?? ì??ë?? Tor ë²?ì ? \"%1\"ì?? ì?¬ì?©í??ê³  ì??ì?µë??ë?¤. ì¤?ì??í?? ë³´ì??, ì??ì ?ì?± ë°? ì?±ë?¥ ì??ì ?ì?? "
-"í?¬í?¨í?  ì?? ì??ë?? ì??í??í?¸ì?¨ì?´ì?? ê°?ì?¥ ìµ?ê·¼ ë²?ì ?ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í??ì?­ì??ì?¤ ."
+msgstr "í??ì?¬ ë?? ì?´ì?? Tor ë?¤í?¸ì??í?¬ì?? ì?¬ì?©ë?  ì?? ì??ë?? Tor ë²?ì ? \"%1\"ì?? ì?¬ì?©í??ê³  ì??ì?µë??ë?¤. ì¤?ì??í?? ë³´ì??, ì??ì ?ì?± ë°? ì?±ë?¥ ì??ì ?ì?? í?¬í?¨í?  ì?? ì??ë?? ì??í??í?¸ì?¨ì?´ì?? ê°?ì?¥ ìµ?ê·¼ ë²?ì ?ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í??ì?­ì??ì?¤ ."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3275,9 +3274,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"í? ë¥´ ì??í??í?¸ì?¨ì?´ì?? ë?´ë¶? ë²?ê·¸ê°? ë°?ì??í??ì?µë??ë?¤. bugs.torproject.orgì??ì?? í? ë¥´ ê°?ë°?ì??ì??ê²? ë?¤ì??ê³¼ ê°?ì?? ì?¤ë¥? ë©?ì??ì§?를 "
-"ì??려주ì?­ì??ì?¤ : \"%1\""
+msgstr "í? ë¥´ ì??í??í?¸ì?¨ì?´ì?? ë?´ë¶? ë²?ê·¸ê°? ë°?ì??í??ì?µë??ë?¤. bugs.torproject.orgì??ì?? í? ë¥´ ê°?ë°?ì??ì??ê²? ë?¤ì??ê³¼ ê°?ì?? ì?¤ë¥? ë©?ì??ì§?를 ì??려주ì?­ì??ì?¤ : \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3285,9 +3282,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"í? ë¥´ë?? ì»´í?¨í?°ì?? ì??ê³?ê°? ì??본 \"%2\"ì?? ë¹?í?´ 과거ë¡? %1 ì´?ë¡? ì?¤ì ?ë??ì??ë?¤ë?? ê²?ì?? í??ì?¸í??ì?µë??ë?¤. ì??ê³?ê°? ì ?í??í??ì§? ì??ì?¼ë©´ í? ë¥´ 기ë?¥ ì?? "
-"ê°?ë?¥í??ì§? ì??ì?µë??ë?¤. ì»´í?¨í?°ê°? ì ?í??í?? ì??ê°?ì?? í??ì??í??ë??ë¡? í??ì?¸í??ì?­ì??ì?¤."
+msgstr "í? ë¥´ë?? ì»´í?¨í?°ì?? ì??ê³?ê°? ì??본 \"%2\"ì?? ë¹?í?´ 과거ë¡? %1 ì´?ë¡? ì?¤ì ?ë??ì??ë?¤ë?? ê²?ì?? í??ì?¸í??ì?µë??ë?¤. ì??ê³?ê°? ì ?í??í??ì§? ì??ì?¼ë©´ í? ë¥´ 기ë?¥ ì?? ê°?ë?¥í??ì§? ì??ì?µë??ë?¤. ì»´í?¨í?°ê°? ì ?í??í?? ì??ê°?ì?? í??ì??í??ë??ë¡? í??ì?¸í??ì?­ì??ì?¤."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3295,9 +3290,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"í? ë¥´ë?? ì»´í?¨í?°ì?? ì??ê³?ê°? ì??본 \"%2\"ì?? ë¹?í?´ 미컽ë¡? %1 ì´?ë¡? ì?¤ì ?ë??ì??ë?¤ë?? ê²?ì?? í??ì?¸í??ì?µë??ë?¤. ì??ê³?ê°? ì ?í??í??ì§? ì??ì?¼ë©´ í? ë¥´ 기ë?¥ ì?? "
-"ê°?ë?¥í??ì§? ì??ì?µë??ë?¤. ì»´í?¨í?°ê°? ì ?í??í?? ì??ê°?ì?? í??ì??í??ë??ë¡? í??ì?¸í??ì?­ì??ì?¤."
+msgstr "í? ë¥´ë?? ì»´í?¨í?°ì?? ì??ê³?ê°? ì??본 \"%2\"ì?? ë¹?í?´ 미컽ë¡? %1 ì´?ë¡? ì?¤ì ?ë??ì??ë?¤ë?? ê²?ì?? í??ì?¸í??ì?µë??ë?¤. ì??ê³?ê°? ì ?í??í??ì§? ì??ì?¼ë©´ í? ë¥´ 기ë?¥ ì?? ê°?ë?¥í??ì§? ì??ì?µë??ë?¤. ì»´í?¨í?°ê°? ì ?í??í?? ì??ê°?ì?? í??ì??í??ë??ë¡? í??ì?¸í??ì?­ì??ì?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3309,19 +3302,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"ì»´í?¨í?°ì?? ì??ë?? ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ê°? í? ë¥´ë¥¼ í?µí?´ %1 í?¬í?¸ì?? ì??í?¸í??ë??ì§? ì??ì?? ì?°ê²°ì?? í??ë??ë¡? ì??ë?? í?  ì?? ì??ì?µë??ë?¤. í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ "
-"í?µí?´ ì??í?¸í??ë??ì§? ì??ì?? ì ?보를 ë³´ë?´ë?? ê²?ì?? ì??í??í??ê³  ì¶?ì²?ë??ì§? ì??ì?µë??ë?¤. ê·?í??ì?? ì ?보를 ë³´í?¸í??기 ì??í?´, í? ë¥´ë?? ì??ë??ì?¼ë¡? ì?´ ì?°ê²°ì?? "
-"ë?«ì??ì?µë??ë?¤."
+msgstr "ì»´í?¨í?°ì?? ì??ë?? ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ê°? í? ë¥´ë¥¼ í?µí?´ %1 í?¬í?¸ì?? ì??í?¸í??ë??ì§? ì??ì?? ì?°ê²°ì?? í??ë??ë¡? ì??ë?? í?  ì?? ì??ì?µë??ë?¤. í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ í?µí?´ ì??í?¸í??ë??ì§? ì??ì?? ì ?보를 ë³´ë?´ë?? ê²?ì?? ì??í??í??ê³  ì¶?ì²?ë??ì§? ì??ì?µë??ë?¤. ê·?í??ì?? ì ?보를 ë³´í?¸í??기 ì??í?´, í? ë¥´ë?? ì??ë??ì?¼ë¡? ì?´ ì?°ê²°ì?? ë?«ì??ì?µë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"ì»´í?¨í?°ì?? ì??ë?? ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ê°? í? ë¥´ë¥¼ í?µí?´ %1 í?¬í?¸ì?? ì??í?¸í??ë??ì§? ì??ì?? ì?°ê²°ì?? í??ë??ë¡? ì??ë?? í?  ì?? ì??ì?µë??ë?¤. í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ "
-"í?µí?´ ì??í?¸í??ë??ì§? ì??ì?? ì ?보를 ë³´ë?´ë?? ê²?ì?? ì??í??í??ê³  ì¶?ì²?ë??ì§? ì??ì?µë??ë?¤."
+msgstr "ì»´í?¨í?°ì?? ì??ë?? ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ê°? í? ë¥´ë¥¼ í?µí?´ %1 í?¬í?¸ì?? ì??í?¸í??ë??ì§? ì??ì?? ì?°ê²°ì?? í??ë??ë¡? ì??ë?? í?  ì?? ì??ì?µë??ë?¤. í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ í?µí?´ ì??í?¸í??ë??ì§? ì??ì?? ì ?보를 ë³´ë?´ë?? ê²?ì?? ì??í??í??ê³  ì¶?ì²?ë??ì§? ì??ì?µë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3333,9 +3321,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ê°? 목ì ?ì§?ì?? ë??í?? ì ?보를 ë??ì?¤í?  ì?? ì??ë?? í??ë¡?í? ì½?ì?? ì?¬ì?©í??ì?¬ \"%1\"ì?? í? ë¥´ë¥¼ í?µí?´ ì?°ê²°ì?? ì?¤ë¦½í??ì?µë??ë?¤. ê·?í??ì??"
-" ì??ì?© í??ë¡?ê·¸ë?¨ì?´ ì??격 í?¸ì?¤í?¸ ì?´ë¦? í??ì?¸ì?? ì?¤ì§? SOCKS4a í?¹ì?? SOCKS5를 ì?¬ì?©í??ë??ë¡? 구ì?±í??ê³  í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
+msgstr "ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ê°? 목ì ?ì§?ì?? ë??í?? ì ?보를 ë??ì?¤í?  ì?? ì??ë?? í??ë¡?í? ì½?ì?? ì?¬ì?©í??ì?¬ \"%1\"ì?? í? ë¥´ë¥¼ í?µí?´ ì?°ê²°ì?? ì?¤ë¦½í??ì?µë??ë?¤. ê·?í??ì?? ì??ì?© í??ë¡?ê·¸ë?¨ì?´ ì??격 í?¸ì?¤í?¸ ì?´ë¦? í??ì?¸ì?? ì?¤ì§? SOCKS4a í?¹ì?? SOCKS5를 ì?¬ì?©í??ë??ë¡? 구ì?±í??ê³  í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3346,9 +3332,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ë?? í? ë¥´ê°? ì?´í?´í?  ì?? ì??ë?? í??ë¡?í? ì½?ì?? ì?¬ì?©í??ì?¬ í? ë¥´ë¥¼ í?µí?´ ì?°ê²°ì?? ì?¤ì ?í??ë ¤ í??ì?µë??ë?¤.. ê·?í??ì?? ì??ì?© í??ë¡?ê·¸ë?¨ì?´ ì??격"
-" í?¸ì?¤í?¸ ì?´ë¦? í??ì?¸ì?? ì?¤ì§? SOCKS4a í?¹ì?? SOCKS5를 ì?¬ì?©í??ë??ë¡? 구ì?±í??ê³  í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
+msgstr "ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ë?? í? ë¥´ê°? ì?´í?´í?  ì?? ì??ë?? í??ë¡?í? ì½?ì?? ì?¬ì?©í??ì?¬ í? ë¥´ë¥¼ í?µí?´ ì?°ê²°ì?? ì?¤ì ?í??ë ¤ í??ì?µë??ë?¤.. ê·?í??ì?? ì??ì?© í??ë¡?ê·¸ë?¨ì?´ ì??격 í?¸ì?¤í?¸ ì?´ë¦? í??ì?¸ì?? ì?¤ì§? SOCKS4a í?¹ì?? SOCKS5를 ì?¬ì?©í??ë??ë¡? 구ì?±í??ê³  í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3359,9 +3343,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ë?? í? ë¥´ê°? ì? í?¨í?? í?¸ì?¤í?¸ ì?´ë¦?ì?¼ë¡? ì?¸ì??í??ì§? 못í??ë?? \"%1\"ì?? í? ë¥´ë¥¼ í?µí?´ ì?°ê²°ì?? ì?¤ì ?í??ë ¤ í??ì?µë??ë?¤. ì??ì?© "
-"í??ë¡?ê·¸ë?¨ì?? ì?¤ì ?ì?? í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
+msgstr "ì??ì?© í??ë¡?ê·¸ë?¨ ì¤? í??ë??ë?? í? ë¥´ê°? ì? í?¨í?? í?¸ì?¤í?¸ ì?´ë¦?ì?¼ë¡? ì?¸ì??í??ì§? 못í??ë?? \"%1\"ì?? í? ë¥´ë¥¼ í?µí?´ ì?°ê²°ì?? ì?¤ì ?í??ë ¤ í??ì?µë??ë?¤. ì??ì?© í??ë¡?ê·¸ë?¨ì?? ì?¤ì ?ì?? í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3372,9 +3354,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"í? ë¥´ë?? 릴ë ?ì?´ì?? ê³µì?© IP 주ì??ê°? í??ì?¬ %1%2ì??ì?? í??ì?¸í??ì?µë??ë?¤. ê·¸ê²?ì?´ ì ?í??í??ì§? ì??ì?? ê²½ì?°, ê·?í??ì?? ì¤?ê³? 구ì?±ì??ì?? '주ì??'ì?µì??ì?? "
-"ì?¤ì ?í??ë?? ê²?ì?? ê³ ë ¤í?´ë³´ì?­ì??ì?¤."
+msgstr "í? ë¥´ë?? 릴ë ?ì?´ì?? ê³µì?© IP 주ì??ê°? í??ì?¬ %1%2ì??ì?? í??ì?¸í??ì?µë??ë?¤. ê·¸ê²?ì?´ ì ?í??í??ì§? ì??ì?? ê²½ì?°, ê·?í??ì?? ì¤?ê³? 구ì?±ì??ì?? '주ì??'ì?µì??ì?? ì?¤ì ?í??ë?? ê²?ì?? ê³ ë ¤í?´ë³´ì?­ì??ì?¤."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3385,18 +3365,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Torë?? ê·?í??ì?? DNS ì ?ê³µì??ê°? ì¡´ì?¬í??ì§? ì??ë?? ë??ë©?ì?¸ì?? ë??í?´  ì??못ë?? ì??ë?µì?? í??ë?? ê²?ì?? ê°?ì§?í??ì??ì?µë??ë?¤. ëª?ëª?ì?? ISPì?? OpenDNSì?? "
-"ê°?ì?? ë?¤ë¥¸ DNS ì ?ê³µì??ë?¤ì?? ê·¸ë?¤ì?? ê²?ì??ì?´ë?? ê´?ê³  í??ì?´ì§?를 í??ì??í??기 ì??í?´ ì?´ë?¬í?? í??ì??를 í??ë?¤ê³  ì??려져 ì??ì?µë??ë?¤."
+msgstr "Torë?? ê·?í??ì?? DNS ì ?ê³µì??ê°? ì¡´ì?¬í??ì§? ì??ë?? ë??ë©?ì?¸ì?? ë??í?´  ì??못ë?? ì??ë?µì?? í??ë?? ê²?ì?? ê°?ì§?í??ì??ì?µë??ë?¤. ëª?ëª?ì?? ISPì?? OpenDNSì?? ê°?ì?? ë?¤ë¥¸ DNS ì ?ê³µì??ë?¤ì?? ê·¸ë?¤ì?? ê²?ì??ì?´ë?? ê´?ê³  í??ì?´ì§?를 í??ì??í??기 ì??í?´ ì?´ë?¬í?? í??ì??를 í??ë?¤ê³  ì??려져 ì??ì?µë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Torë?? ê·?í??ì?? DNS ì ?ê³µì??ê°? ì¡´ì?¬í??ë?? ë??ë©?ì?¸ì?? ë??í?´ ì??못ë?? ì??ë?µì?? í??ë?? ê²?ì?? ë°?견í??ì?µë??ë?¤. í?´ë?¼ì?´ì?¸í?¸ê°? ì ?í??í?? DNSì?? ì??ë?µì?? "
-"ì ?ê³µí??기 ì??í?´ Tor ë?¤í?¸ì??í?¬ì?? ì??ì¡´í??ë¯?ë¡?, ê·?í??ì?? ì¤?ê³?ë?? ì¶?구 ì¤?ê³?ë¡? 구ì?±ë??ì§? ì??ì?µë??ë?¤."
+msgstr "Torë?? ê·?í??ì?? DNS ì ?ê³µì??ê°? ì¡´ì?¬í??ë?? ë??ë©?ì?¸ì?? ë??í?´ ì??못ë?? ì??ë?µì?? í??ë?? ê²?ì?? ë°?견í??ì?µë??ë?¤. í?´ë?¼ì?´ì?¸í?¸ê°? ì ?í??í?? DNSì?? ì??ë?µì?? ì ?ê³µí??기 ì??í?´ Tor ë?¤í?¸ì??í?¬ì?? ì??ì¡´í??ë¯?ë¡?, ê·?í??ì?? ì¤?ê³?ë?? ì¶?구 ì¤?ê³?ë¡? 구ì?±ë??ì§? ì??ì?µë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3407,9 +3383,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor ë?? %1:%2ë¡? ê·¸ë?¤ ì?¤ì?¤ë¡? ì?°ê²°í?¨ì?¼ë¡?ì?¨ ê·?í??ì?? ì¤?ê³? ì??ë²? í?¬í?¸ê°? Tor ë?¤í?¸ì??í?¬ì??ì?? ì ?ê·¼í?  ì?? ì??ë??ì§? í??ì?¸í??ê³  ì??ì?µë??ë?¤. ì?´ "
-"í??ì?¤í?¸ë?? ëª? ë¶? ì ?ë?? 걸릴 ì?? ì??ì?µë??ë?¤."
+msgstr "Tor ë?? %1:%2ë¡? ê·¸ë?¤ ì?¤ì?¤ë¡? ì?°ê²°í?¨ì?¼ë¡?ì?¨ ê·?í??ì?? ì¤?ê³? ì??ë²? í?¬í?¸ê°? Tor ë?¤í?¸ì??í?¬ì??ì?? ì ?ê·¼í?  ì?? ì??ë??ì§? í??ì?¸í??ê³  ì??ì?µë??ë?¤. ì?´ í??ì?¤í?¸ë?? ëª? ë¶? ì ?ë?? 걸릴 ì?? ì??ì?µë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3429,10 +3403,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"ê·?í??ì?? ì¤?ê³? ì??ë²? í?¬í?¸ë?? ë?¤ë¥¸ Tor í?´ë?¼ì?´ì?¸í?¸ì??ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? ë?¹ì? ì?´ í?¬í?¸ í?¬ì??ë?©ì?? ì?¤ì ?í?´ì?¼í??ë?? ë?¼ì?°í?° ë??ë?? ë°©í??ë²½ "
-"ë?¤ì?? ì??ë?? ê²½ì?° ì?´ 문ì ?ê°? ë°?ì??í?  ì?? ì??ì?µë??ë?¤. %1: %2ì?´(ê°?) ì?¬ë°?른 IP 주ì??ì?? ì??ë²? í?¬í?¸ê°? ì??ë?? ê²½ì?°, ê·?í??ì?? ì¤?ê³?ì?? 구ì?±ì?? "
-"í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
+msgstr "ê·?í??ì?? ì¤?ê³? ì??ë²? í?¬í?¸ë?? ë?¤ë¥¸ Tor í?´ë?¼ì?´ì?¸í?¸ì??ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? ë?¹ì? ì?´ í?¬í?¸ í?¬ì??ë?©ì?? ì?¤ì ?í?´ì?¼í??ë?? ë?¼ì?°í?° ë??ë?? ë°©í??ë²½ ë?¤ì?? ì??ë?? ê²½ì?° ì?´ 문ì ?ê°? ë°?ì??í?  ì?? ì??ì?µë??ë?¤. %1: %2ì?´(ê°?) ì?¬ë°?른 IP 주ì??ì?? ì??ë²? í?¬í?¸ê°? ì??ë?? ê²½ì?°, ê·?í??ì?? ì¤?ê³?ì?? 구ì?±ì?? í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3443,9 +3414,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"í? ë¥´ë?? ì¤?ê³?ì?? ë??ë ?í? ë¦¬ í?¬í?¸ê°? %1:: %2ì?? ì??ì²´ì??ì?¼ë¡? ì?°ê²°í??ì?¬ í? ë¥´ ë?¤í?¸ì??í?¬ì??ì?? ì?°ê²°í?  ì?? ì??ë??ì§? í??ì?¸í??기 ì??í?´ ë?¸ë ¥í??ê³  ì??ì?µë??ë?¤. "
-"ì?´ í??ì?¤í?¸ë?? ëª? ë¶? ì ?ë?? 걸릴 ì?? ì??ì?µë??ë?¤."
+msgstr "í? ë¥´ë?? ì¤?ê³?ì?? ë??ë ?í? ë¦¬ í?¬í?¸ê°? %1:: %2ì?? ì??ì²´ì??ì?¼ë¡? ì?°ê²°í??ì?¬ í? ë¥´ ë?¤í?¸ì??í?¬ì??ì?? ì?°ê²°í?  ì?? ì??ë??ì§? í??ì?¸í??기 ì??í?´ ë?¸ë ¥í??ê³  ì??ì?µë??ë?¤. ì?´ í??ì?¤í?¸ë?? ëª? ë¶? ì ?ë?? 걸릴 ì?? ì??ì?µë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3465,10 +3434,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"ê·?í??ì?? ì¤?ê³? ì??ë²? í?¬í?¸ë?? ë?¤ë¥¸ Tor í?´ë?¼ì?´ì?¸í?¸ì??ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? ë?¹ì? ì?´ í?¬í?¸ í?¬ì??ë?©ì?? ì?¤ì ?í?´ì?¼í??ë?? ë?¼ì?°í?° ë??ë?? ë°©í??ë²½ "
-"ë?¤ì?? ì??ë?? ê²½ì?° ì?´ 문ì ?ê°? ë°?ì??í?  ì?? ì??ì?µë??ë?¤. %1:%2ì?´(ê°?) ì?¬ë°?른 IP 주ì??ì?? ì??ë²? í?¬í?¸ê°? ì??ë?? ê²½ì?°, ê·?í??ì?? ì¤?ê³?ì?? 구ì?±ì?? "
-"í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
+msgstr "ê·?í??ì?? ì¤?ê³? ì??ë²? í?¬í?¸ë?? ë?¤ë¥¸ Tor í?´ë?¼ì?´ì?¸í?¸ì??ì?? ì ?ê·¼í?  ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? ë?¹ì? ì?´ í?¬í?¸ í?¬ì??ë?©ì?? ì?¤ì ?í?´ì?¼í??ë?? ë?¼ì?°í?° ë??ë?? ë°©í??ë²½ ë?¤ì?? ì??ë?? ê²½ì?° ì?´ 문ì ?ê°? ë°?ì??í?  ì?? ì??ì?µë??ë?¤. %1:%2ì?´(ê°?) ì?¬ë°?른 IP 주ì??ì?? ì??ë²? í?¬í?¸ê°? ì??ë?? ê²½ì?°, ê·?í??ì?? ì¤?ê³?ì?? 구ì?±ì?? í??ì?¸í??ì??기 ë°?ë??ë??ë?¤."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3478,9 +3444,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"í?´ë?¼ì?´ì?¸í?¸ê°? ë?¹ì? ì?? ì¤?ê³?ì?? ì?°ê²°í?  ì?? ì??ë??ë¡? í??ë?? ê·?í??ì?? ì¤?ê³?ì?? ì?¤ëª?ì??, %1 : %2 ë??ë ?í? ë¦¬ ì??ë²?ì?? ì??í?´ ê±°ë¶?ë??ì??ì?µë??ë?¤. 주ì?´ì§? "
-"ì?´ì? ë?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤ : %3"
+msgstr "í?´ë?¼ì?´ì?¸í?¸ê°? ë?¹ì? ì?? ì¤?ê³?ì?? ì?°ê²°í?  ì?? ì??ë??ë¡? í??ë?? ê·?í??ì?? ì¤?ê³?ì?? ì?¤ëª?ì??, %1 : %2 ë??ë ?í? ë¦¬ ì??ë²?ì?? ì??í?´ ê±°ë¶?ë??ì??ì?µë??ë?¤. 주ì?´ì§? ì?´ì? ë?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤ : %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3492,9 +3456,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"ë?¹ì? ì?? ì¤?ê³?ë?? ì?´ì ? ì?¨ë?¼ì?¸ ì??í??ì?´ê³  í? ë¥´ í?´ë?¼ì?´ì?¸í?¸ê°? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤. ì¢? ë?? í?´ë?¼ì?´ì?¸í?¸ê°? ê·?í??ì?? ì¤?ê³?ì?? ë??í?´ ì??ê²? ë?¨ì?¼ë¡? ëª? ì??ê°? "
-"ì?´ë?´ì?? ë??ì?­í?­ ê·¸ë??í??ë¡? í??ì??ë?¨ì?¼ë¡?ì?¨ ë?¤í?¸ì??í?¬ í?¸ë??í?½ì?? ì¦?ê°?ê°? ë??í??ë?©ë??ë?¤. í? ë¥´ ë?¤í?¸ì??í?¬ì?? 기ì?¬í?´ 주ì??ì?? ê°?ì?¬í?©ë??ë?¤!"
+msgstr "ë?¹ì? ì?? ì¤?ê³?ë?? ì?´ì ? ì?¨ë?¼ì?¸ ì??í??ì?´ê³  í? ë¥´ í?´ë?¼ì?´ì?¸í?¸ê°? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤. ì¢? ë?? í?´ë?¼ì?´ì?¸í?¸ê°? ê·?í??ì?? ì¤?ê³?ì?? ë??í?´ ì??ê²? ë?¨ì?¼ë¡? ëª? ì??ê°? ì?´ë?´ì?? ë??ì?­í?­ ê·¸ë??í??ë¡? í??ì??ë?¨ì?¼ë¡?ì?¨ ë?¤í?¸ì??í?¬ í?¸ë??í?½ì?? ì¦?ê°?ê°? ë??í??ë?©ë??ë?¤. í? ë¥´ ë?¤í?¸ì??í?¬ì?? 기ì?¬í?´ 주ì??ì?? ê°?ì?¬í?©ë??ë?¤!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3851,10 +3813,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"ë?¤ë¥¸ Vidalia í??ë¡?ì?¸ì?¤ê°? ì?´ë¯¸ ì??ë??ì¤?ì??ë??ë?¤. ë§?ì?½ ì ?ë§? ë?¤ë¥¸ Vidalia í??ë¡?ì?¸ì?¤ê°? ì??ë?¤ë©´, ê³?ì??í??ë??ë¡? ì? í??í?  ì?? ì??ì?µë??ë?¤.\n"
-"\n"
-"Vidalia ì??ì??ì?? ê³?ì??í??ê² ì?µë??ê¹??"
+msgstr "ë?¤ë¥¸ Vidalia í??ë¡?ì?¸ì?¤ê°? ì?´ë¯¸ ì??ë??ì¤?ì??ë??ë?¤. ë§?ì?½ ì ?ë§? ë?¤ë¥¸ Vidalia í??ë¡?ì?¸ì?¤ê°? ì??ë?¤ë©´, ê³?ì??í??ë??ë¡? ì? í??í?  ì?? ì??ì?µë??ë?¤.\n\nVidalia ì??ì??ì?? ê³?ì??í??ê² ì?µë??ê¹??"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3887,5 +3846,3 @@ msgstr "%1 ì??ê°?"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 �"
-
-
diff --git a/src/vidalia/i18n/po/ku/qt_ku.po b/src/vidalia/i18n/po/ku/qt_ku.po
index 0aae6a6..534a059 100644
--- a/src/vidalia/i18n/po/ku/qt_ku.po
+++ b/src/vidalia/i18n/po/ku/qt_ku.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ku/vidalia_ku.po b/src/vidalia/i18n/po/ku/vidalia_ku.po
index cd31a6d..0176cf1 100755
--- a/src/vidalia/i18n/po/ku/vidalia_ku.po
+++ b/src/vidalia/i18n/po/ku/vidalia_ku.po
@@ -1,2682 +1,3816 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-11-24 15:59+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:16
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr ""
 
-#: aboutdialog.ui:53
 msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-#: aboutdialog.ui:88
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-#: aboutdialog.ui:69
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-#: aboutdialog.cpp:53
-msgctxt "AboutDialog"
-msgid "Unavailable"
-msgstr ""
-
-#: aboutdialog.cpp:57
-msgctxt "AboutDialog"
-msgid "Not Running"
-msgstr ""
-
-#: aboutdialog.ui:81
-msgctxt "AboutDialog"
-msgid "0.2.0"
-msgstr ""
-
-#: aboutdialog.ui:106
-msgctxt "AboutDialog"
-msgid "0.2.0.31-alpha-dev (r123456)"
+msgid "License"
 msgstr ""
 
-#: aboutdialog.ui:131
 msgctxt "AboutDialog"
-msgid "4.4.2"
+msgid "Vidalia 0.2.0"
 msgstr ""
 
-#: aboutdialog.ui:107
 msgctxt "AboutDialog"
-msgid "License"
+msgid "Tor 0.2.0.32"
 msgstr ""
 
-#: aboutdialog.ui:163
 msgctxt "AboutDialog"
-msgid "version"
+msgid "Qt 4.4.2"
 msgstr ""
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
-#: advancedpage.cpp:120
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr ""
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr ""
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr ""
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr ""
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr ""
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr ""
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:289
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service."
-""
-"You may need to remove it manually."
-msgstr ""
-
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr ""
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
 msgstr ""
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr ""
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr ""
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
 msgstr ""
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ""
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr ""
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
 msgstr ""
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
 msgstr ""
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
 msgstr ""
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
 msgstr ""
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
 msgstr ""
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
-#: appearancepage.ui:22
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
 
-#: appearancepage.ui:37
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
 msgstr ""
 
-#: appearancepage.ui:75
 msgctxt "AppearancePage"
 msgid "Style"
 msgstr ""
 
-#: appearancepage.ui:103
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
 msgstr ""
 
-#: appearancepage.cpp:67
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
-#: bwgraph.cpp:166
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
 
-#: bwgraph.cpp:232
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
 msgstr ""
 
-#: bwgraph.ui:40
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
 msgstr ""
 
-#: bwgraph.ui:16
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
 msgstr ""
 
-#: bwgraph.ui:63
 msgctxt "BandwidthGraph"
 msgid "Reset"
 msgstr ""
 
-#: bwgraph.ui:151
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
 msgstr ""
 
-#: bwgraph.ui:170
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
 msgstr ""
 
-#: bwgraph.ui:183
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
 msgstr ""
 
-#: bwgraph.ui:234
 msgctxt "BandwidthGraph"
 msgid "Style"
 msgstr ""
 
-#: bwgraph.ui:284
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
 msgstr ""
 
-#: bwgraph.ui:368
 msgctxt "BandwidthGraph"
 msgid "100"
 msgstr ""
 
-#: bwgraph.ui:383
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
 msgstr ""
 
-#: bwgraph.ui:443
 msgctxt "BandwidthGraph"
 msgid "Save"
 msgstr ""
 
-#: bwgraph.ui:450
 msgctxt "BandwidthGraph"
 msgid "Cancel"
 msgstr ""
 
-#: circuit.cpp:112
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
 msgctxt "Circuit"
 msgid "New"
 msgstr ""
 
-#: circuit.cpp:113
 msgctxt "Circuit"
 msgid "Open"
 msgstr ""
 
-#: circuit.cpp:114
 msgctxt "Circuit"
 msgid "Building"
 msgstr ""
 
-#: circuit.cpp:115
 msgctxt "Circuit"
 msgid "Failed"
 msgstr ""
 
-#: circuit.cpp:116
 msgctxt "Circuit"
 msgid "Closed"
 msgstr ""
 
-#: circuit.cpp:117
 msgctxt "Circuit"
 msgid "Unknown"
 msgstr ""
 
-#: circuititem.cpp:39
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Connection"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
 msgctxt "CircuitListWidget"
 msgid "Status"
 msgstr ""
 
-#: circuitlistwidget.cpp:87
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
 msgstr ""
 
-#: circuitlistwidget.cpp:89
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
 msgstr ""
 
-#: circuitlistwidget.cpp:110
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
 msgstr ""
 
-#: configdialog.cpp:77
 msgctxt "ConfigDialog"
 msgid "General"
 msgstr ""
 
-#: configdialog.cpp:81
 msgctxt "ConfigDialog"
 msgid "Network"
 msgstr ""
 
-#: configdialog.cpp:85
 msgctxt "ConfigDialog"
 msgid "Sharing"
 msgstr ""
 
-#: configdialog.cpp:89
 msgctxt "ConfigDialog"
 msgid "Services"
 msgstr ""
 
-#: configdialog.cpp:93
 msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
-#: configdialog.cpp:97
 msgctxt "ConfigDialog"
 msgid "Advanced"
 msgstr ""
 
-#: configdialog.cpp:111
 msgctxt "ConfigDialog"
 msgid "Help"
 msgstr ""
 
-#: configdialog.cpp:196
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
 msgstr ""
 
-#: configdialog.cpp:198
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
 msgstr ""
 
-#: configdialog.cpp:225
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
 msgstr ""
 
-#: configdialog.cpp:227
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
 msgstr ""
 
-#: configdialog.ui:16
 msgctxt "ConfigDialog"
 msgid "Settings"
 msgstr ""
 
-#: controlconnection.cpp:134
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
 msgstr ""
 
-#: controlconnection.cpp:331
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgid "Remember my password"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
 msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
-#: controlsocket.cpp:70
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlsocket.cpp:80
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
 msgstr ""
 
-#: controlsocket.cpp:117
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
 msgstr ""
 
-#: controlsocket.cpp:156
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
 msgstr ""
 
-#: generalpage.cpp:62
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "CountryInfo"
+msgid "Afghanistan"
 msgstr ""
 
-#: generalpage.cpp:75
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgctxt "CountryInfo"
+msgid "Andorra"
 msgstr ""
 
-#: generalpage.cpp:85
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgctxt "CountryInfo"
+msgid "Angola"
 msgstr ""
 
-#: generalpage.cpp:98
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
 msgstr ""
 
-#: generalpage.cpp:106
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
+msgctxt "CountryInfo"
+msgid "Argentina"
 msgstr ""
 
-#: generalpage.ui:28
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
+msgctxt "CountryInfo"
+msgid "Armenia"
 msgstr ""
 
-#: generalpage.ui:121
-msgctxt "GeneralPage"
-msgid "Browse"
+msgctxt "CountryInfo"
+msgid "Australia"
 msgstr ""
 
-#: generalpage.ui:57
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
 msgstr ""
 
-#: generalpage.ui:51
-msgctxt "GeneralPage"
-msgid "Tor"
+msgctxt "CountryInfo"
+msgid "Bahamas"
 msgstr ""
 
-#: generalpage.ui:93
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
+msgctxt "CountryInfo"
+msgid "Bangladesh"
 msgstr ""
 
-#: generalpage.ui:99
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
+msgctxt "CountryInfo"
+msgid "Barbados"
 msgstr ""
 
-#: generalpage.ui:135
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
+msgctxt "CountryInfo"
+msgid "Belarus"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv: "
+msgctxt "CountryInfo"
+msgid "Belgium"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "CountryInfo"
+msgid "Belize"
 msgstr ""
 
-#: graphframe.cpp:247
-msgctxt "GraphFrame"
-msgid "Sent: "
+msgctxt "CountryInfo"
+msgid "Bhutan"
 msgstr ""
 
-#: graphframe.cpp:259
-msgctxt "GraphFrame"
-msgid "%1 KB"
+msgctxt "CountryInfo"
+msgid "Bolivia"
 msgstr ""
 
-#: graphframe.cpp:262
-msgctxt "GraphFrame"
-msgid "%1 MB"
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
 msgstr ""
 
-#: graphframe.cpp:265
-msgctxt "GraphFrame"
-msgid "%1 GB"
+msgctxt "CountryInfo"
+msgid "Botswana"
 msgstr ""
 
-#: helpbrowser.cpp:135
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents: "
+msgctxt "CountryInfo"
+msgid "Brazil"
 msgstr ""
 
-#: helpbrowser.cpp:147
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
 msgstr ""
 
-#: helpbrowser.cpp:396
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
+msgctxt "CountryInfo"
+msgid "Bulgaria"
 msgstr ""
 
-#: helpbrowser.cpp:398
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
 msgstr ""
 
-#: helpbrowser.cpp:400
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
+msgctxt "CountryInfo"
+msgid "Burundi"
 msgstr ""
 
-#: helpbrowser.cpp:445
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
+msgctxt "CountryInfo"
+msgid "Cambodia"
 msgstr ""
 
-#: helpbrowser.ui:33
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cameroon"
 msgstr ""
 
-#: helpbrowser.ui:484
-msgctxt "HelpBrowser"
-msgid "Back"
+msgctxt "CountryInfo"
+msgid "Canada"
 msgstr ""
 
-#: helpbrowser.ui:487
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
+msgctxt "CountryInfo"
+msgid "Cape Verde"
 msgstr ""
 
-#: helpbrowser.ui:490
-msgctxt "HelpBrowser"
-msgid "Backspace"
+msgctxt "CountryInfo"
+msgid "Central African Republic"
 msgstr ""
 
-#: helpbrowser.ui:498
-msgctxt "HelpBrowser"
-msgid "Forward"
+msgctxt "CountryInfo"
+msgid "Chad"
 msgstr ""
 
-#: helpbrowser.ui:501
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
+msgctxt "CountryInfo"
+msgid "Chile"
 msgstr ""
 
-#: helpbrowser.ui:504
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
+msgctxt "CountryInfo"
+msgid "China"
 msgstr ""
 
-#: helpbrowser.ui:512
-msgctxt "HelpBrowser"
-msgid "Home"
+msgctxt "CountryInfo"
+msgid "Colombia"
 msgstr ""
 
-#: helpbrowser.ui:515
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
+msgctxt "CountryInfo"
+msgid "Comoros"
 msgstr ""
 
-#: helpbrowser.ui:518
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
-#: helpbrowser.ui:535
-msgctxt "HelpBrowser"
-msgid "Find"
+msgctxt "CountryInfo"
+msgid "Congo"
 msgstr ""
 
-#: helpbrowser.ui:538
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgctxt "CountryInfo"
+msgid "Costa Rica"
 msgstr ""
 
-#: helpbrowser.ui:541
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
+msgctxt "CountryInfo"
+msgid "Cote d�Ivoire"
 msgstr ""
 
-#: helpbrowser.ui:549
-msgctxt "HelpBrowser"
-msgid "Close"
+msgctxt "CountryInfo"
+msgid "Croatia"
 msgstr ""
 
-#: helpbrowser.ui:552
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
+msgctxt "CountryInfo"
+msgid "Cuba"
 msgstr ""
 
-#: helpbrowser.ui:555
-msgctxt "HelpBrowser"
-msgid "Esc"
+msgctxt "CountryInfo"
+msgid "Cyprus"
 msgstr ""
 
-#: helpbrowser.ui:152
-msgctxt "HelpBrowser"
-msgid "Find:"
+msgctxt "CountryInfo"
+msgid "Czech Republic"
 msgstr ""
 
-#: helpbrowser.ui:174
-msgctxt "HelpBrowser"
-msgid "Find Previous"
+msgctxt "CountryInfo"
+msgid "Denmark"
 msgstr ""
 
-#: helpbrowser.ui:187
-msgctxt "HelpBrowser"
-msgid "Find Next"
+msgctxt "CountryInfo"
+msgid "Djibouti"
 msgstr ""
 
-#: helpbrowser.ui:221
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
+msgctxt "CountryInfo"
+msgid "Dominica"
 msgstr ""
 
-#: helpbrowser.ui:231
-msgctxt "HelpBrowser"
-msgid "Whole words only"
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
 msgstr ""
 
-#: helpbrowser.ui:305
-msgctxt "HelpBrowser"
-msgid "Help Topics"
+msgctxt "CountryInfo"
+msgid "Ecuador"
 msgstr ""
 
-#: helpbrowser.ui:260
-msgctxt "HelpBrowser"
-msgid "Contents"
+msgctxt "CountryInfo"
+msgid "Egypt"
 msgstr ""
 
-#: helpbrowser.ui:350
-msgctxt "HelpBrowser"
-msgid "Search"
+msgctxt "CountryInfo"
+msgid "El Salvador"
 msgstr ""
 
-#: helpbrowser.ui:362
-msgctxt "HelpBrowser"
-msgid "Searching for:"
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
 msgstr ""
 
-#: helpbrowser.ui:405
-msgctxt "HelpBrowser"
-msgid "Found Documents"
+msgctxt "CountryInfo"
+msgid "Eritrea"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file: "
+msgctxt "CountryInfo"
+msgid "Estonia"
 msgstr ""
 
-#: helptextbrowser.cpp:72
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
+msgctxt "CountryInfo"
+msgid "France"
 msgstr ""
 
-#: helptextbrowser.cpp:76
-msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgctxt "CountryInfo"
+msgid "Gabon"
 msgstr ""
 
-#: helptextbrowser.cpp:78
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
+msgctxt "CountryInfo"
+msgid "Gambia"
 msgstr ""
 
-#: helptextbrowser.cpp:88
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
+msgctxt "CountryInfo"
+msgid "Georgia"
 msgstr ""
 
-#: helptextbrowser.cpp:90
-msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgctxt "CountryInfo"
+msgid "Germany"
 msgstr ""
 
-#: licensedialog.ui:13
-msgctxt "LicenseDialog"
-msgid "License Information"
+msgctxt "CountryInfo"
+msgid "Ghana"
 msgstr ""
 
-#: licensedialog.ui:43
-msgctxt "LicenseDialog"
-msgid "License"
+msgctxt "CountryInfo"
+msgid "Grenada"
 msgstr ""
 
-#: licensedialog.ui:76
-msgctxt "LicenseDialog"
-msgid "Credits"
+msgctxt "CountryInfo"
+msgid "Guatemala"
 msgstr ""
 
-#: logevent.cpp:57
-msgctxt "LogEvent"
-msgid "Debug"
+msgctxt "CountryInfo"
+msgid "Guinea"
 msgstr ""
 
-#: logevent.cpp:58
-msgctxt "LogEvent"
-msgid "Info"
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
 msgstr ""
 
-#: logevent.cpp:59
-msgctxt "LogEvent"
-msgid "Notice"
+msgctxt "CountryInfo"
+msgid "Guyana"
 msgstr ""
 
-#: logevent.cpp:60
-msgctxt "LogEvent"
-msgid "Warning"
+msgctxt "CountryInfo"
+msgid "Hong Kong"
 msgstr ""
 
-#: logevent.cpp:61
-msgctxt "LogEvent"
-msgid "Error"
+msgctxt "CountryInfo"
+msgid "Haiti"
 msgstr ""
 
-#: logevent.cpp:62
-msgctxt "LogEvent"
-msgid "Unknown"
+msgctxt "CountryInfo"
+msgid "Honduras"
 msgstr ""
 
-#: mainwindow.ui:233
-msgctxt "MainWindow"
-msgid "Start Tor"
+msgctxt "CountryInfo"
+msgid "Israel"
 msgstr ""
 
-#: mainwindow.ui:443
-msgctxt "MainWindow"
-msgid "Exit"
+msgctxt "CountryInfo"
+msgid "Italy"
 msgstr ""
 
-#: mainwindow.ui:304
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
+msgctxt "CountryInfo"
+msgid "Jamaica"
 msgstr ""
 
-#: mainwindow.ui:317
-msgctxt "MainWindow"
-msgid "Message Log"
+msgctxt "CountryInfo"
+msgid "Japan"
 msgstr ""
 
-#: mainwindow.cpp:348
-msgctxt "MainWindow"
-msgid "Network Map"
+msgctxt "CountryInfo"
+msgid "Jordan"
 msgstr ""
 
-#: mainwindow.cpp:354
-msgctxt "MainWindow"
-msgid "Control Panel"
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
 msgstr ""
 
-#: mainwindow.ui:380
-msgctxt "MainWindow"
-msgid "Settings"
+msgctxt "CountryInfo"
+msgid "Kenya"
 msgstr ""
 
-#: mainwindow.ui:430
-msgctxt "MainWindow"
-msgid "About"
+msgctxt "CountryInfo"
+msgid "Kiribati"
 msgstr ""
 
-#: mainwindow.ui:367
-msgctxt "MainWindow"
-msgid "Help"
+msgctxt "CountryInfo"
+msgid "Kuwait"
 msgstr ""
 
-#: mainwindow.cpp:1391
-msgctxt "MainWindow"
-msgid "New Identity"
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
 msgstr ""
 
-#: mainwindow.cpp:437
-msgctxt "MainWindow"
-msgid "Ctrl+T"
+msgctxt "CountryInfo"
+msgid "Laos"
 msgstr ""
 
-#: mainwindow.cpp:438
-msgctxt "MainWindow"
-msgid "Ctrl+B"
+msgctxt "CountryInfo"
+msgid "Latvia"
 msgstr ""
 
-#: mainwindow.cpp:439
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:440
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:441
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:442
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:443
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:463
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
-#: mainwindow.cpp:468
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:476
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:527
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:528
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:540
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:541
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:562
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:563
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:579
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:583
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:586
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:589
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:592
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:595
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:598
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1132
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:605
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1297
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:612
 msgctxt "MainWindow"
 msgid "Unrecognized startup status"
 msgstr ""
 
-#: mainwindow.cpp:619
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:622
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:625
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:628
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:631
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:634
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:637
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:640
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:643
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:645
-msgctxt "MainWindow"
-msgid " failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:686
-msgctxt "MainWindow"
-msgid "Your relay is shutting down."
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-#: mainwindow.cpp:688
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:693
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:695
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:711
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:859
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:862
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:896
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:906
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:938
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:943
-msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
-""
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-
-#: mainwindow.cpp:965
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:966
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:997
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1001
-msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly."
-""
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-#: mainwindow.cpp:1055
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1075
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1078
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1080
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1087
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1089
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1141
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1143
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1222
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1224
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1226
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1330
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1394
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
-#: mainwindow.cpp:1409
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1458
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1459
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
-msgid "View log message history"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+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."
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1213
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
-#: messagelog.cpp:126
-msgctxt "MessageLog"
-msgid "Messages that appear when something has "
-"gone very wrong and Tor cannot proceed."
+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?"
 msgstr ""
 
-#: messagelog.cpp:128
-msgctxt "MessageLog"
-msgid "Messages that only appear when "
-"something has gone wrong with Tor."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:132
-msgctxt "MessageLog"
-msgid "Messages that appear infrequently "
-"during normal Tor operation and are "
-"not considered errors, but you may "
-"care about."
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr ""
 
-#: messagelog.cpp:310
-msgctxt "MessageLog"
-msgid "Cannot write file %1"
-""
-"%2."
-msgstr ""
-
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
 msgstr ""
 
-#: messagelog.ui:371
 msgctxt "MessageLog"
-msgid "Browse"
+msgid ""
+"Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
+msgid ""
+"Messages that only appear when \n"
+"something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
+msgid ""
+"Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Cannot write file %1\n"
+"\n"
+"%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: networkpage.cpp:193
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid "Invalid Bridge"
 msgstr ""
 
-#: networkpage.cpp:194
 msgctxt "NetworkPage"
 msgid "The specified bridge identifier is not valid."
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgid "Add a Bridge:"
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Remove the selected bridges from the list"
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Copy the selected bridges to the clipboard"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Find Bridges Now"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:139
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:143
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:144
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:148
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:150
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:156
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:100
 msgctxt "RouterDescriptorView"
-msgid "%1 days "
+msgid "Copy"
 msgstr ""
 
-#: routerdescriptorview.cpp:103
-msgctxt "RouterDescriptorView"
-msgid "%1 hours "
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
-msgctxt "RouterDescriptorView"
-msgid "%1 mins "
+msgctxt "RouterInfoDialog"
+msgid "Online"
 msgstr ""
 
-#: routerdescriptorview.cpp:109
-msgctxt "RouterDescriptorView"
-msgid "%1 secs"
+msgctxt "RouterInfoDialog"
+msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:48
-msgctxt "RouterDescriptorView"
-msgid "Copy"
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:140
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:143
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
-#: serverpage.cpp:199
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:263
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:25
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:32
 msgctxt "ServerPage"
 msgid "Relay traffic for the Tor network"
 msgstr ""
 
-#: serverpage.ui:39
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
-msgstr ""
-
-#: serverpage.ui:91
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:110
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:113
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory "
-msgstr ""
-
-#: serverpage.ui:139
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:154
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:164
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:204
-msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-
-#: serverpage.ui:234
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:267
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:279
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:337
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:370
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:380
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:76
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:435
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:466
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:471
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:476
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:481
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:486
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:491
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:456
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
 msgstr ""
 
-#: serverpage.ui:502
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
 msgstr ""
 
-#: serverpage.ui:591
 msgctxt "ServerPage"
-msgid "Average Rate"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:708
 msgctxt "ServerPage"
-msgid "KB/s"
+msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:666
 msgctxt "ServerPage"
-msgid "Maximum Rate"
+msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:695
 msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
+msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:737
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:400
 msgctxt "ServerPage"
-msgid "Bandwidth Limits"
+msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:802
 msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:805
 msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:815
 msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
+msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:818
 msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
+msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:828
 msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:831
 msgctxt "ServerPage"
-msgid "Misc Other Services"
+msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.ui:841
 msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.ui:844
 msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.ui:854
 msgctxt "ServerPage"
-msgid "Port 443"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
-#: serverpage.ui:857
 msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Bridge History"
 msgstr ""
 
-#: serverpage.ui:867
 msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:870
 msgctxt "ServerPage"
-msgid "Websites"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:896
 msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:969
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:979
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
 msgstr ""
 
-#: serverpage.ui:1015
 msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Automatically distribute my bridge address"
 msgstr ""
 
-#: serverpage.ui:1039
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid "Mirror the Relay Directory"
 msgstr ""
 
-#: serverpage.ui:1061
 msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:116
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:123
 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."
+msgid ""
+"Please configure at least a service directory and a virtual port for each "
+"service you want to save. Remove the other ones."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:452
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:458
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:547
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:578
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:598
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:384
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr ""
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:143
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:161
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:103
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: vmessagebox.cpp:77
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr ""
+
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr ""
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:75
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:89
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: main.cpp:95
-msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
-""
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-#: vidalia.cpp:169
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:171
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:173
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:175
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:177
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:180
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:183
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:186
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:190
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:238
 msgctxt "Vidalia"
-msgid "Invalid language code specified: "
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:245
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified: "
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
 msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/kw/qt_kw.po b/src/vidalia/i18n/po/kw/qt_kw.po
index 9239778..6fb8933 100644
--- a/src/vidalia/i18n/po/kw/qt_kw.po
+++ b/src/vidalia/i18n/po/kw/qt_kw.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/kw/vidalia_kw.po b/src/vidalia/i18n/po/kw/vidalia_kw.po
index 22b0f4e..1126a58 100644
--- a/src/vidalia/i18n/po/kw/vidalia_kw.po
+++ b/src/vidalia/i18n/po/kw/vidalia_kw.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: kw\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ky/qt_ky.po b/src/vidalia/i18n/po/ky/qt_ky.po
index 63743eb..f546fee 100644
--- a/src/vidalia/i18n/po/ky/qt_ky.po
+++ b/src/vidalia/i18n/po/ky/qt_ky.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ky/vidalia_ky.po b/src/vidalia/i18n/po/ky/vidalia_ky.po
index 22b0f4e..bb0163b 100644
--- a/src/vidalia/i18n/po/ky/vidalia_ky.po
+++ b/src/vidalia/i18n/po/ky/vidalia_ky.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lb/qt_lb.po b/src/vidalia/i18n/po/lb/qt_lb.po
index 93cf944..d12b5a3 100644
--- a/src/vidalia/i18n/po/lb/qt_lb.po
+++ b/src/vidalia/i18n/po/lb/qt_lb.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lb/vidalia_lb.po b/src/vidalia/i18n/po/lb/vidalia_lb.po
index 8c59985..b5591d0 100644
--- a/src/vidalia/i18n/po/lb/vidalia_lb.po
+++ b/src/vidalia/i18n/po/lb/vidalia_lb.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ln/qt_ln.po b/src/vidalia/i18n/po/ln/qt_ln.po
index 78550cf..9b3d5d5 100644
--- a/src/vidalia/i18n/po/ln/qt_ln.po
+++ b/src/vidalia/i18n/po/ln/qt_ln.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ln/vidalia_ln.po b/src/vidalia/i18n/po/ln/vidalia_ln.po
index 38be79b..2681894 100644
--- a/src/vidalia/i18n/po/ln/vidalia_ln.po
+++ b/src/vidalia/i18n/po/ln/vidalia_ln.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/lo/qt_lo.po b/src/vidalia/i18n/po/lo/qt_lo.po
index e58abb9..f39179f 100644
--- a/src/vidalia/i18n/po/lo/qt_lo.po
+++ b/src/vidalia/i18n/po/lo/qt_lo.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lo/vidalia_lo.po b/src/vidalia/i18n/po/lo/vidalia_lo.po
index 9cff8a4..d294b4c 100644
--- a/src/vidalia/i18n/po/lo/vidalia_lo.po
+++ b/src/vidalia/i18n/po/lo/vidalia_lo.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/lt/qt_lt.po b/src/vidalia/i18n/po/lt/qt_lt.po
index fe5958c..64f7cdc 100644
--- a/src/vidalia/i18n/po/lt/qt_lt.po
+++ b/src/vidalia/i18n/po/lt/qt_lt.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lt/vidalia_lt.po b/src/vidalia/i18n/po/lt/vidalia_lt.po
index 3917746..fa87632 100644
--- a/src/vidalia/i18n/po/lt/vidalia_lt.po
+++ b/src/vidalia/i18n/po/lt/vidalia_lt.po
@@ -1,11 +1,13 @@
 # 
+# Translators:
+#   <andrius.dre@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-24 21:58+0000\n"
+"Last-Translator: vasaris <andrius.dre@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,124 +18,124 @@ msgstr ""
 
 msgctxt "AboutDialog"
 msgid "About Vidalia"
-msgstr ""
+msgstr "Apie Vidalia"
 
 msgctxt "AboutDialog"
 msgid "License"
-msgstr ""
+msgstr "Licencija"
 
 msgctxt "AboutDialog"
 msgid "Vidalia 0.2.0"
-msgstr ""
+msgstr "Vidalia 0.2.0"
 
 msgctxt "AboutDialog"
 msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "Tor 0.2.0.32"
 
 msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
-msgstr ""
+msgstr "Qt 4.4.2"
 
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
-msgstr ""
+msgstr "'%1' IP adresas negalioja."
 
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
+msgstr "PažymÄ?ta \"Apsaugoti slaptažodžiu\", taÄ?iau nenurodytas slaptažodis."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
-msgstr ""
+msgstr "Nurodykite Tor konfigÅ«racijos failÄ?."
 
 msgctxt "AdvancedPage"
 msgid "File Not Found"
-msgstr ""
+msgstr "Failas nerastas."
 
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
-msgstr ""
+msgstr "%1 neegzistuoja. Sukurti naujÄ??"
 
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
-msgstr ""
+msgstr "Saugant failÄ? įvyko klaida."
 
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
-msgstr ""
+msgstr "Nepavyko sukurti %1 [%2]"
 
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
-msgstr ""
+msgstr "PažymÄ?kite aplankÄ? Tor duomenims saugoti."
 
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
-msgstr ""
+msgstr "Nepavyko paÅ¡alinti Tor ServisÄ?"
 
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
-msgstr ""
+msgstr "Nepavyko įdiegti Tor ServisÄ?."
 
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
-msgstr ""
+msgstr "Vidalia programai nepavyko įdiegti Tor ServisÄ?."
 
 msgctxt "AdvancedPage"
 msgid "Authentication:"
-msgstr ""
+msgstr "Atpažinimas:"
 
 msgctxt "AdvancedPage"
 msgid "Address:"
-msgstr ""
+msgstr "Adresas:"
 
 msgctxt "AdvancedPage"
 msgid "None"
-msgstr ""
+msgstr "Joks"
 
 msgctxt "AdvancedPage"
 msgid "Cookie"
-msgstr ""
+msgstr "Slapukas (Cookie)"
 
 msgctxt "AdvancedPage"
 msgid "Password"
-msgstr ""
+msgstr "Slaptažodis"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr ""
+msgstr "Generuoti atsitiktinai"
 
 msgctxt "AdvancedPage"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
-msgstr ""
+msgstr "Tor konfigūracijos failas"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
+msgstr "Paleisti Tor programinÄ? įrangÄ?, naudojantis konkreÄ?iu konfigÅ«racijos failu (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
-msgstr ""
+msgstr "Nurodykite keliÄ? iki konfigÅ«racijos failo"
 
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr ""
+msgstr "Naršyti"
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr ""
+msgstr "Duomenų aplankas"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr ""
+msgstr "Saugoti Tor programinÄ?s įrangos duomenis Å¡iame aplanke"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
+msgstr "Nurodykite aplankÄ? Tor programiniams duomenims"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -192,87 +194,115 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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 ""
+msgstr "Vidalia programai nepavyko paÅ¡alinti Tor Serviso.\n\nJums teks paÅ¡alinti Tor ServisÄ? rankiniu bÅ«du."
 
 msgctxt "AppearancePage"
 msgid "Language"
-msgstr ""
+msgstr "Kalba"
 
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
-msgstr ""
+msgstr "Pasirinkite kalbÄ? Vidalia programai"
 
 msgctxt "AppearancePage"
 msgid "Style"
-msgstr ""
+msgstr "Stilius"
 
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
-msgstr ""
+msgstr "Pasirinkite Vidalia programos stilių"
 
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia programai nepavyko rasti nurodytos kalbos vertimo."
+
+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 ""
+msgstr "Nuo: "
 
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
-msgstr ""
+msgstr "PaslÄ?pti nustatymus"
 
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
-msgstr ""
+msgstr "Rodyti nustatymus"
 
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
-msgstr ""
+msgstr "Tor pralaidumas"
 
 msgctxt "BandwidthGraph"
 msgid "Reset"
-msgstr ""
+msgstr "Paleisti iš naujo"
 
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
-msgstr ""
+msgstr "Įeinamojo srauto sparta"
 
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
-msgstr ""
+msgstr "IÅ¡einamojo srauto sparta"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr ""
+msgstr "Visada viršuje"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
-msgstr ""
+msgstr "Stilius"
 
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
-msgstr ""
+msgstr "Keisti Siuntimo spartos grafiko permatomumÄ?"
 
 msgctxt "BandwidthGraph"
 msgid "100"
-msgstr ""
+msgstr "100"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
-msgstr ""
+msgstr "% nepermatomas"
 
 msgctxt "BandwidthGraph"
 msgid "Save"
-msgstr ""
+msgstr "Saugoti"
 
 msgctxt "BandwidthGraph"
 msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
@@ -478,203 +508,203 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "ArmÄ?nija"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "Australija"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaidžanas"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamų salos"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladešas"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "Barbadosas"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "Gudija"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "Belgija"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "Belizas"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "Butanas"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivija"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Bosnija ir Hercogovina"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "Botsvana"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "Brazilija"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "BrunÄ?jus"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgarija"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodža"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerūnas"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "Žaliasis Kyšulys"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "CentrinÄ?s Afrikos Respublika"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "Ä?adas"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "Ä?ilÄ?"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "Kinija"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "Kolumbija"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "Komorų salos"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Kongo DR"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "Kongas"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr ""
+msgstr "Kosta Rika"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "Dramblio Kaulo Krantas"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatija"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "Kipras"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "Ä?ekija"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "Danija"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "Džibutis"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikos Respublika"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekvadoras"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "Egiptas"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvadoras"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Pusaujo GvinÄ?ja"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "EritrÄ?ja"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "Estija"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "Prancūzija"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "Gabonas"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "Gambija"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "Gruzija"
 
 msgctxt "CountryInfo"
 msgid "Germany"
@@ -878,75 +908,75 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "Nigeris"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigerija"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "Norvegija"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "Omanas"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistanas"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "Palestina"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Naujoji GuinÄ?ja"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "Paragvajus"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "Filipinai"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "Lenkija"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "Portugalija"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "Kataras"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "Rumunija"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "Rusija"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
@@ -1074,7 +1104,7 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "Gruzija"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
@@ -1261,24 +1291,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 ""
 
@@ -1296,121 +1308,132 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
-msgstr ""
+msgstr "Vykdomieji failai (*.exe)"
 
 msgctxt "GeneralPage"
 msgid "Select Path to Tor"
-msgstr ""
+msgstr "Nurodykite keliÄ? ik Tor"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr ""
+msgstr "Nurodykite Proxy vykdomÄ?jį failÄ?"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
-msgstr ""
+msgstr "Nurodykite Tor vykdomojo failo vardÄ?"
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
-msgstr ""
+msgstr "Paleisti Vidalia programÄ? startavus operacinei sistemai"
 
 msgctxt "GeneralPage"
 msgid "Browse"
-msgstr ""
+msgstr "Naršyti"
 
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
-msgstr ""
+msgstr "Paleisti Tor programinÄ? įrangÄ? startavus Vidalia programai"
 
 msgctxt "GeneralPage"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr ""
+msgstr "Proxy programa (nebūtina)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr ""
+msgstr "Paleisti proxy programÄ? startavus Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr ""
+msgstr "Proxy programos papildomi kintamieji:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr ""
+msgstr "PrograminÄ?s įrangos atnaujinimai"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "AutomatiÅ¡kai tikrinti ar yra programinÄ?s įrangos atnaujinimų"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "Tikrinti"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "GraphFrame"
 msgid "%1 KB"
-msgstr ""
+msgstr "%1 KB"
 
 msgctxt "GraphFrame"
 msgid "%1 MB"
-msgstr ""
+msgstr "%1 MB"
 
 msgctxt "GraphFrame"
 msgid "%1 GB"
-msgstr ""
+msgstr "%1 GB"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr ""
+msgstr "Gauta:"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
-msgstr ""
+msgstr "Išsiųsta:"
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
+msgstr "Pateiktas XML failas nÄ?ra tinkamas"
 
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
-msgstr ""
+msgstr "PaieÅ¡ka pasiekÄ? dokumento pabaigÄ?"
 
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
-msgstr ""
+msgstr "PaieÅ¡ka pasiekÄ? dokumento pradžiÄ?"
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
-msgstr ""
+msgstr "Tekstas dokumente nerastas"
 
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
-msgstr ""
+msgstr "Rasta %1 rezultatų"
 
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Vidalia Instrukcija"
 
 msgctxt "HelpBrowser"
 msgid "Back"
@@ -1518,40 +1541,40 @@ msgstr ""
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr ""
+msgstr "Atidaryti iÅ¡orinÄ? nuorodÄ?"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
+msgstr "Vidalia negali atidaryti nuorodos. JÅ«sų duomenys bus anonimiÅ¡ki tik sukonfigÅ«ravus narÅ¡yklÄ? naudoti Tor."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
+msgstr "Ar norite, kad Vidalia atidarytų nuorodÄ? JÅ«sų narÅ¡yklÄ?je?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
-msgstr ""
+msgstr "Nepavyko atidaryti nuorodos"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
+msgstr "Vidalia progrmai nepavyko atidaryti nuorodos. JÅ«s galite nukopijuoti URL adresÄ?."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
-msgstr ""
+msgstr "Klaida atidanat failÄ?:"
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr ""
+msgstr "Licencijos informacija"
 
 msgctxt "LicenseDialog"
 msgid "License"
-msgstr ""
+msgstr "Licencija"
 
 msgctxt "LicenseDialog"
 msgid "Credits"
@@ -1563,23 +1586,23 @@ msgstr ""
 
 msgctxt "LogEvent"
 msgid "Info"
-msgstr ""
+msgstr "Informacija"
 
 msgctxt "LogEvent"
 msgid "Notice"
-msgstr ""
+msgstr "Pranešimas"
 
 msgctxt "LogEvent"
 msgid "Warning"
-msgstr ""
+msgstr "Ä®spÄ?jimas"
 
 msgctxt "LogEvent"
 msgid "Error"
-msgstr ""
+msgstr "Klaida"
 
 msgctxt "LogEvent"
 msgid "Unknown"
-msgstr ""
+msgstr "Nežinoma"
 
 msgctxt "LogTreeItem"
 msgid "Debug"
@@ -1607,153 +1630,149 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr ""
+msgstr "Paleisti Tor"
 
 msgctxt "MainWindow"
 msgid "Exit"
-msgstr ""
+msgstr "IÅ¡eiti"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr ""
+msgstr "Spartos grafikas"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr ""
+msgstr "Pranešimų žurnalas"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr ""
+msgstr "Tinklo žemÄ?lapis"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr ""
+msgstr "Kontrolinis pultas"
 
 msgctxt "MainWindow"
 msgid "Settings"
-msgstr ""
+msgstr "Nustatymai"
 
 msgctxt "MainWindow"
 msgid "About"
-msgstr ""
+msgstr "Apie"
 
 msgctxt "MainWindow"
 msgid "Help"
-msgstr ""
+msgstr "Pagalba"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr ""
+msgstr "Nauja tapatybÄ?"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ctrl+T"
 
 msgctxt "MainWindow"
 msgid "Ctrl+B"
-msgstr ""
+msgstr "Ctrl+B"
 
 msgctxt "MainWindow"
 msgid "Ctrl+L"
-msgstr ""
+msgstr "Ctrl+L"
 
 msgctxt "MainWindow"
 msgid "Ctrl+N"
-msgstr ""
+msgstr "Ctrl+N"
 
 msgctxt "MainWindow"
 msgid "Ctrl+?"
-msgstr ""
+msgstr "Ctrl+?"
 
 msgctxt "MainWindow"
 msgid "Ctrl+I"
-msgstr ""
+msgstr "Ctrl+I"
 
 msgctxt "MainWindow"
 msgid "Ctrl+P"
-msgstr ""
+msgstr "Ctrl+P"
 
 msgctxt "MainWindow"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 msgctxt "MainWindow"
 msgid "View"
-msgstr ""
+msgstr "Rodymas"
 
 msgctxt "MainWindow"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Vidalia Instrukcija"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr ""
+msgstr "Klaida paleidžiant narÅ¡yklÄ?"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
+msgstr "Vidalia programai nepavyko paleisti narÅ¡yklÄ?s su Å¡iais nustatymais"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr ""
+msgstr "Klaida paleidžiant pokalbių programÄ?"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
+msgstr "Vidalia programai nepavyko paleisti pokalbių programÄ?"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
-msgstr ""
+msgstr "Klaida paleidžiant proxy serverį"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
+msgstr "Vidalia programai nepavyko paleisti proxy serverį su šiais nustatymais"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr ""
+msgstr "Jungiamasi prie retransliavimo taškų"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr ""
+msgstr "Užmezgiamas ryšys"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
-msgstr ""
+msgstr "Nuskaitoma tinklo bÅ«klÄ?"
 
 msgctxt "MainWindow"
 msgid "Loading network status"
-msgstr ""
+msgstr "Nustatoma tinklo bÅ«klÄ?"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr ""
+msgstr "Įkeliami prieigos sertifikatai"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr ""
+msgstr "Užklausiama retranslaicijos taškų informacija"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr ""
+msgstr "Įkeliama retransliacijos informacija"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr ""
+msgstr "Jungiamasi prie Tor tinklo"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
-msgstr ""
+msgstr "Užmezgiamas sujungimas"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1953,153 +1972,172 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
-msgstr ""
+msgstr "Rodyti Tor tinklo žemÄ?lapį"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr ""
+msgstr "Naudoti naujÄ? tapatybÄ?"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
-msgstr ""
+msgstr "Paspaudus šį mygtukÄ? bus jungiamasi kaip iÅ¡ naujos vietos"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr ""
+msgstr "Rodyti srauto spartÄ?"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr ""
+msgstr "Rodyti žurnalÄ?"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
-msgstr ""
+msgstr "Rodyti instrukcijÄ?"
 
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
-msgstr ""
+msgstr "Konfigūruoti Vidalia"
 
 msgctxt "MainWindow"
 msgid "View version and license information"
-msgstr ""
+msgstr "Rodyti programos versijÄ? ir licencijos infomacijÄ?"
 
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
-msgstr ""
+msgstr "Uždaryti Vidalia"
 
 msgctxt "MainWindow"
 msgid "Show this window on startup"
-msgstr ""
+msgstr "Rodyti šį langÄ? įjungus kompiuterį"
 
 msgctxt "MainWindow"
 msgid "Hide"
-msgstr ""
+msgstr "SlÄ?pti"
 
 msgctxt "MainWindow"
 msgid "Hide this window"
-msgstr ""
+msgstr "SlÄ?pti šį langÄ?"
 
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
-msgstr ""
+msgstr "Ä®vyko klaida keiÄ?iant slaptažodį"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
+msgstr "Vidalia programa bandÄ? pakeisti Tor slaptažodį, taÄ?iau nepavyko perkrauti Tor programinÄ?s įrangos. Ä®sitikinkite, kad sistemoje nÄ?ra paleistų Tor procesų"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
+msgstr "Šiuo metu įdiegta Tor versija yra pasenusi ir neberekomenduojama naudoti"
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
+msgstr "Ar norÄ?tumÄ?te patiktinti ar atsirado nauja versija?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
-msgstr ""
+msgstr "Potencialiai NEsaugus ryšys"
 
 msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
+msgstr "Tor automatiÅ¡kai nutraukÄ? ryšį, kad bÅ«tų iÅ¡saugotas anonimiÅ¡kumas"
 
 msgctxt "MainWindow"
 msgid "Update Failed"
-msgstr ""
+msgstr "Atnaujinimas nepavyko"
 
 msgctxt "MainWindow"
 msgid "Your software is up to date"
-msgstr ""
+msgstr "JÅ«sų programinÄ? įranga atnaujinta"
 
 msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
+msgstr "Å iuo metu nÄ?ra naujesnÄ?s Tor programinÄ?s įrangos. JÅ«sų versija yra naujausia."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
-msgstr ""
+msgstr "Diegimas nepavyko"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
+msgstr "Vidalia programai nepavyko įdiegti atnaujinimų"
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
-msgstr ""
+msgstr "Įvyko klaida: "
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
-msgstr ""
+msgstr "nepavyko (%1)"
 
 msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
+msgstr "JÅ«sų retransliacijos taÅ¡kas iÅ¡jungiamas.\nPaspauskite \"Stop\" mygtukÄ? nutraukti ryÅ¡iui."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "JÅ«sų kompiuteris veikia kaip Tor tinklo retransliatorius. Nutrukus sustabdžius retransliavimÄ? bus nutraukti užmegzti sujungimai.\n\nAr norÄ?tumÄ?te naudotojus įspÄ?ti, kad jie turÄ?tų laiko prisijungti prie kito retransliavimo taÅ¡ko?"
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2188,7 +2226,7 @@ msgstr ""
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
-msgstr ""
+msgstr "Užmezgiamas sujungimas"
 
 msgctxt "MessageLog"
 msgid "Copy"
@@ -2514,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
@@ -2654,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2838,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
@@ -3086,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3664,14 +3698,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 ""
@@ -3765,6 +3791,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 ""
 
@@ -3814,5 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lv/qt_lv.po b/src/vidalia/i18n/po/lv/qt_lv.po
index 8640954..9002578 100644
--- a/src/vidalia/i18n/po/lv/qt_lv.po
+++ b/src/vidalia/i18n/po/lv/qt_lv.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lv/vidalia_lv.po b/src/vidalia/i18n/po/lv/vidalia_lv.po
index fe483a5..6cf77a7 100644
--- a/src/vidalia/i18n/po/lv/vidalia_lv.po
+++ b/src/vidalia/i18n/po/lv/vidalia_lv.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/mg/qt_mg.po b/src/vidalia/i18n/po/mg/qt_mg.po
index 10c72ad..99838af 100644
--- a/src/vidalia/i18n/po/mg/qt_mg.po
+++ b/src/vidalia/i18n/po/mg/qt_mg.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mg/vidalia_mg.po b/src/vidalia/i18n/po/mg/vidalia_mg.po
index 00a26ec..6182cb2 100644
--- a/src/vidalia/i18n/po/mg/vidalia_mg.po
+++ b/src/vidalia/i18n/po/mg/vidalia_mg.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/mi/qt_mi.po b/src/vidalia/i18n/po/mi/qt_mi.po
index 8fce8b0..7a5f69b 100644
--- a/src/vidalia/i18n/po/mi/qt_mi.po
+++ b/src/vidalia/i18n/po/mi/qt_mi.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mi/vidalia_mi.po b/src/vidalia/i18n/po/mi/vidalia_mi.po
index 61bcbad..5471813 100644
--- a/src/vidalia/i18n/po/mi/vidalia_mi.po
+++ b/src/vidalia/i18n/po/mi/vidalia_mi.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/mk/qt_mk.po b/src/vidalia/i18n/po/mk/qt_mk.po
index 4ca8c1a..df4956b 100644
--- a/src/vidalia/i18n/po/mk/qt_mk.po
+++ b/src/vidalia/i18n/po/mk/qt_mk.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mk/vidalia_mk.po b/src/vidalia/i18n/po/mk/vidalia_mk.po
index 0d2bf7e..c05a039 100644
--- a/src/vidalia/i18n/po/mk/vidalia_mk.po
+++ b/src/vidalia/i18n/po/mk/vidalia_mk.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ml/qt_ml.po b/src/vidalia/i18n/po/ml/qt_ml.po
index 4e76d07..08bfafd 100644
--- a/src/vidalia/i18n/po/ml/qt_ml.po
+++ b/src/vidalia/i18n/po/ml/qt_ml.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ml/vidalia_ml.po b/src/vidalia/i18n/po/ml/vidalia_ml.po
index 1d86767..a7a323d 100644
--- a/src/vidalia/i18n/po/ml/vidalia_ml.po
+++ b/src/vidalia/i18n/po/ml/vidalia_ml.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/mn/qt_mn.po b/src/vidalia/i18n/po/mn/qt_mn.po
index 3638f0f..9f5450d 100644
--- a/src/vidalia/i18n/po/mn/qt_mn.po
+++ b/src/vidalia/i18n/po/mn/qt_mn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mn/vidalia_mn.po b/src/vidalia/i18n/po/mn/vidalia_mn.po
index 83d099d..784ab28 100644
--- a/src/vidalia/i18n/po/mn/vidalia_mn.po
+++ b/src/vidalia/i18n/po/mn/vidalia_mn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/mr/qt_mr.po b/src/vidalia/i18n/po/mr/qt_mr.po
index 4a97296..a8c1183 100644
--- a/src/vidalia/i18n/po/mr/qt_mr.po
+++ b/src/vidalia/i18n/po/mr/qt_mr.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mr/vidalia_mr.po b/src/vidalia/i18n/po/mr/vidalia_mr.po
index 71325b4..f5740db 100644
--- a/src/vidalia/i18n/po/mr/vidalia_mr.po
+++ b/src/vidalia/i18n/po/mr/vidalia_mr.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ms/qt_ms.po b/src/vidalia/i18n/po/ms/qt_ms.po
index b09c996..d64e487 100644
--- a/src/vidalia/i18n/po/ms/qt_ms.po
+++ b/src/vidalia/i18n/po/ms/qt_ms.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ms/vidalia_ms.po b/src/vidalia/i18n/po/ms/vidalia_ms.po
index 3430fac..751d3d0 100644
--- a/src/vidalia/i18n/po/ms/vidalia_ms.po
+++ b/src/vidalia/i18n/po/ms/vidalia_ms.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/mt/qt_mt.po b/src/vidalia/i18n/po/mt/qt_mt.po
index 90c737e..9c4d6b0 100644
--- a/src/vidalia/i18n/po/mt/qt_mt.po
+++ b/src/vidalia/i18n/po/mt/qt_mt.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mt/vidalia_mt.po b/src/vidalia/i18n/po/mt/vidalia_mt.po
index 503e511..8f615eb 100755
--- a/src/vidalia/i18n/po/mt/vidalia_mt.po
+++ b/src/vidalia/i18n/po/mt/vidalia_mt.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/my/qt_my.po b/src/vidalia/i18n/po/my/qt_my.po
index 9b16d12..790f416 100644
--- a/src/vidalia/i18n/po/my/qt_my.po
+++ b/src/vidalia/i18n/po/my/qt_my.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%á??á?½á?­á?»á??á?®á?¸á??á?¬á?¸á?»á??á??á?¹á??á?«á??á??á?¹.\n"
-"Replace á??á?¯á??á?¹á??á?­á?¯á??á?«á??á??á?¬á?¸"
+msgstr "%á??á?½á?­á?»á??á?®á?¸á??á?¬á?¸á?»á??á??á?¹á??á?«á??á??á?¹.\nReplace á??á?¯á??á?¹á??á?­á?¯á??á?«á??á??á?¬á?¸"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-" á??á?­á?¯á??á?¹á??á?±á??á?¼á??á??á?«.\n"
-"File á?¡á??á??á?¹á?»á??á??á?¹á??á??á?¹á?±á??á?¸á??á?«á??"
+msgstr "%1\n á??á?­á?¯á??á?¹á??á?±á??á?¼á??á??á?«.\nFile á?¡á??á??á?¹á?»á??á??á?¹á??á??á?¹á?±á??á?¸á??á?«á??"
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Directory á??á?­á?¯á??á?±á??á?¼á??á??á?«.\n"
-"Directory á?±á??á??á?¬á?¡á??á?½á??á?¹á??á?­á?¯á?»á??á??á?¹á?±á??á?¼á?¸á?±á??á?¸á??á?«á??"
+msgstr "%1\nDirectory á??á?­á?¯á??á?±á??á?¼á??á??á?«.\nDirectory á?±á??á??á?¬á?¡á??á?½á??á?¹á??á?­á?¯á?»á??á??á?¹á?±á??á?¼á?¸á?±á??á?¸á??á?«á??"
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' write protect á?»á??á??á?¹á??á?«á??á??á?¹.\n"
-"á??á?ºá??á?¹á??á?ºá??á?¹á??á?«á??á??á?¬á?¸?"
+msgstr "'%1' write protect á?»á??á??á?¹á??á?«á??á??á?¹.\ná??á?ºá??á?¹á??á?ºá??á?¹á??á?«á??á??á?¬á?¸?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b> \"%1\" á?¡á??á??á?¹á??á?­á?¯á??á?¶á?¯á?¸á??á??á??á?«á??.</b><p> á?¡á?»á??á?¬á?¸á?¡á??á??á?¹á??á??á?¹á??á?ºá?­á?³á?¸á?±á??á?¼á?¸á?±á??á?¸á??á?«á?? "
-"á??á?¬á??á?¶á?¯á?¸á?±á??á?±á??á?½á?ºá?¬á?·á?»á??á?®á?¸ punctuations marks á??á??á?«á??á?²á??"
+msgstr "<b> \"%1\" á?¡á??á??á?¹á??á?­á?¯á??á?¶á?¯á?¸á??á??á??á?«á??.</b><p> á?¡á?»á??á?¬á?¸á?¡á??á??á?¹á??á??á?¹á??á?ºá?­á?³á?¸á?±á??á?¼á?¸á?±á??á?¸á??á?«á?? á??á?¬á??á?¶á?¯á?¸á?±á??á?±á??á?½á?ºá?¬á?·á?»á??á?®á?¸ punctuations marks á??á??á?«á??á?²á??"
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/my/vidalia_my.po b/src/vidalia/i18n/po/my/vidalia_my.po
index a7ea48b..13690fd 100644
--- a/src/vidalia/i18n/po/my/vidalia_my.po
+++ b/src/vidalia/i18n/po/my/vidalia_my.po
@@ -1,12 +1,13 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-05-11 04:11+0000\n"
+"Last-Translator: Thura Hlaing <trhura@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,94 +18,92 @@ msgstr ""
 
 msgctxt "AboutDialog"
 msgid "About Vidalia"
-msgstr "Vidalia á?¡á?±á?¾á??á?¬á??á?¹á?¸"
+msgstr "Vidalia á?¡á??á?¼á?±á?¬á??á?ºá?¸"
 
 msgctxt "AboutDialog"
 msgid "License"
-msgstr "á??á?­á?¯á??á?¹á??á??á?¹"
+msgstr "á??á?­á?¯á??á?ºá??á??á?º"
 
 msgctxt "AboutDialog"
 msgid "Vidalia 0.2.0"
-msgstr ""
+msgstr "á??á?®á??á?«á??á?®á??á?¬ á??.á??.á??"
 
 msgctxt "AboutDialog"
 msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "Tor 0.2.0.32"
 
 msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
-msgstr ""
+msgstr "á??á?»á?°á??á?® á??.á??.á??"
 
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
-msgstr "'%1' á??á?­á?¯á??á??á?¹á??á?½á?¬ á?¡á?­á?¯á??á?¹á??á?®á??á?­á??á?¹á??á?¬ á??á?¶á?¯á??á?¶á??á??á?¯á??á?¹á??á?«"
+msgstr "'%1' á??á??á?º á??á?¾á??á?ºá??á??á?ºá??á??á?·á?º á?¡á?­á?¯á??á?ºá??á?®á??á?­á??á?ºá??á?¬ á??á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"'Password' á?»á??á??á?¹á?·á??á?¬á??á??á?¹á??á??á?¹á??á?¯á?±á??á?¼á?¸á??á?¬á?¸á?±á??á?¬á?¹á??á??á?¹á?¸á?? á??á??á?¹á?·á?¡á?±á??á?»á??á??á?¹á?· password á?¡á?¬á?¸ "
-"á??á?»á??á?³á??á?¯á??á?¹á??á?±á??á?¸á??á?«á??"
+msgstr "'á??á??á?¬á?¸á??á?¾á??á?º' á?¡á??á??á?ºá??á?¼á?¯á??á?»á??á?ºá??á?­á?¯ á??á??á?º á??á?½á?±á?¸á??á?»á??á?ºá??á?²á?·á??á??á?ºá?? á??á?­á?¯á?·á??á?±á?¬á?º á??á??á?¬á?¸á??á?¾á??á?ºá??á?­á?¯ á??á??á??á?ºá??á?¾á??á?ºá??á?²á?·á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
-msgstr "Tor á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?­á?¯á??á?¹á?¡á?¬á?¸á?±á??á?¼á?¸á??á?ºá??á?¹á??á??á?¹"
+msgstr "Tor á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?­á?¯á??á?ºá??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "File Not Found"
-msgstr "á??á?­á?¯á??á?¹á??á?±á??á?¼á??á??á?«"
+msgstr "á??á?­á?¯á??á?ºá??á?­á?¯ á??á?¾á?¬á??á?½á?±á??á??á?½á?±á?·á??á?¾á?­á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 á??á?­á?¯á??á??á?¹á??á?½á?¬á??á??á?½á?­á??á?«á?? á??á??á?¹á?»á??á?³á??á?¯á??á?¹á??á?­á?¯á??á?«á??á??á?¬á?¸á??"
+msgstr "%1 á??á??á?¾á?­á??á?«á?? á??á??á?ºá?¸á??á?­á?¯á??á?ºá??á?­á?¯ á??á??á?ºá??á?®á?¸á??á?­á?¯á??á?«á??á??á?¬á?¸ ?"
 
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
-msgstr "á??á?­á?¯á??á?¹á?»á??á?³á??á?¯á??á?¹á?»á??á??á?¹á?¸ á??á??á??á?«"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá??á?®á?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
-msgstr "%1 [%2] á?¡á?¬á?¸á?»á??á?³á??á?¯á??á?¹á??á??á??á??á?«"
+msgstr " %s: %s á??á?­á?¯ á??á??á?ºá??á?®á?¸á?? á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
-msgstr "Tor á??á?½á??á?¹á?·á??á??á?¹á??á??á?¹á?±á??á?¬ á?±á??á??á?¬á??á?ºá?¬á?¸á?¡á?¬á?¸á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ á?±á??á??á?¬á?±á??á?¼á?¸á??á?«"
+msgstr "To á??á?±á??á?¬á?¡á??á?½á??á?º á??á?¯á?¶á?¸á??á??á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?¯á??á?­á?¯á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
-msgstr "Tor á?¡á?¬á?¸á??á??á?¹á??á?½á?¬á?¸á??á??á??á??á?«"
+msgstr "Tor á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?¯á??á?º á??á??á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
-msgstr "Tor á?¡á?¬á?¸á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á??á?«"
+msgstr "Tor á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á??á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia á?»á??á??á?¹á?· Tor á?¡á?¬á?¸á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á??á?«á?? á??á?­á?¯á??á?¹á??á?­á?¯á??á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á?«á??á??á?¹á??"
+msgstr "Tor á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á??á?º á??á?®á??á?«á??á?®á??á?¬á??á?­á?¯ á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Authentication:"
-msgstr "á??á??á?¹á?¸á?±á??á?¸á??á?½á?³:"
+msgstr "á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸ -"
 
 msgctxt "AdvancedPage"
 msgid "Address:"
-msgstr "á??á?­á??á?¹á??á?¬:"
+msgstr "á??á?±á??á??á?ºá??á?­á??á?ºá??á?¬ -"
 
 msgctxt "AdvancedPage"
 msgid "None"
-msgstr "á??á??á?½á?­"
+msgstr "á??á?¬á??á?¾á??á??á?½á?±á?¸"
 
 msgctxt "AdvancedPage"
 msgid "Cookie"
-msgstr "á??á?¼á??á?¹á??á?®á?¸"
+msgstr "á??á?½á??á?ºá??á?®á?¸"
 
 msgctxt "AdvancedPage"
 msgid "Password"
-msgstr "á??á?½á?ºá?­á?³á??á??á??á?¹á??á?¯á??á?¹"
+msgstr "á??á??á?¬á?¸á??á?¾á??á?º"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr "á?¡á??á?½á??á?¹á?·á??á?º "
+msgstr "á??á?»á??á??á?ºá?¸á??á?±á?«á??á?ºá?? á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid ":"
@@ -112,94 +111,105 @@ msgstr ":"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
-msgstr "Tor á?»á??á??á?¹á??á??á?¹á?±á??á?¸á??á?­á?¯á??á?¹"
+msgstr "Tor á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?­á?¯á??á?º"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "á?±á??á?¼á?¸á??á?¬á?¸á?±á??á?¬ á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?­á?¯á??á?¹ (torrc) á?»á??á??á?¹á?· Tor á?¡á?¬á?¸á??á??á??á?¹á??á??á?¹"
+msgstr "á??á??á?ºá??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º á??á?¯á?¶á??á?¶á??á?¼á??á?ºá??á?­á?¯á??á?º (torrc) á??á?¾á??á?·á?ºá?¡á??á?° Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯ á?¡á??á??á?¼á?¯á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
-msgstr "á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?­á?¯á??á?¹á?¡á??á?¼á??á?¹ á?±á??á??á?¬á?±á??á?¼á?¸á??á??á?¹"
+msgstr "á??á??á?ºá??á??á?¯á?¶á??á?¶á??á?¼á??á?ºá??á?­á?¯á??á?ºá??á?­á?¯á?· á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr "á?¾á??á??á?¹á?·á??á??á?¹"
+msgstr "á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¬á??á?½á?±á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr "á?±á??á??á?¬á??á??á?¹á?¸á??á??á??á?¹"
+msgstr "á??á?±á??á?¬á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr "Tor software á??á?±á??á??á?¬á??á?ºá?¬á?¸á?¡á?¬á?¸ á?±á??á?¬á?¹á?»á??á??á?« á?±á??á??á?¬á??á?¼á??á?¹á??á?­á??á?¹á?¸á??á?«"
+msgstr "Tor á??á?±á?¬á?·á??á?²á??á?º á?¡á??á?½á??á?º á??á?±á?¬á?ºá??á?¼á??á?« á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?½á??á?º á??á?±á??á?¬ á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr "á?±á?¡á?¬á??á?¹á?±á??á?¬á?¹á?»á??á??á?« á?±á??á??á?¬á?¡á?¬á?¸ Tor software á??á?±á??á??á?¬á??á?ºá?¬á?¸á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹á?±á??á?¼á?¸á??á?«"
+msgstr "Tor á??á?±á?¬á?·á??á?²á??á?ºá?¡á??á?½á??á?º á??á?±á??á?¬ á??á?­á??á?ºá?¸á??á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á?¬ á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr ""
+msgstr "Tor á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?¾á?¯"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "TCP á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ (ControlPort) á??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Path:"
-msgstr ""
+msgstr "á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ -"
 
 msgctxt "AdvancedPage"
 msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Unix á??á?­á?¯á??á?­á??á?ºá?¸á??á?±á?¬á?·á??á??á?º (ControlSocket) á?¡á?¬á?¸ á??á?¯á?¶á?¸á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "Edit current torrc"
-msgstr ""
+msgstr "á??á??á?ºá??á?¾á?­ torrc á??á?­á?¯ á??á?¼á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "á??á?¾á??á?ºá??á??á?º - á??á??á?ºá??á?¾á?­ load á??á?¯á??á?ºá??á?»á??á?ºá??á?¾á?­á??á??á?·á?º torrc á??á?­á?¯ á??á?¼á??á?ºá??á?­á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "ControlSocket á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?¾á?­á??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "á??á??á?ºá??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º Tor á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??á?±á??á?¬á??á?½á??á?º á??á??á?ºá?? á??á??á?ºá??á?¾á?­ á?? á??á??á?º á??á?¬á??á?¯á?¶á?¸ á??á?¯á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á??á??á?ºá??á?½á??á?º á??á??á?±á?¬á?ºá??á?¼á??á?­á?¯á??á?ºá??á??á?·á?º á??á?¬á??á?¯á?¶á?¸á??á?»á?¬á?¸ á??á?«á??á??á?ºá??á??á?ºá??"
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "á??á??á?ºá??á?­á?¯á??á?ºá??á?¬ Tor á??á?±á??á?¬ á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?±á??á?¬á??á?½á??á?º á??á??á?ºá?? á??á??á?ºá??á?¾á?­ á?? á??á??á?º á??á?¬á??á?¼á?¯á??á?ºá??á??á??á?ºá??á?½á??á?º á??á?±á?¬á?ºá??á?¼á?? á??á??á??á?­á?¯á??á?ºá??á??á?·á?º á?¡á??á?¹á??á??á?¬á??á?»á?¬á?¸ á??á?«á??á??á?ºá??á?±á??á??á?ºá??"
 
 msgctxt "AdvancedPage"
 msgid "Warning"
-msgstr ""
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?º torrc á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?­á?¯á??á?ºá??á??á?ºá?? Tor á??á?­á?¯ á?¡á??á??á?¾ á??á?¼á??á?ºá??á??á?­á?¯á??á?«á??á??á?¬á?¸?"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor á??á?¯á?¶á??á?¶á??á?¼á??á?ºá??á?­á?¯á??á?º (torrc) -- á??á?­á?¯á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸ (*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?½á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º á??á?­á?¯á??á?ºá??á??á?ºá??á?­á?¯á??á?ºá??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr "ControlPort á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?«á??"
+
+msgctxt "AdvancedPage"
+msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "á??á??á?ºá??á??á?º ControlPort á?¡á??á?½á??á?º á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?ºá??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á?®á?¸á??á?¼á?®á?? á??á?­á?¯á?·á??á?±á?¬á?º á??á?±á??á?¬á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á??á?±á?¬á??á?ºá??á?¶á?·á??á?¬á?¸á??á?«á?? á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?±á??á?¬á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?¯á??á?­á?¯ á??á??á?·á?ºá??á?«á?? á??á?­á?¯á?·á??á??á?¯á??á?º \"ControlPort á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?«\" á??á?­á?¯á??á??á?·á?º á??á?½á?±á?¸á??á?»á??á?ºá??á??á?¬á??á?­á?¯ á?¡á??á?¾á??á?ºá??á?¼á??á?ºá??á?¼á??á?ºá??á?¼á?¯á??á?ºá??á?«á??"
 
 msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
+msgstr "Tor á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á??á?º á??á?®á??á?«á??á?®á??á?¬ á??á??á??á?­á?¯á??á?ºá??á?«á??\ná??á?¯á??á?ºá??á??á?ºá?¸á??á??á??á?ºá??á?¼á??á?·á?º á??á?®á??á?«á??á?®á??á?¬á??á?­á?¯ á??á??á?ºá??á?¯á??á?ºá??á??á?º á??á?­á?¯á?¡á??á?ºá??á??á?ºá??"
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -207,59 +217,76 @@ msgstr "á??á?¬á??á?¬á??á??á?¬á?¸"
 
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
-msgstr "Vidalia á??á?¼á??á?¹á??á?¶á?¯á?¸á??á??á?¹ á??á?¬á??á?¬á??á??á?¬á?¸á??á?­á?¯á?±á??á?¼á?¸á??á?«"
+msgstr "Vidalia  á??á?½á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?·á?º á??á?¬á??á?¬á??á??á?¬á?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "AppearancePage"
 msgid "Style"
-msgstr "á??á??á?­á?¯á??á?¹"
+msgstr "á??á??á?­á?¯á??á?º"
 
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
-msgstr "Vidalia á?±á??á?½á??á??á?ºá??á?¹á??á?½á?¬á??á?¬á??á??á?­á?¯á??á?¹á?¡á?¬á?¸á?±á??á?¼á?¸á??á?ºá??á?¹á??á??á?¹"
+msgstr "Vidalia á?? á??á?»á??á?ºá??á?¾á?¬á??á?¬á??á?¯á?¶á??á?¶á??á?®á??á?­á?¯á??á?ºá?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia á?¡á?±á??á?»á??á??á?¹á?·á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á?¬á??á?¬á??á??á?¬á?¸á?¡á?¬á?¸á?±á??á?¬á?¹á?»á??á??á??á??á??á?«á??"
+msgstr "á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?º á??á?¬á??á?¬á??á??á?¬á?¸ á??á?¼á??á?ºá??á?­á?¯á??á?¾á?¯ á??á?­á?¯ á??á??á?º á??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á??"
+
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "á??á??á??á?º á?¡á?­á?¯á??á?ºá??á?½á??á?º á??á?­á??á?ºá??á?¼á?­á?¯á??á?º á??á?¼á??á?ºá??á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸ (Vidalia á??á?­á?¯ á?¡á??á??á?¾ á??á?¼á??á?ºá?? á??á?±á?¬á?¡á??á?« á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?²á??á?»á?¬á?¸á??á??á?º á?¡á??á?»á?­á?¯á?¸á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯ á??á?¼á??á?ºá??á?½á?¬á?¸á??á?­á??á?·á?ºá??á??á?ºá??)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Tray á?¡á?­á?¯á??á?ºá??á?½á??á?º á??á?¾á??á?·á?º Dock á?¡á?­á?¯á??á?ºá??á?½á??á?º á??á?­á?¯á?·á??á?­á?¯ á??á?¼á??á?«á?? (á??á?°á??á?¡á??á?­á?¯á??á?ºá?¸)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Tray á??á?¯á?¶á??á??á?ºá?¹á??á?±á??á??á?­á?¯ á??á?»á?±á?¬á??á?ºá??á?«á??"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "á??á?±á?«á??á?º á??á?¯á?¶á??á??á?ºá?¹á??á?±á??á??á?­á?¯ á??á?»á?±á?¬á??á?ºá??á?«á??"
 
 msgctxt "BandwidthGraph"
 msgid "Since:"
-msgstr "á??á??á??á?¹á?¸á??:"
+msgstr "á??á??á??á?ºá?¸á?? - "
 
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
-msgstr "Setting á??á?ºá?¬á?¸á?¡á?¬á?¸ á??á?­á??á?¹á?¸á??á?¬á?¸á??á??á?¹"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?»á?±á?¬á??á?ºá??á?«á??"
 
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
-msgstr "Setting á??á?ºá?¬á?¸á?¡á?¬á?¸á?»á??á??á??á?¹"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¼á??á?«á??"
 
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
-msgstr "Tor bandwidth á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á?³á?¡á?±á?»á??á?¡á?±á??"
+msgstr "Bridge á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯ á?¡á??á?¾á??á?ºá??á?»á?¯á??á?º"
 
 msgctxt "BandwidthGraph"
 msgid "Reset"
-msgstr "á?¡á??á??á?½á?»á??á??á?¹á??á??á??á?¹"
+msgstr "á??á?°á??á?¡á??á?­á?¯á??á?ºá?¸á??á?¼á??á?ºá??á?¼á??á?ºá??á?±á??á??á?ºá??"
 
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
-msgstr "á??á??á?¹á??á?¶á??á??á?½á?­á??á?½á?³á??á?¹á?¸"
+msgstr "á??á??á?ºá??á?¶á??á?¾á?¯á??á?ºá?¸"
 
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
-msgstr "á??á?­á?¯á??á??á??á??á?¹á??á?½á?³á??á?¹á?¸"
+msgstr "á??á?±á?¸á??á?­á?¯á?·á??á?¾á?¯á??á?ºá?¸"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr "á?¡á?±á??á??á??á?¼á??á?¹á?¡á?»á??á?²á??á?¬á?¸á??á??á?¹"
+msgstr "á?¡á??á?¼á?²á??á??á?ºá?¸ á?¡á??á?±á?«á?ºá??á?¯á?¶á?¸á??á?¾á?¬ á??á?¬á?¸á??á?«á??"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
-msgstr "á??á??á?­á?¯á??á?¹"
+msgstr "á??á??á?­á?¯á??á?º"
 
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Bandwidth á??á??á?¬á?¸á?? á?±á??á?¬á??á?¹á??á?¼á??á?¹á?¸á?»á??á??á?¹á??á?­á?¯á??á?¹á??á?½á?³ á?¡á?¬á?¸á?±á?»á??á?¬á??á?¹á?¸á??á??á?¹á??"
+msgstr "á??á?¼á??á?ºá??á?¾á?¯á??á?ºá?¸á??á?¼á??á??á?¬á?¸á?? á??á?«á?¸á??á?½á?¾á?¬á??á?¾á?¯ á??á?­á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?«á??"
 
 msgctxt "BandwidthGraph"
 msgid "100"
@@ -267,135 +294,135 @@ msgstr "á??á??á??"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
-msgstr "% á?±á??á?¬á??á?¹á??á?¼á??á?¹á?¸á?»á??á??á?¹á?±á??á??á??á??á?¹"
+msgstr "% á?¡á??á??á?ºá?¸á??á?±á?¬á??á?ºá??á?½á??á?ºá?¸á??á?¾á?¯á??á?ºá?¸"
 
 msgctxt "BandwidthGraph"
 msgid "Save"
-msgstr "á??á?­á??á?¹á?¸á??á??á?¹"
+msgstr "á??á?­á??á?ºá?¸á??á?¬á?¸"
 
 msgctxt "BandwidthGraph"
 msgid "Cancel"
-msgstr "á??á?¼á??á?¹á??á??á?¹"
+msgstr "á??á?±á??á?±á?¬á?·"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr ""
+msgstr "HTTPS bridge á??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?¾á?¯á??á?­á?¯ á?¡á??á??á?¼á?¯á??á?±á??á?² .... "
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "%1:%2 á??á?­á?¯á?· á?¡á??á?ºá??á?¬á??á??á?º á??á?»á?­á??á?ºá??á??á?ºá??á?±á??á?² ..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr ""
+msgstr "bridge á??á?»á?¬á?¸á?¡á??á?½á??á?º HTTPS á??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?»á??á?ºá??á??á?ºá??á?¯á??á?­á?¯ á??á?±á?¸á??á?­á?¯á?·á??á?±á??á?² ... "
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
-msgstr ""
+msgstr "Bridgeá??á?»á?¬á?¸á??á?¬á??á??á?ºá?¸á??á?­á?¯ á??á?±á?«á??á?ºá?¸á??á?¯á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?±á??á?² ..."
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Downloading Bridges"
-msgstr ""
+msgstr "Bridgeá??á?»á?¬á?¸á??á?­á?¯ á??á?±á?«á??á?ºá?¸á??á?¯á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Unable to download bridges: %1"
-msgstr ""
+msgstr "Bridge á??á?»á?¬á?¸á??á?­á?¯ á??á?±á?«á??á?ºá?¸á??á?¯á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á??á?º á??á??á??á?­á?¯á??á?ºá??á?«á?? - %1"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Retrying bridge request..."
-msgstr ""
+msgstr "Bridge á??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?¶ á??á?¼á?­á?¯á?¸á??á?¸á??á?¼á??á?·á?ºá??á?±á??á?² ..."
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á?¶"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
-msgstr ""
+msgstr "# á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?¼á??á?« á??á?­á?¯á??á?ºá??á?¶á??á?»á?¬á?¸á??á?¾ á??á??á?­á?¯á??á?ºá?¸á??á??á?·á?ºá??á?»á?¬á?¸á??á??á?º %1 á??á??á??á?ºá?¸á?? á??á??á?ºá?? relay á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?²á?·á??á?¼á?®á?¸á??á?¼á?®á??"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
-msgstr ""
+msgstr "Bridge á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯ á?¡á??á?¾á??á?ºá??á?»á?¯á??á?º"
 
 msgctxt "BridgeUsageDialog"
 msgid "Client Summary"
-msgstr ""
+msgstr "á??á??á?­á?¯á??á?ºá?¸á??á??á?·á?º á?¡á??á?»á??á?ºá?¸á??á?»á?¯á??á?º"
 
 msgctxt "Circuit"
 msgid "New"
-msgstr "á?¡á??á??á?¹"
+msgstr "á?¡á??á??á?º"
 
 msgctxt "Circuit"
 msgid "Open"
-msgstr "á??á?¼á??á?¹á?·á??á??á?¹"
+msgstr "á??á?½á??á?·á?ºá??á?«"
 
 msgctxt "Circuit"
 msgid "Building"
-msgstr "á??á??á?¹á?±á??á?¬á??á?¹á?±á??á??á??á?¹"
+msgstr "á??á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "Circuit"
 msgid "Failed"
-msgstr "á?»á??á?³á??á?¯á??á?¹á??á??á??á??á?«"
+msgstr "á??á??á??á?«á??"
 
 msgctxt "Circuit"
 msgid "Closed"
-msgstr "á??á?­á??á?¹á??á?¬á?¸á?»á??á?®á?¸"
+msgstr "á??á?­á??á?ºá??á?¬á?¸á??á??á?º"
 
 msgctxt "Circuit"
 msgid "Unknown"
-msgstr "á?¡á??á?ºá?­á?³á?¸á?¡á??á??á?¹á??á??á?­"
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
-msgstr ""
+msgstr "<á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?¾á?­>"
 
 msgctxt "CircuitListWidget"
 msgid "Connection"
-msgstr "á??á??á?¹á??á?¼á??á?¹á??á??"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯"
 
 msgctxt "CircuitListWidget"
 msgid "Status"
-msgstr "á?¡á?±á?»á??á?¡á?±á??"
+msgstr "á?¡á??á?¼á?±á?¡á??á?±"
 
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
-msgstr "á??á??á?¹á??á??á?¹á?¸á??á?­á?¯ á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?ºá?¶á?³á??/á??á?ºá?²á?? á?¾á??á??á?·á?¹á??á??á?¹"
+msgstr "á??á?¬á?¸á??á??á?ºá??á?­á?¯ á??á?»á?¯á?¶á?·á??á?»á?²á?·á??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
-msgstr "á??á??á?¹á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á?« (Del)"
+msgstr "á??á?¬á?¸á??á??á?ºá??á?­á?¯ á??á?­á??á?ºá??á?«á?? (Del)"
 
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
-msgstr "á??á?®á?¸á??á??á?¹á?¸á??á?½á?³á?¡á?¬á?¸á??á??á?¹á??á??á?¹"
+msgstr "Stream á??á?­á?¯ á??á?­á??á?ºá??á?«á?? (Del)"
 
 msgctxt "ConfigDialog"
 msgid "General"
-msgstr "á?¡á?±á??á?¼á?±á??á?¼"
+msgstr "á??á?±á??á?¯á??á?»"
 
 msgctxt "ConfigDialog"
 msgid "Network"
-msgstr "á??á?¼á??á?¹á??á??á?¹"
+msgstr "á??á?½á??á?ºá??á??á?º"
 
 msgctxt "ConfigDialog"
 msgid "Sharing"
-msgstr "á?¡á??á?°á??á??á?¼á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á?³"
+msgstr "á??á?±á??á?»á?¾á??á?¼á??á?ºá?¸"
 
 msgctxt "ConfigDialog"
 msgid "Services"
-msgstr "á??á??á?¹á?±á??á?¬á??á?¹á??á?½á?³á??á?ºá?¬á?¸"
+msgstr "á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á??á??á?ºá??á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "ConfigDialog"
 msgid "Appearance"
-msgstr "á??á?¶á?¯á??á?¶"
+msgstr "á?¡á??á?¼á??á?º"
 
 msgctxt "ConfigDialog"
 msgid "Advanced"
-msgstr "á?¡á??á??á?¹á?·á?»á??á??á?¹á?·"
+msgstr "á?¡á??á??á?·á?ºá??á?¼á??á?·á?º"
 
 msgctxt "ConfigDialog"
 msgid "Help"
@@ -403,941 +430,934 @@ msgstr "á?¡á??á?°á?¡á??á?®"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
-msgstr "setting á??á?ºá?¬á?¸á??á?­á??á?¹á?¸á??á?¬á??á?¼á??á?¹ error á??á??á?¹á??á??á?¹"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¼á??á?ºá??á?½á?¬á?¸á??á?±á??á??á?ºá??"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia á?¡á?±á??á?»á??á??á?¹á?·á??á??á?¹á?· %1 setting á??á?ºá?¬á?¸á?¡á?¬á?¸á??á??á?­á??á?¹á?¸á??á?­á?¯á??á?¹á??á?«á??"
+msgstr "á??á??á?ºá?? %l á??á??á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
-msgstr "setting á??á?ºá?¬á?¸á??á?­á??á?¹á?¸á??á?¬á??á?¼á??á?¹ error á??á??á?¹á??á??á?¹"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¼á?¯á??á?¯á??á?ºá??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á?¼á??á?ºá??á?½á?¬á?¸á??á??á?ºá??"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia á?¡á?±á??á?»á??á??á?¹á?·á??á??á?¹á?· Tor %1 setting á??á?ºá?¬á?¸á?¡á?¬á?¸á??á??á?­á??á?¹á?¸á??á?­á?¯á??á?¹á??á?«á??"
+msgstr "Tor á??á?­á?¯á?· á??á??á?ºá?? %1 á??á??á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "ConfigDialog"
 msgid "Settings"
-msgstr "á??á?­á??á?¹á?¸á??á?­á?½á??á?½á?³ (setting)"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia á?¡á?±á??á?»á??á??á?¹á?· Tor á?¡á?¬á?¸á??á?ºá?­á??á?¹á??á??á?¹á??á?­á?¯á??á??á??á??á?«á?? (%1)"
+msgstr "Tor á??á?­á?¯ á??á?»á?­á??á?ºá??á??á?ºá??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á?? (%l)"
 
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
-msgstr "á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?½á?³ socket á?¡á?¬á?¸á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á??á?«á??"
+msgstr "á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?±á?¬á?·á??á??á?ºá??á?­á?¯ á??á??á?»á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á?«á??"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
-msgstr "á??á?½á?ºá?­á?³á??á??á??á?¹á??á?¯á??á?¹á??á?­á?¯á?¡á??á?¹á??á??á?¹"
+msgstr "á??á??á?¬á?¸á??á?¾á??á?ºá??á?­á?¯á?¡á??á?ºá??á??á?º"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Remember my password"
-msgstr "á??á?½á?¼á??á?¯á?¹á??á?¹ á??á?½á?ºá?­á?³á??á??á??á?¹á??á?¯á??á?¹á?¡á?¬á?¸á??á?½á??á?¹á??á?¬á?¸á??á??á?¹"
+msgstr "_L á??á?½á??á?ºá??á?²á?·á?¡á??á?­ á??á??á?¬á?¸á??á?¾á??á?ºá??á?­á?¯ á??á?¾á??á?ºá??á?¬á?¸á??á?«"
 
 msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
+msgstr "Vidalia  á??á??á?·á?º Torá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸á??á?»á?­á??á?ºá??á??á?ºá??á?¬á??á?½á??á?ºá??á??á?¬á?¸á??á?¾á??á?ºá??á?»á?¬á?¸á??á?­á?¯á?¡á??á?ºá??á?±á??á??á?·á?º á?? á??á??á?·á?ºá?? á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á??á?¬á?¸á??á?¾á??á?ºá?¡á?¬á?¸ á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?« á??"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
-msgstr "á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?½á?³ socket á?¡á?¬á?¸á??á??á?ºá?­á??á?¹á??á??á?¹á??á?¬á?¸á??á?«á??"
+msgstr "á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?±á?¬á?·á??á??á?ºá??á?­á?¯ á??á??á?»á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á?«á??"
 
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
-msgstr "control command á??á?­á?¯á??á??á?¬á??á?¼á??á?¹ á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á?? [%1]"
+msgstr "á??á?­á??á?ºá?¸á??á?»á?¯á??á?º á??á?½á??á?ºá?¸á??á??á?ºá?¸á??á?¬á??á?¬á?¸á??á?­á?¯ á??á?­á?¯á?·á??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¾á?­á??á?±á??á??á?ºá?? [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr "á?±á??á??á?¬á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸á?¡á?¬á?¸á??á??á?¹á??á??á?¹á?¾á??á?­á?³á?¸á??á?¬á?¸á??á?¬á??á?¼á??á?¹ Socket á??á?ºá?­á??á?¹á??á??á?¹á??á?½á?³á?»á??á??á?¹á??á?¼á?¬á?¸á??á??á?¹á??"
+msgstr "á??á?±á??á?¬á??á??á?ºá??á?®á??á??á?ºá??á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?±á??á??á?ºá??á?½á??á?º á??á?±á?¬á?·á??á??á?º á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á??á??á??á?²á?·á??á?«á??"
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
-msgstr "á??á?½á?¬á?¸á?±á??á?±á??á?¬ á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?½á?³á?»á??á??á?¹á?¾á??á?¬á?¸á??á?ºá??á?¹"
+msgstr "á??á??á?¾á??á?ºá??á??á?ºá??á??á?·á?º á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?¾á?¯ á?¡á??á?¼á?±á?¬á??á?ºá?¸á??á?¼á??á?ºá??á?»á??á?º [%1]"
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
-msgstr ""
+msgstr "á?¡á?¬á??á??á??á?ºá??á??á?ºá??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Andorra"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?­á?¯á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Angola"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?­á?¯á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?®á??á?½á?¬ á??á?¾á??á?·á?º á??á?¬á??á?°á??á?«"
 
 msgctxt "CountryInfo"
 msgid "Argentina"
-msgstr ""
+msgstr "á?¡á?¬á??á?»á??á?ºá??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "á?¡á?¬á??á?±á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "á??á?¼á??á??á?¼á?±á?¸á??á?»"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "á?¡á??á?¬á??á?­á?¯á??á?ºá??á?»á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "á??á??á?¬á?¸á??á?¬á?¸á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "á??á??á??á?ºá?¹á??á?¬á?¸á??á?±á?·á??á?¾á?º"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "á??á?¬á??á?ºá??á??á?­á?¯á?·á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "á??á?®á??á?¬á??á?¯á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "á??á??á?ºá??á?ºá??á?»á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "á??á?°á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "á??á?­á?¯á??á?®á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "á??á?±á?¬á?·á??á??á?®á?¸á??á?¬á?¸ á??á?¾á??á?·á?º á??á?¬á??á?®á??á?­á?¯á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "á??á?±á?¬á?·á??á??á?«á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "á??á??á?¬á?¸á??á?®á?¸"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "á??á??á?°á?¸á??á?­á?¯á??á?ºá?¸ á??á?«á??á?¯á??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "á??á?°á??á?±á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "á??á?¬á??á?®á??á?¬ á??á?¬á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "á??á?°á??á?°á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "á??á??á?¹á??á?±á?¬á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?½á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "á??á??á?±á??á?«"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "á??á?¬á??á?® á?¡á??á?°"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "á?¡á??á??á?ºá??á?­á?¯á??á?ºá?¸ á?¡á?¬á??á??á?­á??"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "á??á?»á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "á??á?»á?®á??á?®"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "á??á??á?¯á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "á??á?­á?¯á??á??á?ºá??á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "á??á?­á?¯á??á?­á?¯á??á?­á?¯á?·á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "á??á?½á??á?ºâ??á??á?­á?¯ á??á?®á??á?­á?¯á??á??á??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr ""
+msgstr "á??á?±á?¬á?·á??á??á?¬á??á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "á??á?¯á??á?ºá??á?®á??á?­á?¯á?¸"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "á??á??á?­á?¯á?¡á?±á?¸á??á?¾á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "á??á?»á?°á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á??á?ºá??á?º"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "á??á?»á??á?ºá??á?º"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "á??á?­á??á?ºá?¸á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "á??á?»á?®á??á?­á?¯á?¸á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "á??á?­á?¯á??á?®á??á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "á??á?­á?¯á??á?®á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "á?¡á?®á??á?½á?±á??á?±á?«"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "á?¡á?®á??á?»á??á?º"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?º á??á?¬á??á?ºá??á?¬á?¸á??á?«á?¸"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "á?¡á?®á??á?½á?±á??á?­á?¯á?¸á??á?®á?¸á??á??á?º á??á?°á?¡á?®á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "á?¡á??á?ºá??á??á?ºá??á?¼á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "á?¡á??á?¹á??â??á??á?­á?¯á?¸â??á??á?®á?¸â??á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "á??á?¼á??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "á??á?«á?·á??á?½á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "á??á??á?ºá??á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "á??á?»á?±á?¬á?ºá??á?»á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr ""
+msgstr "á??á?»á?¬á??á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr ""
+msgstr "á??á?«á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
-msgstr ""
+msgstr "á??á??á?®á??á?¬á??á?«"
 
 msgctxt "CountryInfo"
 msgid "Guatemala"
-msgstr ""
+msgstr "á??á?½á?«á??á?®á??á?¬á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr ""
+msgstr "á??á?°á?¡á?®á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "á??á?°á?¡á?®á??á?®á??á?¬á?¸-á??á??á?ºá??á?¬á?¡á?°"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
-msgstr ""
+msgstr "á??á?°á??á?¬á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Hong Kong"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá??á?±á?¬á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Haiti"
-msgstr ""
+msgstr "á??á?±á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Honduras"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á?°á?¸á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr ""
+msgstr "á?¡á??á?¹á??á??á?±á?¸"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr ""
+msgstr "á?¡á?®á??á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr ""
+msgstr "á??á?»á??á?±á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Japan"
-msgstr ""
+msgstr "á??á?»á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr ""
+msgstr "á??á?»á?±á?¬á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr ""
+msgstr "á??á?¬á??á??á?ºá??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr ""
+msgstr "á??á??á?ºá??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
-msgstr ""
+msgstr "á??á?­á??á?­á??á?¬á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr ""
+msgstr "á??á?°á??á?­á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "á??á?¬á??á?»á?®á??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Laos"
-msgstr ""
+msgstr "á??á?¬á?¡á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr ""
+msgstr "á??á??á?ºá??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?½á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr ""
+msgstr "á??á?®á??á?­á?¯á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr ""
+msgstr "á??á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr ""
+msgstr "á??á?­á??á?»á?ºá??á?²á??á?ºá??á??á?­á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr ""
+msgstr "á??á??á?ºá??á?°á?¡á?±á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr ""
+msgstr "á??á?°á??á??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr ""
+msgstr "á??á?¬á??á?®á??á?­á?¯á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr ""
+msgstr "á??á??á??á??á?ºá??á?ºá??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
-msgstr ""
+msgstr "á??á?¬á??á?¬á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr ""
+msgstr "á??á??á?±á?¸á??á?¾á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Mali"
-msgstr ""
+msgstr "á??á?­á??á?ºá??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Malta"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?ºá??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr ""
+msgstr "á??á?¬á??á?¾á??á?º á??á?»á?½á??á?ºá?¸á??á?¯á??á?»á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá??á?®á??á?¬á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?®á??á?®á??á??á?ºá??á?º"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á?­á?¯á??á?®á?¸á??á?¾á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?ºá??á?­á?¯á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr ""
+msgstr "á??á?­á?¯á??á?¬á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á?­á?¯á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á?®á??á?®á??á??á?­á?¯á?¸"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?­á?¯á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr ""
+msgstr "á??á?­á?¯á??á??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr ""
+msgstr "á??á??á?®á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
-msgstr ""
+msgstr "á??á?¬á?¡á?°á?¸á??á?°"
 
 msgctxt "CountryInfo"
 msgid "Nepal"
-msgstr ""
+msgstr "á??á?®á??á?±á?«"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr ""
+msgstr "á??á??á?ºá??á?¬á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr ""
+msgstr "á??á??á?°á?¸á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr ""
+msgstr "á??á?®á?¸á??á?¬á??á?¬á??á?½á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á?»á?¬"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á?»á?®á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?±"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "á?¡á?­á?¯á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "á??á?«á??á??á?¹á??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "á??á?«á??á?¬á?¡á?°"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "á??á?«á??á??á?ºá??á??á?­á?¯á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "á??á??á?¬á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "á??á?«â??á??á?°â??á?¡á?¬ á??á??á?°á?¸á??á?®á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "á??á?«á??á?¬á??á?½á?±á?¸"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "á??á?®á??á?°á?¸"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "á??á?­á??á??á?ºá??á?­á?¯á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "á??á?­á?¯á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "á??á?±á?«á?ºá??á?°á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "á??á?¬á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "á??á?­á?¯á??á?±á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "á??á?¯á??á?¾á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "á??á??á??á?ºá??á?«"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "á??á?­á??á?·á?ºá??á??á?º á??á?¾á??á?·á?º á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
-msgstr ""
+msgstr "á??á?­á??á?·á?ºá??á?°á??á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "á??á?­á??á?·á?ºá??á??á?ºá?¸á??á??á?·á?º á??á?¾á??á?·á?º á??á??á?®á??á?¬á??á?­á?¯á??á?ºá?¸á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Samoa"
-msgstr ""
+msgstr "á??á??á?­á?¯á?¡á?¬"
 
 msgctxt "CountryInfo"
 msgid "San Marino"
-msgstr ""
+msgstr "á??á??á?ºá??á?¬á??á?®á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "á??á?±á?¬ á??á?­á?¯á??á?® á??á?¾á??á?·á?º á??á??á??á?ºá??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?®á?¡á?¬á??á?±á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
-msgstr ""
+msgstr "á??á?®á??á?®á??á?±á?«"
 
 msgctxt "CountryInfo"
 msgid "Serbia"
-msgstr ""
+msgstr "á??á?¬á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr ""
+msgstr "á??á?±á?¸á??á?¾á?²á??á?ºá??á?º"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
-msgstr ""
+msgstr "á??á?®á?¡á?¬á??á?¬ á??á?®á??á?½á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr ""
+msgstr "á??á??á?ºá?¹á??á?¬á??á?°"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr ""
+msgstr "á??á??á?­á?¯á??á?¬á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr ""
+msgstr "á??á??á?­á?¯á??á?±á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á??á?½á??á?ºá??á?»á?½á??á?ºá?¸á??á?»á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr ""
+msgstr "á??á?­á?¯á??á?¬á??á?®á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá?¡á?¬á??á??á?­á??"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr ""
+msgstr "á??á??á?­á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 msgctxt "CountryInfo"
 msgid "Sudan"
-msgstr ""
+msgstr "á??á?°á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr ""
+msgstr "á??á?°á??á?®á??á?¬á??á??á?·á?º"
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr ""
+msgstr "á??á?½á?¬á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr ""
+msgstr "á??á?½á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á?¬á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr ""
+msgstr "á??á?®á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr ""
+msgstr "á??á?¬á??á?»á??á?ºá??á??á?¹á??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?ºá??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "á??á?®á??á?±á?¬-á??á??á?ºá??á?ºá??á?® (á?¡á??á?¾á?±á?·á??á?®á??á?±á?¬)"
 
 msgctxt "CountryInfo"
 msgid "Togo"
-msgstr ""
+msgstr "á??á?­á?¯á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Tonga"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á?«"
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "á??á??á?®á??á?®á??á??á?º á??á?¾á??á?·á?º á??á?­á?¯á??á?¬á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr ""
+msgstr "á??á?°â??á??á?®á?¸â??á??á?¾á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
-msgstr ""
+msgstr "á??á?°á??á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
-msgstr ""
+msgstr "á??á?¬á?·á??á?ºá??á??á?ºá?¸á??á??á?ºá??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Tuvalu"
-msgstr ""
+msgstr "á??á?°á?¸á??á??á?°á?¸"
 
 msgctxt "CountryInfo"
 msgid "Uganda"
-msgstr ""
+msgstr "á??á?°á??á??á?ºá??á?«"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr ""
+msgstr "á??á?°á??á??á?­á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "á?¡á?¬â??á??á??á?º á??á?±á?¬á?ºá??á?½á?¬á?¸â??á??á?»á?¬á?¸â??á??á?¼á??á?ºá??á?±á?¬á??á?ºá??á?¯"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr ""
+msgstr "á??á?¼á?­á??á?­á??á?º"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr ""
+msgstr "á?¡á??á?±â??á??á?­â??á??á??á?ºâ??á??á?¼á??á?ºá??á?±á?¬á??á?ºá??á?¯"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
-msgstr ""
+msgstr "á?¥á??á?¯á??á?½á?±á?¸"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr ""
+msgstr "á?¥á??á??á??á?ºá??á??á?¹á??á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
-msgstr ""
+msgstr "á??á?¬á?¸á??á?°á?¸á?¡á?¬á??á?°á?¸"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr ""
+msgstr "á??á?¬á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
-msgstr ""
+msgstr "á??á??á?ºá??á?®á??á?½á?²á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Vietnam"
-msgstr ""
+msgstr "á??á?®á??á??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr ""
+msgstr "á?¡á??á?±á?¬á??á?ºá??á?¬á??á?¬á??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr ""
+msgstr "á??á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr ""
+msgstr "á??á??á?ºá??á?®á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
-msgstr ""
+msgstr "á??á??á?ºá??á?¬á??á?½á?±"
 
 msgctxt "CountryInfo"
 msgid "Zaire"
-msgstr ""
+msgstr "á??á?¬á?¡á?®á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?ºá??á?±á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?ºâ??á??á?»á?®á?¸â??á??á?®á?¸â??á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr ""
+msgstr "á?©á??á??á?¼á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr ""
+msgstr "á??á?¬á??á?­á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr ""
+msgstr "á??á?®á??á??á?ºá?¸"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr ""
+msgstr "á?¡á?®á??á?®á??á?­á?¯á?¸á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
-msgstr ""
+msgstr "á??á?®á??á?»á?®"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr ""
+msgstr "á??á??á?­"
 
 msgctxt "CountryInfo"
 msgid "Guam"
-msgstr ""
+msgstr "á??á?°á?¡á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr ""
+msgstr "á??á??á?ºá??á?±á??á?®"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr ""
+msgstr "á?¡á?­á?¯á??á?ºá??á?ºá??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr ""
+msgstr "á?¡á?­á??á?¹á??á?­á??"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr ""
+msgstr "á?¡á??á?ºá??á?­á?¯á??á?®á?¸á??á?¾á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Iran"
-msgstr ""
+msgstr "á?¡á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr ""
+msgstr "á?¡á?®á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr ""
+msgstr "á?¡á?­á?¯á??á?ºá??á?¬á??á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr ""
+msgstr "á??á?¼á?±á?¬á??á?ºá??á?­á?¯á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá??á?­á?¯á??á?®á?¸á??á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Libya"
-msgstr ""
+msgstr "á??á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á??á?­á?¯á??á?º"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr ""
+msgstr "á??á??á?¹á??á??á?®á??á?­á?¯"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr ""
+msgstr "á??á?¼á??á?ºá??á?¬"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á?º"
 
 msgctxt "CrashReportDialog"
 msgid "Submit a Crash Report"
-msgstr ""
+msgstr "á??á?»á??á?ºá??á?®á?¸á??á?¾á?¯á??á?¼á?¡á??á?®á??á??á?ºá??á?¶á??á?¬á??á??á?ºá??á?¼á??á?«á??"
 
 msgctxt "CrashReportDialog"
 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 ""
+msgstr "Vidalia á??á??á?º á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á??á?ºá??á?¯ á??á?¼á??á?ºá??á?½á?¬á?¸á??á?±á??á?¼á?®á?¸ á??á?­á??á?ºá??á??á?º á??á?­á?¯á?¡á??á?ºá??á??á?ºá??"
 
 msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
-msgstr ""
+msgstr "Vidalia á??á?­á?¯ á?¡á??á??á?¾ á??á?¼á??á?ºá??á??á?«á??"
 
 msgctxt "CrashReportDialog"
 msgid "Don't Restart"
-msgstr ""
+msgstr "á?¡á?? á??á?¾ á??á?¼á??á?ºá?? á?? á??á?±á?¬á?·á??á?«á??"
 
 msgctxt "CrashReportDialog"
 msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Vidalia á??á?­á?¯ á?¡á??á??á?¾ á??á?¼á??á?ºá?? á?? á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
+msgstr "Vidalia á??á?­á?¯ á?¡á??á??á?¾ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?¼á??á?ºá??á??á??á?º á??á??á??á?­á?¯á??á?ºá??á?«á?? á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? Vidalia á??á?­á?¯ á??á?¯á??á?ºá??á??á?ºá?¸á??á?¯á?¶á?¸á?? á?¡á??á??á?¾ á??á?¼á??á?ºá??á??á?«á?? "
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
-msgstr ""
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr "á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá??á?¾á??á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?­á?¯ á??á?¼á??á?·á?ºá??á?«á??"
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
-msgstr ""
+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 ""
+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 "á??á?¼á?¿á??á?¬á??á?­á?¯ á??á?½á?²á??á?¼á??á?ºá?¸á??á?­á??á?ºá??á?¼á?¬á??á?¼á?®á?¸ á?¡á??á?¾á?¬á?¸á??á?¼á??á?ºá??á??á?ºá??á?±á?¸á??á?­á?¯á??á?ºá??á??á?º Vidalia á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?±á?¸á??á?¬á?¸á??á?°á??á?»á?¬á?¸á??á?¶á??á?­á?¯á?· á??á?±á?¸á??á?­á?¯á?·á??á?­á?¯á??á?ºá??á??á?·á?º á??á?»á??á?ºá??á?®á?¸á??á?¾á?¯á??á?¼á?¡á??á?®á??á??á?ºá??á?¶á??á?¬á??á?­á?¯ á??á??á?ºá??á?®á?¸á??á?­á?¯á??á?ºá??á??á?ºá?? á??á??á?ºá??á?­á?¯á?·á??á?­á?¯á??á?ºá??á??á?·á?º á?¡á??á?®á??á??á?ºá??á?¶á??á?¬á?? á??á?¯á??á?¹á??á?­á?¯á??á?ºá??á?±á?¸á??á?¬ á??á?½á?²á??á?¼á??á?ºá?¸á??á?­á??á?ºá??á?¼á?¬á??á??á?·á?º á??á??á?ºá??á??á?·á?º á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?¾ á??á??á?«á??á??á?ºá??á?«á??"
+
+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 "GeneralPage"
 msgid "Executables (*.exe)"
-msgstr "exe á??á?¯á?­á??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á??á?­á?¯á??á??á??á?ºá?¡á??á??á?¼á?¯á??á??á?¬á??á?»á?¬á?¸ (*.exe)"
 
 msgctxt "GeneralPage"
 msgid "Select Path to Tor"
-msgstr "Tor á?¡á??á?¼á??á?¹á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á?±á??á?¼á?¸á??á?ºá??á?¹á??á??á?¹"
+msgstr "Tor á??á?­á?¯á?· á??á?½á?¬á?¸á??á?¬ á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr "á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ Proxy á??á?¯á?­ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
+msgstr "á??á??á?±á?¬á??á?ºá??á?®á?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á??á??á?ºá??"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
-msgstr "á??á??á?¹á?? á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?­á?¯á??á?¹á?±á??á?¬ Tor á??á?¯á?­ á?¡á??á??á?¹ á??á??á?¹á??á?½á??á?¹á?±á??á?¸á??á?«"
+msgstr "á??á??á?ºá?? Tor á??á??á?­á?¯á??á??á??á?ºá?¡á??á??á?¼á?¯á??á??á?¬á?? á?¡á??á??á?º á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á??á??á?ºá??"
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
-msgstr "Vidalia á??á?¯á?­ á??á??á??á?¹á??á??á??á?¹á??á?ºá?­á??á?¹á??á?¼á??á?¹ á??á??á??á?¹á??á?«"
+msgstr "á??á??á??á?ºá??á??á?ºá??á?¬á??á?±á?¬á?¡á??á?« Vidalia á??á?­á?¯ á?¡á??á??á?¼á?¯á??á?«á??"
 
 msgctxt "GeneralPage"
 msgid "Browse"
-msgstr "Browse"
+msgstr "á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¬á??á?½á?±á??á?«á??"
 
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
-msgstr "Tor á?±á??á?¬á?·á??á?²á??á?­á?¯ Vidalia á??á??á??á?¹á??á?ºá?­á??á?¹á??á?¼á??á?¹ á??á??á??á?¹á??á?«"
+msgstr "á??á??á??á?ºá??á??á?ºá??á?¬á??á?±á?¬á?¡á??á?« Vidalia á??á?­á?¯ á?¡á??á??á?¼á?¯á??á?«á??"
 
 msgctxt "GeneralPage"
 msgid "Tor"
@@ -1345,95 +1365,95 @@ msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr "Proxy Application (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)"
+msgstr "_F á??á?­á?¯á??á?« á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ (á??á??á?½á?±á?¸á??á??á?ºá?¸á??):"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr "Proxy application á??á?­á?¯ Tor á??á??á??á?¹á??á?ºá?­á??á?¹á??á?¼á??á?¹ á??á??á??á?¹á??á?«"
+msgstr "Tor á??á??á??á?ºá??á?»á?¾á??á?º á??á??á?±á?¬á??á?ºá??á?® á?¡á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á?¡á?¬á?¸á??á??á?«"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr "Proxy Application á??á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸ :"
+msgstr "á?¤á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?­á?¯ á??á?¬á??á?¬á??á?¼á??á?ºá??á??á?º..."
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr ""
+msgstr "á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "á??á?±á?¬á?·á??á?²á??á?ºá?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "á??á??á?¯ á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?º á??á?»á?¾á??á?º %1  á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "GraphFrame"
 msgid "%1 KB"
-msgstr "%1 KB"
+msgstr "%1 á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "GraphFrame"
 msgid "%1 MB"
-msgstr "%1 MB"
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º %1 á??á??á?¹á??á?«á??á?­á?¯á??á?º"
 
 msgctxt "GraphFrame"
 msgid "%1 GB"
-msgstr "%1 GB"
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º %1 á??á??á?ºá??á?«á??á?­á?¯á??á?º"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr ""
+msgstr "á??á??á?ºá??á?¶ -"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
-msgstr ""
+msgstr "á??á?±á?¸á??á?­á?¯á?·á??á?¼á?®á?¸ - "
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
-msgstr "á?±á??á?¸á??á?¬á?¸á?±á??á?¬ XML á??á?­á?¯á??á?¹á??á??á?¹ á??á?½á??á?¹á??á??á?¹á?±á??á?¬ á??á?­á?¯á??á?¹á??á?¶á?¯á??á?¶á??á??á?¯á??á?¹á??á?«á??"
+msgstr "á??á?¼á??á?·á?ºá??á?½á??á?ºá?¸á??á??á?·á?º XML á??á?­á?¯á??á?ºá??á??á?º á??á??á?ºá??á?¾á??á?ºá??á?±á?¬ á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?»á?¬á?¸ á??á?¬á??á?½á??á?ºá??á?¬á??á??á?ºá?¸á??á??á?ºá??á?¯ á??á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
-msgstr "á??á?½á?¬á?±á??á?¼á??á?½á?³á?»á??á?®á?¸á??á?¶á?¯á?¸á??á??á?¹"
+msgstr "á??á?¾á?¬á??á?½á?±á??á?¾á?¯á??á??á?º á??á?¬á??á?½á??á?ºá??á?¬á??á??á?ºá?¸á?? á?¡á??á?¯á?¶á?¸á??á?­ á??á?±á?¬á??á?ºá??á?½á?¬á?¸á??á??á?ºá??"
 
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
-msgstr "á??á?½á?¬á?±á??á?¼á??á?½á?³á??á??á??á?¹á??á??á?¹"
+msgstr "á??á?¾á?¬á??á?½á?±á??á?¾á?¯á??á??á?º á??á?¬á??á?½á??á?ºá??á?¬á??á??á?ºá?¸á?? á?¡á??á??á?­á?¯á?· á??á?±á?¬á??á?ºá??á?½á?¬á?¸á??á??á?ºá??"
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
-msgstr "á??á?¬á??á?¬á?¸á??á?½á?¬á??á?±á??á?¼á??á??á?«"
+msgstr "á??á?¬á??á?½á??á?ºá??á?¬á??á??á?ºá?¸á??á?²á??á?½á??á?º á??á?¬á??á?¬á?¸á??á?­á?¯ á??á?¾á?¬á??á??á?½á?±á?·á??á?«á??"
 
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
-msgstr "á??á??á??á?¹ %1 á?±á??á?¼á??á??á??á?¹"
+msgstr "á??á??á??á?º %1 á??á?¯ á??á?­á?¯ á??á?¾á?¬á??á?½á?±á??á?½á?±á?·á??á?¾á?­á??á?²á?·á??á??á?ºá??"
 
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
-msgstr "Vadalia á?¡á??á?°"
+msgstr "Vidalia á?¡á??á?°á?¡á??á?®"
 
 msgctxt "HelpBrowser"
 msgid "Back"
-msgstr "á?±á??á?¬á??á?¹á??á?­á?¯á??"
+msgstr "á??á?±á?¬á??á?ºá??á?­á?¯á?·"
 
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
-msgstr "á??á??á??á?¹á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?­á?¯á??á??á?¼á?¬á?¸á??á?« (Backspace)"
+msgstr "á??á??á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬ á??á?­á?¯á?· á??á?½á?±á?·á??á?«á?? (Backspace)"
 
 msgctxt "HelpBrowser"
 msgid "Backspace"
-msgstr "á??á??á??á?¹á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?­á?¯á??á??á?¼á?¬á?¸á??á?«"
+msgstr "Backspace"
 
 msgctxt "HelpBrowser"
 msgid "Forward"
-msgstr "á?±á??á?½á??á??á?¯á?­á??á??á?¼á?¬á?¸á??á?«"
+msgstr "á?¡á??á?¾á?±á?·á??á?­á?¯á?·"
 
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
-msgstr "á?±á??á?¬á??á?¹á??á??á?¹á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á??á?¹á??á?¯á??á?­á?¯á?? á??á?¼á?¬á?¸á??á?« (Shict+Backspace)"
+msgstr "á??á?±á?¬á??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?­á?¯á?· á??á?½á?±á?·á??á?«á?? (Shift+Backspace)"
 
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
@@ -1441,11 +1461,11 @@ msgstr "Shift+Backspace"
 
 msgctxt "HelpBrowser"
 msgid "Home"
-msgstr "á??á?°á??á??á?¬á??á?ºá??á?¹á??á?½á?¬"
+msgstr "á?¡á?­á??á?ºá??á?­á??á?ºá??á?¬"
 
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
-msgstr "á??á?°á??á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?­á?¯á?? á??á?¼á?¬á?¸á??á?« (Ctrl+H)"
+msgstr "á??á?°á??á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?­á?¯á?· á??á?½á?±á?·á??á?«á?? (Ctrl+H)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
@@ -1453,12 +1473,11 @@ msgstr "Ctrl+H"
 
 msgctxt "HelpBrowser"
 msgid "Find"
-msgstr "á??á?½á?¬á?±á??á?¼á??á??á?¹"
+msgstr "á??á?¾á?¬"
 
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-"á??á?¬á??á?¶á?¯á?¸á??á??á?¹á??á?¯ á??á?­á?¯á??á??á??á?¯á??á?¹ á??á?¬á??á?¯á??á??á?¹á??á?¯á??á?¯á?­ á??á??á?¹á??á?½á?­á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?¼á??á?¹ á??á?½á?¬á?±á??á?¼á??á??á?¹ (Ctrl+F)"
+msgstr "á??á??á?ºá??á?¾á?­á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?±á?«á?ºá??á?¾á?­ á??á??á?¬á?¸á??á?¯á?¶á?¸ (á??á?­á?¯á?·) á??á??á?¬á?¸á??á?¯ á??á??á?ºá??á?¯á??á?¯ á?¡á??á?½á??á?º á??á?¾á?¬á??á?«á?? (Ctrl+F)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
@@ -1466,11 +1485,11 @@ msgstr "Ctrl+F"
 
 msgctxt "HelpBrowser"
 msgid "Close"
-msgstr "á??á?­á??á?¹á??á?«"
+msgstr "á??á?­á??á?ºá??á?­á??á?ºá?¸"
 
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
-msgstr "Vidalia á?¡á??á?°á?¡á??á?®á??á?¯á?­ á??á?­á??á?¹á??á?«"
+msgstr "Vidalia á?¡á??á?°á?¡á??á?®á??á?­á?¯ á??á?­á??á?ºá??á?«á??"
 
 msgctxt "HelpBrowser"
 msgid "Esc"
@@ -1478,174 +1497,168 @@ msgstr "Esc"
 
 msgctxt "HelpBrowser"
 msgid "Find:"
-msgstr "á??á?½á?¬á??á?«:"
+msgstr "á??á?¾á?¬á??á?½á?± -"
 
 msgctxt "HelpBrowser"
 msgid "Find Previous"
-msgstr "á?±á??á?½á??á??á?­á?¯á?? á?»á??á??á?¹á??á?½á?¬á??á??á?¹"
+msgstr "á??á?±á?¬á??á?ºá??á?¼á??á?º á??á?¾á?¬"
 
 msgctxt "HelpBrowser"
 msgid "Find Next"
-msgstr "á?±á??á?¬á??á?¹á??á??á?¹á??á?½á?¬á?±á??á?¼á??á??á?¹"
+msgstr "á??á?¾á?±á?·á??á??á?º á??á?¾á?¬"
 
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
-msgstr "á??á?¬á??á?¶á?¯á?¸á?¡á?¾á??á?®á?¸á?¡á??á?¸á??á?½á??á?¹á?·á?¡á??á?­á?¡á??á?º"
+msgstr "á??á?¬á??á?¯á?¶á?¸á?¡á??á?¼á?®á?¸á?¡á??á?±á?¸ á??á?½á?±á?¸á??á??á?ºá??"
 
 msgctxt "HelpBrowser"
 msgid "Whole words only"
-msgstr "á??á?¬á??á?¬á?¸á??á??á?¹á??á?¯á??á?¶á?¯á?¸á??á?½á??á?¹á?·á??á?¬"
+msgstr "á??á??á?¬á?¸á??á?¯á?¶á?¸á??á??á?ºá??á?¯á??á?¯á?¶á?¸á??á?¬á??á?»á?¾á??á?º"
 
 msgctxt "HelpBrowser"
 msgid "Help Topics"
-msgstr "á??á?°á??á?®á??á?? á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?ºá?¬á?¸"
+msgstr "á?¡á??á?°á?¡á??á?®á??á?±á?¸ á??á?±á?«á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "HelpBrowser"
 msgid "Contents"
-msgstr "á??á?«á??á??á?¹á??á??á?¹á?· á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á?¬á??á?­á??á?¬"
 
 msgctxt "HelpBrowser"
 msgid "Search"
-msgstr "á??á?½á?¬á?±á??á?¼á??á?«"
+msgstr "á??á?¾á?¬á??á?½á?±"
 
 msgctxt "HelpBrowser"
 msgid "Searching for:"
-msgstr "á??á?½á?¬á?±á??á?¼á??á??á?¹ :"
+msgstr "á??á?¾á?¬á??á?½á?±á??á?­á?¯á??á??á?ºá??á?¾á?¬ - "
 
 msgctxt "HelpBrowser"
 msgid "Found Documents"
-msgstr "á?±á??á?¼á??á??á?­á?½á??á??á?¹á?· á??á?¬á??á?¼á??á?¹á??á?¬á??á??á?¹á?¸á??á?ºá?¬á?¸"
+msgstr "á??á?¾á?¬á??á?½á?±á??á?½á?±á?·á??á?¾á?­á??á??á?·á?º á??á?¬á??á?½á??á?ºá??á?¬á??á??á?ºá?¸á??á?»á?¬á?¸"
 
 msgctxt "HelpBrowser"
 msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "á?¡á??á?°á?¡á??á?® á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á??á?°á??á?±á??á??á?º á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¼á??á?ºá??á?½á?¬á?¸á??á??á?º -"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr "á?»á??á??á?¹á?? á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?¯á?­ á??á?¼á??á?¹á?·á??á?½á??á?¹á?»á??á??á?¹á?¸"
+msgstr "á??á?¼á??á?ºá??á??á?»á?­á??á?ºá??á??á?ºá??á??á?·á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia á??á??á?¹ á??á??á?¹á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?­á?¯ á??á?¶á?¯á?±á?? Web browser á??á?¼á??á?¹ "
-"á??á?¼á??á?¹á?·á??á?½á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? á??á??á?¹á?? browser á??á??á?¹ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ "
-"á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?»á??á??á?¹á?¸ á??á??á?½á?­á??á?«á?? á?±á??á?¬á??á?¹á?¸á??á?¯á?­á??á??á??á??á?¹ á?¡á??á??á?¹á??á??á?­ á?»á??á??á?¹á??á?¯á?­á??á?¹á??á??á?¹ á??á??á?¯á??á?¹á??á?«"
+msgstr "Vidalia "
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Vidalia á??á?½ á??á??á?¹á?? web browser á??á?¼á??á?¹ á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?¯á?­ á??á?¼á??á?¹á?·á??á?½á??á?¹á?±á??á??á?¯á?­á??á?«á??á??á?¬á?¸ ?"
+msgstr "á??á??á?ºá??á??á?º Vidalia á??á?­á?¯ á??á??á?ºá?? á??á??á?ºá??á?ºá??á??á?±á?¬á?·á??á?¬á??á?½á??á?º á??á?»á?­á??á?ºá??á??á?ºá??á??á?·á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á?±á??á?»á??á?ºá??á??á?¬á?¸?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
-msgstr "á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?­á?¯ á??á??á?¼á??á?·á?¹á??á?½á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "á??á?»á?­á??á?ºá??á??á?ºá??á??á?·á?ºá??á?­á?¯ á??á??á?½á??á?·á?ºá??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia á??á??á?¹ á??á??á?¹á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?­á?¯ Web browser á??á?¼á?? "
-"á??á??á?¼á??á?·á?¹á??á?½á??á?¹á??á?¯á?­á??á?¹á??á?«á?? URL á??á?¯á?­ á??á??á?¹á?? browser á??á?¼á??á?¹ á?±á??á?¬á?¹á??á?®á??á?°á?¸á??á?° "
-"á?»á??á??á?¹á??á?¼á?¬á?¸á??á?°á??á?­á?¯á??á?¹á?±á??á?¸á??á?«á??á??á?¹á??"
+msgstr "á??á??á?ºá?? á??á??á?ºá??á?ºá??á??á?±á?¬á??á?·á?ºá??á?¬á??á?½á??á?º á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?º á??á?»á?­á??á?ºá??á??á?ºá??á??á?·á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á?? á??á??á?ºá??á??á?º URL á??á??á?ºá??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?°á?¸á??á?°á??á?­á?¯á??á?ºá??á?¼á?®á?¸ á??á??á?ºá?? á??á??á?ºá??á?ºá??á??á?±á?¬á??á?·á?ºá??á?¬á??á?½á??á?º á??á?°á?¸á??á??á?·á?ºá??á?­á?¯á??á?ºá??á?±á?¸á??á??á?ºá??"
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
-msgstr ""
+msgstr "á?¡á??á?°á?¡á??á?®á??á?­á?¯á??á?ºá??á?½á??á?·á?ºá??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?¾á?­á??á??á?º - "
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr "á??á?­á?¯á??á?¹á??á??á?¹ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?º"
 
 msgctxt "LicenseDialog"
 msgid "License"
-msgstr "á??á?¯á?­á??á?¹á??á??á?¹"
+msgstr "á??á?­á?¯á??á?ºá??á??á?º"
 
 msgctxt "LicenseDialog"
 msgid "Credits"
-msgstr "á??á?¯á??á?¹á?»á??á?³á??á?½á??á?¹á??á??á?¹á?¸"
+msgstr "á??á?¯á??á?ºá??á?¼á?¯á??á?¾á??á?ºá??á??á?ºá?¸á??á?½á?¾á?¬"
 
 msgctxt "LogEvent"
 msgid "Debug"
-msgstr "Debug"
+msgstr "á?¡á??á?¾á?¬á?¸á??á??á?º"
 
 msgctxt "LogEvent"
 msgid "Info"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹"
+msgstr "á??á??á??á?ºá?¸"
 
 msgctxt "LogEvent"
 msgid "Notice"
-msgstr "á??á??á?­á?»á??á?³á??á??á?¹"
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "LogEvent"
 msgid "Warning"
-msgstr "á??á??á?­á?±á??á?¸á??á?ºá??á?¹"
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "LogEvent"
 msgid "Error"
-msgstr "á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
+msgstr "á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "LogEvent"
 msgid "Unknown"
-msgstr "á?¡á??á??á?¹á??á??á?­"
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "LogTreeItem"
 msgid "Debug"
-msgstr ""
+msgstr "á?¡á??á?¾á?¬á?¸á??á??á?º"
 
 msgctxt "LogTreeItem"
 msgid "Info"
-msgstr ""
+msgstr "á??á??á??á?ºá?¸"
 
 msgctxt "LogTreeItem"
 msgid "Notice"
-msgstr ""
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "LogTreeItem"
 msgid "Warning"
-msgstr ""
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "LogTreeItem"
 msgid "Error"
-msgstr ""
+msgstr "á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "LogTreeItem"
 msgid "Unknown"
-msgstr ""
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr "Tor á??á?¯á?­ á??á??á??á?¹á??á?«"
+msgstr "Tor á??á?­á?¯ á?¡á??á??á?¼á?¯á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Exit"
-msgstr "á??á?¼á??á?¹á??á?«"
+msgstr "á??á?½á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr "Bandwidth á?»á?? á??á??á?¬á?¸á??á?¶á?¯"
+msgstr "á??á??á?ºá??á??á?·á?º á??á??á??á?ºá??á?º"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr "Netowrk á?±á?»á??á??á?¶á?¯"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼ á??á?¼á?±á??á?¯á?¶"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr "á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?¬á?±á??á??á?¬"
+msgstr "á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?¾á?¯á??á?±á??á?¬"
 
 msgctxt "MainWindow"
 msgid "Settings"
-msgstr "á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "MainWindow"
 msgid "About"
-msgstr "á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬"
+msgstr "á?¡á??á?¼á?±á?¬á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Help"
@@ -1653,7 +1666,7 @@ msgstr "á?¡á??á?°á?¡á??á?®"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr "á??á?¯á?­á??á?¹á??á?­á?¯á??á?¹á?¡á??á?½á??á?¹á?¡á??á?¬á?¸á?¡á??á??á?¹"
+msgstr "á??á??á?°á??á?®á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯á??á?½á?²á??á?¼á?¬á?¸á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
@@ -1661,27 +1674,27 @@ msgstr "Ctrl+T"
 
 msgctxt "MainWindow"
 msgid "Ctrl+B"
-msgstr "Ctrl+B"
+msgstr "Ctrl+H"
 
 msgctxt "MainWindow"
 msgid "Ctrl+L"
-msgstr "Ctrl+L"
+msgstr "Ctrl+H"
 
 msgctxt "MainWindow"
 msgid "Ctrl+N"
-msgstr "Ctrl+N"
+msgstr "Ctrl+H"
 
 msgctxt "MainWindow"
 msgid "Ctrl+?"
-msgstr "Ctrl+?"
+msgstr "Ctrl+H"
 
 msgctxt "MainWindow"
 msgid "Ctrl+I"
-msgstr "Ctrl+I"
+msgstr "Ctrl+H"
 
 msgctxt "MainWindow"
 msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr "Ctrl+H"
 
 msgctxt "MainWindow"
 msgid "Tor"
@@ -1689,7 +1702,7 @@ msgstr "Tor"
 
 msgctxt "MainWindow"
 msgid "View"
-msgstr "á?¾á??á??á?¹á?·á??á??á??á??á?¹"
+msgstr "á??á?¼á??á?ºá??á?½á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Vidalia Help"
@@ -1697,477 +1710,471 @@ msgstr "Vidalia á?¡á??á?°á?¡á??á?®"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr "Web browser á??á??á??á?¹á??á?¬á??á?¼á??á?¹ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
+msgstr "Web Browser á?¡á??á?½á??á?ºá?¸á?? á??á?¯á??á?ºá??á?¶á??á?½á??á?·á?ºá??á?¬á??á?½á??á?º á??á?¼á?¿á??á?¬á??á?¾á?­á??á?±á??á??á?º"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia á??á?½ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ Web browser á??á?­á?¯ á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "á??á??á?±á?¬á??á?ºá??á?¬á?¡á?¬á?¸ Vidalia á?¡á??á?½á??á?ºá??á?¼á??á?ºá??á?¬á?¸á??á??á?·á?ºá??á?¾á?¬ á??á??á??á??á?ºá??á?­á?¯á??á?ºá??á?±á?¸á??á?«"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr "IM client á??á?¯á?­ á??á??á??á?¹á??á?¬á??á?¼á??á?¹ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
+msgstr " IM á??á??á?­á?¯á??á?ºá?¸á??á??á?·á?ºá??á??á??á?ºá??á?¬á??á?½á??á?ºá??á?¼á??á??á?¬á??á?¾á?­á??á?±á??á??á?º"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ IM client á??á?¯á?­ á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "Vidalia  á??á??á?ºIM Clientá?¡á?¬á?¸á??á?¼á??á?ºá??á?¾á?¯á?·á?¡á?¬á?¸á??á??á??á?ºá??á??á?º á??á??á??á?ºá??á?­á?¯á??á?ºá??á?«"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
-msgstr "Proxy server á??á??á??á?¹á??á?¬á??á?¼á??á?¹ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
+msgstr "á??á?¬á??á?¬á??á?­á?¯á?·á??á?»á?­á??á?ºá??á??á?ºá??á?¬á??á?½á??á?º á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¾á?­á??á?±á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ Proxy server á??á?­á?¯ á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "Vidalia á??á??á?±á?¬á??á?ºá??á?®á??á?¬á??á?¬á?¡á?¬á?¸á??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á?· á??á??á??á??á?ºá??á?­á?¯á??á?ºá??á?«"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr "Relay directory á??á?¯á?­ á??á??á?¹á??á?¼á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "Relay á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯á?· á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr "Encrypt á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ Directory á??á??á?¹á??á?¼á??á?¹á??á?? á??á??á?¹á??á?¯á??á?¯á?­ á??á?¯á??á?¹á??á??á??á?¹á?±á??á??á?«á??á??á?¹á??"
+msgstr "á??á?¬á??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á??á?ºá??á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
-msgstr "Network á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯ á?»á??á??á?¹á??á??á?¹ á??á??á?°á?±á??á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á??á?ºá?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯ á??á??á?°á??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Loading network status"
-msgstr "Network á?¡á?±á?»á??á?¡á?±á??á??á?¯á?­ á??á??á?¹á??á?°á?±á??á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á??á?ºá?¡á??á?¼á?±á?¡á??á?±á??á?­á?¯ á??á?½á?²á??á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr "á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸á??á??á?¹á?±á??á?¸á?¡á??á?­á?¡á??á?½á??á?¹á?»á??á?³á??á?? á??á??á?¹á??á?°á?±á??á??á?«á??á??á?¹"
+msgstr "á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?½á??á?·á?ºá?¡á??á?­á?¡á??á?¾á??á?ºá??á?¼á?¯á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?±á?«á?ºá??á?°á??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr "Relay á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸ á?±á??á?¬á??á?¹á?¸á??á?­á?¯á?±á??á??á?«á??á??á?¹"
+msgstr "Relay"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr "Relay á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸ á??á??á?¹á??á?°á?±á??á??á?«á??á??á?¹"
+msgstr "Relay á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?½á?²á??á?°á??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr "Tor Network á??á?­á?¯ á??á??á?¹á??á?¼á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á??á??á?ºá??á??á?ºá??á?­á?¯á?· á??á?»á?­á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
-msgstr "Tor á??á??á?¹á??á??á?¹á?¸á??á??á?¹á??á?¯ á??á?¯á??á?¹á??á??á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á??á?¬á?¸á??á??á?ºá??á??á?ºá??á?¯á??á?­á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
-msgstr "Tor Network á??á?­á?¯á?? á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á??á?«á??á??á?¹ !"
-
-msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "á?¡á??á?­á?¡á??á?½á??á?¹á??á?»á??á?³á??á?¯á?­á??á?¹á?±á??á?¬ á??á??á??á?¹á??á?? á?¡á?±á?»á??á?¡á?±á??"
+msgstr "Tor á??á??á?ºá??á??á?ºá??á?­á?¯á?· á??á?»á?­á??á?ºá??á??á?ºá??á?­á??á?¼á?® !"
 
 msgctxt "MainWindow"
 msgid "miscellaneous"
-msgstr "á?¡á?±á??á?¼á?±á??á?¼"
+msgstr "á?¡á??á?»á?­á?¯á?¸á??á?»á?­á?¯á?¸á?¡á??á?½á?±á??á?½á?±"
 
 msgctxt "MainWindow"
 msgid "identity mismatch"
-msgstr "á??á?¯á?­á??á?¹á??á?­á?¯á??á?¹á?¡á??á?½á??á?¹á?¡á??á?¬á?¸ á??á?²á?¼á??á?½á?¬á?¸á??á?²á?¼á??á??á?¹á??á??"
+msgstr "á??á??á?°á??á?®á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯á??á?½á?²á??á?¼á?¬á?¸á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "done"
-msgstr "á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á??á?«á?»á??á?®"
+msgstr "á??á?¼á?®á?¸á??á?½á?¬á?¸á??á?¼á?®"
 
 msgctxt "MainWindow"
 msgid "connection refused"
-msgstr "á??á??á?¹á??á?¼á??á?¹á??á??á??á?¯á?­ á?»á??á??á?¹á?¸á??á?­á?¯á??á?«á??á??á?¹"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á?¼á??á?ºá?¸á??á??á?ºá??á?¼á??á?ºá?¸á??á?¶á??á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "connection timeout"
-msgstr "á??á??á?¹á??á?¼á??á?¹á??á?? á?¡á??á?ºá?­á??á?¹á?±á??á?ºá?¬á?¹á??á?¼á??á?¹á??á?¼á?¬á?¸á??á?«á??á??á?¹"
+msgstr "á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á?¡á??á?»á?­á??á?ºá??á?½á??á?ºá??á?½á?¬á?¸á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "read/write error"
-msgstr "á??á??á?¹á??á??/á?±á??á?¸á??á?¬á?¸á??á?? á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á?±á??á?»á??á??á?¹á?¸"
+msgstr "á??á?±á??á?¬ á??á??á?º/á??á?±á?¸ á??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "MainWindow"
 msgid "no route to host"
-msgstr "Host á??á?¯á?­á?? á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á??á??á?½á?­á??á?«"
+msgstr "á?¡á?­á??á?ºá??á?¾á??á?ºá??á?½á??á?ºá??á?»á?°á??á?¬á??á?­á?¯á?·á??á?½á?¬á?¸á??á?¬ á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?¾á?­á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "insufficient resources"
-msgstr "á?¡á??á??á?¹á?¸á?¡á?»á??á??á?¹á??á?ºá?¬á?¸ á??á??á?¶á?¯á?±á??á?¬á??á?¹á??á?«"
+msgstr "á??á??á?¯á?¶á??á?±á?¬á??á?ºá??á??á?·á?º á?¡á??á??á?ºá?¸á?¡á??á?¼á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "MainWindow"
 msgid "unknown"
-msgstr "á??á??á?­á??á?­á?¯á??á?¹á?±á??á?¬"
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "MainWindow"
 msgid "Tor is not running"
-msgstr "Tor á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?±á??á??á?«"
+msgstr "Tor á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
-msgstr "Tor á??á?­á??á?¹á??á?­á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á??á?­á?¯ á??á?­á??á?ºá??á?±á??á?²"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr "Tor á??á?¯á?­ á??á??á?¯ á??á??á?¹á??á??á?¹á??á??á?«"
+msgstr "%s á??á?­á?¯á??á?ºá?¸á??á?¼á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?º"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr "Tor á??á?¯á?­ á??á??á?¹á??á??á?¹á??á??á?«"
+msgstr "Tor á??á?­á?¯ á??á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
-msgstr "Tor á?±á??á?¬á?·á??á?² á??á??á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?º á?¡á??á??á?¼á?¯á??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Starting Tor"
-msgstr "Tor á?±á??á?¬á?·á??á?² á??á??á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á?¡á??á??á?¼á?¯á??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
-msgstr "Tor á??á??á??á?¹á??á?? á??á?ºá?³á?­á??á??á?¼á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á?¡á??á??á?¼á?¯á??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¾á?­á??á?±á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia á??á??á?¹ Tor á??á?¯á?­ á?? á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«á?? á??á??á?¹á?? á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ Tor á?? á??á?½á??á?¹á??á??á?¹á?±á??á?¬ "
-"á?¡á??á??á?¹á??á?½á??á?¹á?· á?±á??á??á?¬á??á?­á?¯ á??á?ºá?­á??á?¹á??á?­á??á??á?¬á?¸á?±á?¾á??á?¬á??á?¹á?¸ á?±á??á??á?ºá?¬á?±á??á??á??á?¹ á??á??á?¹á?±á??á?¸á??á?«á??"
+msgstr "Vidalia á??"
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
-msgstr "Tor á??á?­á?¯á?? á??á??á?¹á??á?¼á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á??á?­á?¯ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Connection Error"
-msgstr "á??á??á?¹á??á?¼á??á?¹á??á?? á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr "Relaying á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgstr "Relay á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á??á?±á??á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
-msgstr "á??á?­á??á?¹á??á?­á??á?¹á?¸á??á?? á??á?ºá?³á?­á??á??á?¼á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á?­á??á?ºá??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia á??á??á?¹ Tor á?±á??á?¬á?·á??á?²á??á?­á?¯ á??á??á??á?¹á??á??á?¹á??á??á?­á?¯á??á?¹á??á?«"
+msgstr "Tor á??á?±á?¬á?·á??á?²á??á?ºá??á?­á?¯ á??á??á?ºá??á??á?·á?ºá??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Unexpected Error"
-msgstr "á??á?±á??á?½á?ºá?¬á?¹á??á?½á??á?¹á?¸á??á?­á?¯á??á?¹á?±á??á?¬ á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á?ºá??á?¹"
+msgstr "á??á??á?ºá??á?¾á??á?ºá??á??á?¬á?¸á??á?±á?¬ á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
-msgstr "Tor á??á?­á?¯á?? á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?¡á??á??á?¹á?±á??á?¸á??á?¶á?±á??á??á?«á??á??á?¹"
+msgstr "Tor á??á?­á?¯á?· á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á??á?¼á??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
-msgstr "á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ Cookie á??á?­á?¯á?¡á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á?½á??á?ºá??á?®á?¸ á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á??á?¼á??á?¼á??á?ºá?¸ á??á?­á?¯á?¡á??á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor á?±á??á?¬á?·á??á?²á??á??á?¹ Vidalia á?±á??á?¬á?·á??á?²á??á?¯á?­  á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ cookie á??á?ºá?¬á?¸ á??á?­á?¯á??á??á??á??á?¹á??á??á?¹ "
-"á??á?­á?¯á?¡á??á?¹á??á?«á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á?¹ Vidalia á??á?½á?¬á?±á??á?¼á??á?±á??á?¼á??á??á?½á?­á??á?¯á?­á??á?¹á??á?«"
+msgstr "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á??á?¼á??á?½á??á?ºá??á?®á?¸á??á??á?«á??á??á?ºá??á??á?·á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?­á?¯á?·á??á?½á?¾á??á?ºá??á??á?º Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á??á?º Vidalia á??á?­á?¯ á??á?­á?¯á?¡á??á?ºá??á??á?ºá?? á??á?­á?¯á?·á??á?±á?¬á?º Vidalia á??á??á?º á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á??á?¼á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?¯á??á?­á?¯á??á??á?º á??á?¾á?¬á??á??á?½á?±á?·á??á?»á?±á??"
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "á??á??á?¹ 'control_auth_cookie' á??á?­á?¯á??á?¹á??á?¯á?­ á??á?­á??á?­á??á?¬á??á?¬ á??á?½á?¬á?±á??á?¼á??á?¯á?­á??á?¹á??á?«á??á??á?¬á?¸ ?"
+msgstr "'control_auth_cookie' á??á?­á?¯á??á?ºá?¡á??á?½á??á?º á??á??á?·á?ºá??á?¬á??á?¬á??á??á?º á??á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?·á?ºá??á?¾á?¯á??á?­á?¯á??á?«á??á??á?¬á?¸?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
-msgstr "á?±á??á??á?¬ Directory"
+msgstr "á??á?±á??á?¬á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
-msgstr "Control Cookie (control_auth_cookie)"
+msgstr "á??á?½á??á?ºá??á?®á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?«á?? (control_auth_cookie)"
 
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
-msgstr "Events á?¡á??á?¼á??á?¹ á??á?½á??á?¹á??á?¶á?¯á??á??á?¹á??á?? á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á?ºá??á?¹"
+msgstr "á??á?¼á??á?ºá??á??á?ºá??á?»á?¬á?¸á?¡á??á?½á??á?º á??á?¾á??á?ºá??á?¯á?¶á??á??á?ºá??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia á?¡á??á?ºá?­á?³á?? event á??á?ºá?¬á?¸á?¡á??á?¼á??á?¹ á??á?½á??á?¹á??á?¶á?¯á??á??á?¹á??á?? á??á?»á??á?³á??á?¯á??á?¹á??á?­á?¯á??á?¹á??á?«á?? Vidalia á?? "
-"á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á??á??á??á?ºá?¬á?¸ á??á??á??á?½á?­á??á?¯á?­á??á?¹á??á?«"
+msgstr "á??á?¼á??á?ºá??á??á?ºá?¡á??á?»á?­á?¯á?·á?¡á??á?½á??á?º á??á?¬á??á??á?ºá?¸á??á?½á??á?ºá?¸á??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á?? Vidalia á?? á?¡á??á?»á??á?ºá?¡á??á?±á?¬á?ºá??á?»á?¬á?¸á??á?»á?¬á?¸á??á??á?º á??á??á??á?­á?¯á??á?ºá??á?±á?¬á??á?ºá?¸á??á??á??á?­á?¯á??á?ºá??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
-msgstr "á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?? á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á?ºá??á?¹"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?¾á?¯"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Vidalia á??á?½ Tor á?±á??á?¬á?·á??á?²á??á?­á?¯á?? á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?? á??á?»á??á?³á??á?­á?¯á??á?­á?¯á??á?¹á??á?«á?? (%1)"
+msgstr "Tor á??á?±á?¬á?·á??á?²á??á?ºá??á?­á?¯ á??á??á?ºá??á??á?·á?ºá??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?? á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?? port á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?? "
-"á??á?ºá?­á??á?¹á??á?­á?½á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á?±á??á?¸á??á?«"
+msgstr "á??á??á?ºá??á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?±á?«á??á?ºá?? á??á??á?ºá??á?¾á??á?ºá??á?¾á?¯á?·á??á??á?ºá??á??á?ºá?¡á?¬á?¸ á??á??á?ºá??á?±á?¸á??á?«"
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
-msgstr "Tor á?¡á??á??á?¹á?»á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?ºá??á?¹á??á?ºá?¬á?¸ á??á??á?½á??á?¯á?­á??á?¹á??á?«á?»á??á?®"
+msgstr "Tor á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯ á??á??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"á??á??á?¹á??á?½á?­ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á?¬á?¸á?±á??á?¬ Tor á?±á??á?¬á?·á??á?²á??á??á?¹ á?±á??á??á?¹á??á??á?®á?? á??á?­á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á??á?¶ á?¡á?¾á??á?¶á?³á?»á??á?³ "
-"á??á?±á??á?¬á??á?¹á??á?¶á?±á??á?¬á?·á??á?«á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? Tor á??á??á?¹á??á?¹á??á?¯á?­á??á?¹á??á?­á?¯á?? á??á?¼á?¬á?¸á?? á?±á??á?¬á??á?¹á??á?¶á?¯á?¸ version á??á?­á?¯ "
-"á?±á??á?«á??á?¹á?¸á??á?¯á??á?¹á??á?¯á??á?¹á??á?«á??"
+msgstr "á??á??á?ºá??á?¾á?­á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?·á?º Tor á??á?¬á?¸á??á?¾á??á?ºá?¸á??á??á?º á??á??á?ºá??á??á?ºá?¸á??á?¯á??á?ºá??á??á?ºá?? á??á?­á?¯á?·á??á??á?¯á??á?º á??á?±á?¬á??á?ºá??á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?±á?¬á?·á??á??á?º á??á??á?¯á??á?ºá??á?«á?? á??á?±á?¬á??á?ºá??á?¯á?¶á?¸á??á?¬á?¸á??á?¾á??á?ºá?¸á??á?­á?¯ á??á?±á?«á??á?ºá?¸á??á?¯á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á??á?º Tor á??á??á?ºá??á?ºá??á?­á?¯á??á?ºá??á?­á?¯á?· á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?½á?¬á?¸á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
-msgstr "Tor á??á??á?¹á??á?¹á??á?­á?¯á??á?¹ : %1"
+msgstr "Tor á??á??á?ºá??á?ºá??á?­á?¯á??á?º - %1"
 
 msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"á?±á??á?¬á??á?¹á??á?­á?¯á??á?¹á?¸ á??á??á?¹á??á?¼á??á?¹á??á?? á?¡á?¬á?¸á??á?¶á?¯á?¸á??á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á??á?¡á?±á??á?¬á??á?¹á?¸á??á?ºá?¬á?¸á??á?½á??á?¹á?· "
-"á?»á??á?¬á?¸á??á?¬á?¸á??á?«á??á?­á??á?·á?¹á??á??á?¹á??"
+msgstr "á??á?±á?¬á??á?ºá??á?­á?¯á??á?ºá?¸á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á??á?º á??á??á?ºá?? á??á??á??á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á?¡á??á?±á?¬á??á?ºá?¸á??á?»á?¬á?¸á??á?¾á??á?·á?º á??á??á?°á??á?½á?²á??á?¼á?¬á?¸á??á?¼á?¬á?¸á??á?¬á?¸á??á??á?ºá??á?¯ á??á??á?ºá??á??á?­á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
-msgstr "á??á?¯á?­á??á?¹á??á?­á?¯á??á?¹ á?¡á??á?½á??á?¹á?¡á??á?¬á?¸á?¡á??á??á?¹ á??á??á?¹á??á?®á?¸á??á??á?¹ á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á?¡á??á??á?º á??á??á?ºá??á?®á?¸á??á??á?º á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
-msgstr "Port Forwarding á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "Port Forwarding á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia á??á??á?¹ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ port forwarding á??á?¯á?­ á??á?ºá?­á??á?¹á??á?­á??á?»á??á??á?¹á?¸ á??á?»á??á?³á??á?¯á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "Vidalia á??á?¾ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º Port Forwarding á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á?¡á?¬á?¸ á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á??á?º á??á??á??á?ºá??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
-msgstr "Vidalia Control Panel"
+msgstr "Vidalia á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?¾á?¯á??á?±á??á?¬"
 
 msgctxt "MainWindow"
 msgid "Status"
-msgstr "á?¡á?±á?»á??á?¡á?±á??"
+msgstr "á?¡á??á?¼á?±á?¡á??á?±"
 
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
-msgstr "Vidalia Shortcuts"
+msgstr "á??á?­á??á?ºá??á?¼á?­á?¯á?? á?¡á??á?¼á??á?ºá??á??á?¯á??á?º"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "Relaying á??á?¯á?­ á??á??á?·á?¹á??á?¼á??á?¹á?¸á?»á??á??á?¹á?¸\n"
+msgstr "á??á?¬á??á?»á??á?ºá??á?¾á?¬ á??á??á?ºá??á??á?ºá??á?¾á?¯"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
-msgstr "Relay á??á??á?¹á??á?¯ á??á??á?·á?¹á??á?¼á??á?¹á?¸á?? Network á??á?¯á?­ á?¾á??á?®á?¸á??á?¼á?¬á?¸á?±á?¡á?¬á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?«"
+msgstr "á??á?®á??á?±á?¸á?¡á?¬á?¸á??á?¼á??á?ºá??á??á?ºá??á??á?ºá??á?¾á??á?·á?º á??á?½á??á?ºá??á??á?ºá??á?»á??á?ºá??á?¼á??á?·á?ºá??á??á?ºá??á?°á??á?®á??á?«"
 
 msgctxt "MainWindow"
 msgid "View the Network"
-msgstr "Network á??á?¯á?­ á?¾á??á??á?·á?¹á??á??á??á??á?¹"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?¾á?¯"
 
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
-msgstr "Tor Network á?? á?±á?»á??á??á?¶á?¯á??á?­á?¯ á?¾á??á??á?·á?¹á??á??á??á??á?¹"
+msgstr "Tor á??á??á?ºá??á??á?ºá??á?­á?¯á?· á??á?»á?­á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr "á??á?¯á?­á??á?¹á??á?­á?¯á??á?¹ á?¡á??á?½á??á?¹á?¡á??á?¬á?¸á??á??á?¹á??á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹"
+msgstr "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸á?¡á??á??á?º á??á??á?ºá??á?®á?¸á??á??á?º á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
-msgstr "á?±á??á?¬á??á?¹á??á??á?¹á??á?²á?¼ á??á??á?¹á??á?¼á??á?¹á??á?? á?¡á??á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á??á?¹"
+msgstr "á??á?±á?¬á??á?ºá??á??á?ºá??á?½á?²á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á?·á??á?»á?¬á?¸á??á??á?·á?º á?¡á??á??á?ºá?¡á?¬á?¸á??á?¼á??á?ºá??á?±á?«á?ºá??á?±á??á??á?º"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr "á??á??á?¹á??á?±á??á?¬ bandwidth á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á?¾á??á??á?·á?¹á??á??á??á??á?¹"
+msgstr "á??á??á??á?ºá?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?²á?·á??á??á?·á?ºá??á?¼á??á?ºá??á?¾á?¯á??á?ºá?¸á?¡á?¬á?¸á??á?¼á??á?·á?ºá??á??á?º"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸ history á??á?­á?¯ á?¾á??á??á?·á?¹á??á??á??á??á?¹"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸á??á?²á??á?½á??á?º á??á?¾á?¬á??á?½á?±á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
-msgstr "á?¡á??á?°á?¡á??á?® á??á?½á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸ á?¾á??á??á?·á?¹á??á??á??á??á?¹"
+msgstr "á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸á??á?¾ á?¡á??á?°á?¡á??á?®á??á??á?°á??á??á?º..."
 
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
-msgstr "Vidalia á??á?¯á?­ á??á?ºá?­á??á?¹á??á?­á??á??á?°á??á??á?¹"
+msgstr "Vidalia á?¡á??á?¼á?±á?¬á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "View version and license information"
-msgstr "version á??á?½á??á?¹á?· á??á?¯á?­á??á?¹á??á??á?¹ á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸ á?¾á??á??á?·á?¹á??á??á??á??á?¹"
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸á??á?¾á??á?·á?ºá??á?­á?¯á??á?ºá??á??á?ºá?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸á??á?¼á??á?·á?ºá??á??á?º"
 
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
-msgstr "Vidalia á??á?½ á??á?¼á??á?¹á??á??á?¹"
+msgstr "Vidalia á?¡á??á?¼á?±á?¬á??á?ºá?¸"
 
 msgctxt "MainWindow"
 msgid "Show this window on startup"
-msgstr "á?¤ windows á??á?­á?¯ á??á??á??á?¹á??á??á??á?¹á??á?ºá??á?¹ á?»á??á??á??á??á?¹"
+msgstr "á??á??á?¯á??á?¼á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯ á??á?½á??á?·á?ºá??á?­á?¯á??á?ºá??á?­á?¯á??á?ºá?¸á??á?¼á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Hide"
-msgstr "á??á?¶á?¯á?¸á??á?¼á??á?¹á??á?¬á?¸á??á??á?¹"
+msgstr "á??á?»á?±á?¬á??á?ºá??á?¬á?¸á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Hide this window"
-msgstr "á?¤ windows á??á?¯á?­ á??á?¯á?¶á?¯á?¸á??á?¼á??á?¹á??á?¬á?¸á??á??á?¹"
+msgstr "á?¤ á??á??á?ºá?¸á??á?­á?¯á?¸á??á?­á?¯ á??á?­á??á?ºá??á?«"
 
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
-msgstr "á??á??á?¬á?¸á??á?½á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á?»á??á??á?¹á?¸ á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á??á??á?¬á?¸á??á?¾á??á?ºá??á?¼á??á?ºá??á??á?ºá??á??á?ºá??á?¾á??á?ºá??á?¼á??á?ºá?¸ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia á??á?½ Tor á?? á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?? á??á??á?¬á?¸á??á?½á??á?¹á??á?¯á?­ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¥á?¹ Tor á?±á??á?¬á?·á??á?²á??á?¯á?­ "
-"á??á??á??á?¹á?»á??á??á?¹á?¸ á??á?»á??á?³á??á?¯á??á?¹á??á?¯á?­á??á?¹á??á?«á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?? Task Manager á??á?¼á??á?¹ á?¡á?»á??á?¬á?¸ Tor "
-"á??á?¯á??á?¹á??á??á?¹á?¸á??á?¥á?¹á??á?ºá?¬á?¸ á??á?¼á??á?¹á?·á??á?¬á?¸á?»á??á??á?¹á?¸ á??á?½á?­á??á??á?½á?­ á??á??á?¹á?±á??á?¸á??á?«á??"
+msgstr " Vidaliaá??á??á?·á?º Torá?? á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á??á?¬á?¸á??á?¾á??á?ºá?¡á?¬á?¸ á?¡á??á??á?ºá??á?¼á??á?ºá??á?¯á??á?ºá??á??á?ºá??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?±á??á??á?·á?º á??á?­á?¯á?·á??á?±á??á??á?·á?ºTorá??á?±á?¬á?·á??á?ºá??á?²á?¡á?¬á?¸á??á?¼á??á?ºá??á??á?ºá??á??á??á??á?ºá??á?­á?¯á??á?ºá??á?« á?? á??á??á?ºá?? á?¡á??á?¯á??á?ºá??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á??á?ºá?¸á??á?½á??á?º á?¡á??á?¼á?¬á?¸Torá??á?¯á??á?ºá??á??á?ºá?¸á??á??á?º á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á??á?¼á??á?ºá?¸á??á?¾á?­á??á??á?¾á?­á??á??á?ºá??á?±á?¸á??á?« "
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
+msgstr "á??á??á?ºá??á?¾á?­á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á??á?·á?º Tor á??á?¬á?¸á??á?¾á??á?ºá?¸á??á??á?º á??á??á?ºá??á??á?ºá?¸á??á?¯á??á?ºá??á??á?ºá?? á??á?­á?¯á?·á??á??á?¯á??á?º á??á?±á?¬á??á?ºá??á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?±á?¬á?·á??á??á?º á??á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
+msgstr "á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?¼á??á?ºá?¸á?¡á??á?½á??á?º á??á?±á?¬á?·á??á?²á??á?ºá?¡á??á??á?º á??á??á?­á?¯á??á?ºá??á??á?¬á?¸ á??á?­á?¯á??á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?­á?¯á??á?«á??á??á?¬á?¸?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá??á?½á??á?º á??á?¼á??á?ºá??á?¬á??á?­á?¯á??á?ºá??á?½á??á?ºá??á?¾á?­á??á?±á?¬ á??á??á?¯á?¶á??á?¼á?¯á?¶á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?º á??á??á?ºá??á?½á??á?ºá??á?¾á?¯ "
 
 msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?°á??á??á?­á??á?°á??á??á?­ á??á?­á?¯á??á?­á??á?ºá??á?±á??á?­á?¯á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á?¬á??á?½á??á?ºá??á??á?ºá?¡á??á?­á?¯á?·á??á?¾á?¬ á??á??á?ºá?? á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ Tor á?? á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "Update Failed"
-msgstr ""
+msgstr "á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Your software is up to date"
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?¾á?¬ á??á?±á?¬á??á?ºá??á?¯á?¶á?¸á??á?¯á??á?ºá??á?¬á?¸á??á?¾á??á?ºá?¸ á??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
+msgstr "á?¤á?¡á??á?»á?­á??á?ºá?? á??á??á?ºá??á??á?½á??á?ºá??á?»á?°á??á?¬á?¡á??á?½á??á?º á??á??á?­á?¯á??á?ºá??á?±á?¬ Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá?¡á??á??á?º á??á??á?¾á?­á??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
-msgstr ""
+msgstr "á??á??á?ºá??á?½á??á?ºá?¸ á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
+msgstr "á??á??á?ºá??á??á?±á?¬á?·á??á?²á??á?ºá?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á??á?º Vidalia á??á??á?º á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
-msgstr ""
+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."
-msgstr ""
+msgstr "á?¤á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?¾á??á?­á?¯á?·á??á?½á?¾á??á?ºá??á??á?·á?º á??á??á?ºá??á??á?·á?ºá?¡á??á?¬á??á?­á?¯á??á??á?­á?¯ á??á?±á?¬á??á?·á?ºá??á?¼á??á?·á?ºá??á?­á?¯á??á?ºá??á??á?ºá?? á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá?? á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá??á?±á?¸á??á?¼á?®á?¸ á?¡á??á??á?ºá?? á??á?¼á??á?ºá??á?­á?¯á??á?ºá??á?»á?¾á??á?º SSL á??á?²á?·á??á?­á?¯á?·á??á?±á?¬ á??á?¬á??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º á??á??á?­á?¯á??á?­á?¯á??á?±á?¬á??á?»á?¬á?¸á??á?­á?¯á??á?¬ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?«á??"
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "%1 á??á?¾ %2 á??á?­á?¯á?· torrc á??á?­á?¯ á??á?­á?¯á??á?·á?ºá??á?¬á??á?¬á??á?­á?¯á??á?º á?¡á??á?­á?¯á??á?­á?¯ á??á?¼á?¯á??á?¯á??á?ºá??á?±á??á??á?ºá??"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(Telnet á??á?¼á??á?ºá??á?±á?¬á??á?ºá?¸á??á?¼á??á?ºá??á?­á??á?·á?ºá??á??á?º)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(á?¡á?®á?¸á??á?±á?¸á??á?ºá??á??á?­á?¯á??á?ºá?¸á??á??á?·á?º á??á?¼á??á?ºá??á?±á?¬á??á?ºá?¸á??á?¼á??á?ºá??á?­á??á?·á?ºá??á??á?ºá??)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr " á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸ %1 á?¡á??á??á?ºá??á??á?ºá??á?¯á??á??á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º %2 á??á?­á?¯á?· á??á?¬á??á?¾á??á?ºá??á??á?¯á??á?ºá??á?±á?¬ á??á??á?¯á?¶á??á?¼á?¯á?¶á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á??á?¼á??á?ºá??á?¬á??á??á?º á?¡á??á?¬á?¸á?¡á??á?¬á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
-msgstr ""
+msgstr "á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?²á?·á??á?«á?? (%1)"
 
 msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾á?¬ á??á?­á??á?ºá??á?»á??á?±á??á??á?ºá?? \ná??á??á?ºá?? Relay á?¡á?¬á?¸ á??á??á?¯ á??á??á?ºá??á??á?·á?ºá??á??á?º \"á??á??á?ºá??á??á?·á?º\" á??á??á?¯á??á?ºá??á?­á?¯ á??á??á?ºá??á?¶ á??á?¾á?­á??á?ºá??á?«á??"
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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?"
-msgstr ""
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia á??á??á?º á??á??á?ºá?¸á??á?­á?¯á??á?ºá?¡á?¬á?¸ á??á??á??á?ºá??á?±á?¬á??á?ºá??á?­á?¯á??á?ºá??á?±á?¬á??á?¼á?±á?¬á??á?·á?º Tor á??á?­á?¯ á??á??á?ºá??á?²á?·á??á?­á?¯á?· á??á??á?ºá??á?½á??á?ºá??á??á?ºá??á?­á?¯ á??á??á?­á??á?¾á?­á??á?­á?¯á??á?ºá??á?«á?? -  %1\n\ná??á?±á?¬á??á?ºá??á?¯á?¶á?¸ á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?¼ á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á??á?ºá??á?¾á?¬ á??á?¾á?­á??á??á?ºá?? - \n %2"
 
 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."
-msgstr ""
+"See the Advanced Message Log for more information."
+msgstr "Vidalia á?¡á??á??á?¼á?¯á??á??á??á?ºá?¸á?? Tor á??á??á?º á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯ á??á??á?ºá??á??á?·á?ºá??á?½á?¬á?¸á??á??á?ºá??á?¯ á??á??á?ºá??á??á??á?ºá??\n\ná??á?±á?¬á??á?ºá??á??á?º á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸á?¡á??á?½á??á?º á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?¾á??á?ºá??á??á?ºá?¸ á??á?­á?¯ á??á?¼á??á?·á?ºá??á?«á??"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "á??á??á?ºá??á??á?º á??á??á?ºá??á?¾á?­á?? Relay á??á??á?ºá??á?¯á??á?­á?¯ á??á?½á??á?·á?ºá??á?¬á?¸á??á??á?ºá?? á??á??á?ºá?? Relay á?¡á?¬á?¸ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯ á??á??á?ºá??á??á?·á?ºá??á?­á?¯á??á?ºá??á?¼á??á?ºá?¸á?? á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á??á?¾ á??á??á?ºá??á??á?·á?º á??á?½á??á?·á?ºá??á?¬á?¸á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯á??á??á?­á?¯ á?¡á??á?¾á?±á?¬á??á?·á?ºá?¡á??á?¾á??á?ºá??á?¼á??á?ºá??á?±á??á?­á??á?·á?ºá??á??á?ºá??\n\ná??á??á?ºá??á??á?º á??á??á?ºá?¸ Relay á??á?­á?¯ á??á?¼á??á?ºá??á?¼á??á?ºá??á?¬á??á?¬ á??á?­á??á?ºá??á??á?ºá??á?­á?¯á??á?ºá??á?¼á?®á?¸ á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸ Relay á?¡á??á??á?ºá??á??á?ºá??á?¯ á??á?¾á?¬á??á??á?º á?¡á??á?»á?­á??á?ºá??á?±á?¸á??á?»á??á?ºá??á?«á??á??á?¬á?¸á??"
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ""
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Tor á??á?±á?¬á??á?²á??á?º á??á??á?»á?¾á?±á?¬á?ºá??á??á?·á?ºá??á?² á??á?­á??á?ºá??á?½á?¬á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ Vidalia á?? á??á??á?ºá??á?±á?¸á??á?½á?±á?·á??á?¾á?­á??á??á?ºá??\n\ná??á??á?¼á?¬á??á?±á?¸á??á?®á?? á??á??á?­á??á?±á?¸á??á?¬(á??á?­á?¯á?·)á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?¼á??á?¬á??á?»á?¬á?¸á?¡á??á?½á??á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
-msgstr "á??á?ºá?­á??á?¹á??á?½á?­á??á??á??á?ºá?¬á?¸ á??á?­á??á??á?¹á??á?? á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á?ºá??á?¹"
+msgstr "á??á??á?ºá??á?¯á??á?ºá??á?¾á?¯ á??á??á?ºá??á?¾á??á?ºá??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
-"Vidalia á??á??á?¹ Tor á?? á??á?½á??á?¹á??á??á?¹á?¸ á?¡á?»á??á??á?¹á?¡á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯á?? á??á?½á??á?¹á??á?¶á?¯á??á??á?¹á?»á??á??á?¹á?¸ á??á?»á??á?³á??á?¯á?­á??á?¹á??á?«"
+msgstr "Tor á?? á??á?¾á??á?ºá??á??á?ºá?¸ á??á?¼á??á?ºá??á??á?ºá??á?»á?¬á?¸á?¡á??á?½á??á?º Vidalia á?? á??á?¬á??á??á?ºá?¸á??á??á?½á??á?ºá?¸á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
-msgstr "á??á?½á??á?¹á??á??á?¹á?¸á??á?­á?¯á??á?¹á??á?ºá?¬á?¸ á??á?¼á??á?¹á?·á??á?½á??á?¹á??á?? á??á?ºá?³á??á?­á??á?¼á??á?¹á?¸á?»á??á??á?¹á?¸"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯á??á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á?¬á?? á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?¾á?­á??á??á?ºá??"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia á??á??á?¹ á?±á??á?¬á?¹á?»á??á??á?¬á?¸á?±á??á?¬ á??á?½á??á?¹á??á??á?¹á?¸á??á?­á?¯á??á?¹á??á?­á?¯ á??á??á?¼á??á?¹á?·á??á?½á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "á??á??á?ºá??á?­á?¯á??á?ºá??á?¬ á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯á??á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á??á?º Vidalia á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Log Filename Required"
-msgstr "á??á?½á??á?¹á??á??á?¹á?¸á??á?¯á?­á??á?¹á?¡á??á??á?¹ á??á?­á?¯á?¡á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸ á??á?­á?¯á??á?ºá?¡á??á??á?º á??á?­á?¯á?¡á??á?ºá??á??á?ºá??"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"á??á?½á??á?¹á??á??á?¹á?¸ á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?¯á?­á??á?¹á??á??á?¹á??á?¯á??á?­á?¯á?? á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?¯á?­á??á?¹á??á??á?¹ "
-"á??á?¯á?­á??á?¹á?¡á??á??á?¹á??á??á?¹á??á?¯ á?±á??á?¸á??á?¼á??á?¹á?¸á??á??á?«á??á??á?¹"
+msgstr "á??á?­á?¯á??á?ºá??á?²á??á?­á?¯á?· á??á?¾á??á?ºá??á??á?ºá?¸á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸ á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?­á??á?ºá?¸á??á??á?ºá?¸á??á?­á?¯á??á?ºá??á??á?º á??á?­á?¯á??á?ºá?¡á??á??á?ºá??á??á?·á?ºá??á?±á?¸á??á??á??á?ºá??"
 
 msgctxt "MessageLog"
 msgid "Select Log File"
-msgstr "á??á?½á??á?¹á??á??á?¹á?¸á??á?­á?¯á??á?¹á??á??á?¹á??á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯á??á?ºá??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Save Log Messages"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?ºá??á?¹á??á?½á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?«"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸ á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
-msgstr "á??á?¬á??á?¬á?¸á??á?¯á?­á??á?¹á??á?ºá?¬á?¸ (*.txt)"
+msgstr "á??á?¬á??á?¬á?¸á??á?­á?¯á??á?º (*.txt)"
 
 msgctxt "MessageLog"
 msgid "Vidalia"
@@ -2175,48 +2182,47 @@ msgstr "Vidalia"
 
 msgctxt "MessageLog"
 msgid "Find in Message Log"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸á??á?²á??á?¼á??á?¹ á??á?½á?¬á??á??á?¹"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸á??á?²á??á?½á??á?º á??á?¾á?¬á??á?½á?±á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Find:"
-msgstr "á??á?½á?¬á??á??á?¹ :"
+msgstr "á??á?¾á?¬á??á?½á?± -"
 
 msgctxt "MessageLog"
 msgid "Not Found"
-msgstr "á??á?±á??á?¼á??á??á?½á?­á??á?«"
+msgstr "á??á?¾á?¬á??á?½á?±á??á??á?½á?±á?·á??á?¾á?­á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
-msgstr "á??á?½á?¬á?±á??á?¼á??á?? 0 á??á?¯ á??á?¯á?­á??á?¹á??á?®á?±á??á?¼á??á??á?½á?­á??á?«á??á??á?¹"
+msgstr "á??á?°á??á?®á??á??á?·á?ºá?¡á??á?¬á??á??á?½á?±á?·á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Message Log"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸"
 
 msgctxt "MessageLog"
 msgid "Message Filters..."
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?­á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á??á?ºá??á?¯á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ ..."
 
 msgctxt "MessageLog"
 msgid "Set message filters"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?­á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸ á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á??á?ºá??á?¯á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "History Size..."
-msgstr "History á?¡á??á?¼á??á?¹á?¡á??á?¬á?¸"
+msgstr "á??á?±á??á?¬á?¡á??á?±á?¬á??á?ºá?¸á??á?¬á??á??á?ºá?¸ á?¡á??á?±á?¡á??á?½á??á?º .."
 
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á??á??á?ºá?¬á?¸ á?»á??á??á??á??á?¹ á?¡á??á?ºá?¬á?¸á??á?¶á?¯á?¸ á??á?¶á??á?«á??á?¹á??á??á?¹á??á?½á??á?¹á??á??á?¹"
+msgstr "á??á?±á?¬á?ºá??á?¼á??á??á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸ á?¡á??á?»á?¬á?¸á??á?¯á?¶á?¸á?¡á??á?±á?¡á??á?½á??á?º á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Clear"
-msgstr "á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹"
+msgstr "á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á?«"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
-"á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸á??á?½ á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (Ctrl+E)"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?¾á??á?ºá??á??á?ºá?¸ (Ctrl+E) á??á?¾ á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?¾á??á?ºá?¸á??á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
@@ -2224,11 +2230,11 @@ msgstr "Ctrl+E"
 
 msgctxt "MessageLog"
 msgid "Copy"
-msgstr "á?±á??á?¬á?¹á??á?®á??á?°á?¸á??á??á?¹"
+msgstr "á??á?°á?¸á??á?°á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?¯á?­ clipboard á??á?­á?¯á?? á?±á??á?¬á?¹á??á?®á??á?°á?¸á??á?« (Ctrl+C)"
+msgstr "á??á?½á?±á?¸á??á?»á??á?ºá??á?­á?¯á??á?ºá??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á??á?ºá??á??á?¬á??á?±á??á?¬á??á?­á?¯á?· á??á?°á??á?°á??á?«á?? (Ctrl+C)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+C"
@@ -2236,11 +2242,11 @@ msgstr "Ctrl+C"
 
 msgctxt "MessageLog"
 msgid "Select All"
-msgstr "Select All"
+msgstr "Aá?¡á?¬á?¸á??á?¯á?¶á?¸ á??á?½á?±á?¸á??á?»á??á?º"
 
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
-msgstr "á??á??á??á?¹á?¸á?±á??á??á?­á?¯á??á??á??á?¡á?¬á?¸á??á?¶á?¯á?¸ á??á?½á??á?¹á??á?¬á?¸á??á??á?¹ (Ctrl+A)"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á?? (Ctrl+A)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+A"
@@ -2248,27 +2254,27 @@ msgstr "Ctrl+A"
 
 msgctxt "MessageLog"
 msgid "Save All"
-msgstr "á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¯á?­ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹"
+msgstr "á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á??á??á?ºá?¬á?¸á?¡á?¬á?¸á??á?¶á?¯á?¸ á??á?­á?¯ á??á?­á?¯á??á?¹á??á??á?¹á??á?¯á??á?­á?¯á?? á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Save Selected"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹"
+msgstr "á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?ºá??á?­á?¯á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á??á??á?¹á?· á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á?¯á??á?¹á??á??á?¹á??á?¯á??á?­á?¯á?? á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹"
+msgstr "á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?ºá??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?­á?¯á??á?ºá??á?²á??á?­á?¯á?· á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Settings"
-msgstr "á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸ á??á?ºá?­á??á?¹á??á?­á?½á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á??á?¹"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?¾á??á?ºá??á??á?ºá?¸ á??á??á??á?ºá??á?»á?­á??á?ºá??á?¾á?­á??á?¾á?¯á??á?»á?¬á?¸ á??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Ctrl+T"
@@ -2280,7 +2286,7 @@ msgstr "á?¡á??á?°á?¡á??á?®"
 
 msgctxt "MessageLog"
 msgid "Show the help browser"
-msgstr "á?¡á??á?°á?¡á??á?® browser á?»á??á??á??á?«"
+msgstr "á?¡á??á?°á?¡á??á?® á??á?¼á??á?·á?ºá??á?¾á?¯á??á??á?­á?¯á??á??á??á?ºá??á?­á?¯ á??á?¼á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "F1"
@@ -2288,11 +2294,11 @@ msgstr "F1"
 
 msgctxt "MessageLog"
 msgid "Close"
-msgstr "á??á?­á??á?¹á??á?«"
+msgstr "á??á?­á??á?ºá??á?­á??á?ºá?¸"
 
 msgctxt "MessageLog"
 msgid "Close the Message Log"
-msgstr "á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á?? á??á?½á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸ á??á?­á??á?¹á??á?«"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯ á??á?­á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Esc"
@@ -2300,11 +2306,11 @@ msgstr "Esc"
 
 msgctxt "MessageLog"
 msgid "Find"
-msgstr "á??á?½á?¬á?±á??á?¼á??á??á?¹"
+msgstr "á??á?¾á?¬"
 
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "á??á?½á?¬á?±á??á?¼á??á?­á?¯á?±á??á?¬ á??á?¬á??á?¬á?¸á??á?«á??á??á?¹á?·á??á??á??á?¹á?¸á?±á??á?¸á??á?­á?¯á??á??á??á?¡á?¬á?¸á??á?¶á?¯á?¸ á??á?½á?¬á?±á??á?¼á??á??á?¹ (Ctrl+F)"
+msgstr "á??á?¾á?¬á??á?­á?¯á??á??á?·á?ºá??á?¬á??á?¬á?¸á??á?«á??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?­á?¯ á??á?¾á?¬á??á?«á?? (Ctrl+F)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+F"
@@ -2312,108 +2318,107 @@ msgstr "Ctrl+F"
 
 msgctxt "MessageLog"
 msgid "Time"
-msgstr "á?¡á??á?ºá?­á??á?¹"
+msgstr "á?¡á??á?»á?­á??á?º"
 
 msgctxt "MessageLog"
 msgid "Type"
-msgstr "á?¡á??á?ºá?­á?³á?¸á?¡á??á?¬á?¸"
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid "Message"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹"
+msgstr "á??á?¼á?±á?¬á??á??á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
-msgstr "á??á??á?¹á??á?½á?­ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á??á?½á??á?¹á??á??á?¹á?¸ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?­á?¯ á??á?­á??á?¹á?¸á??á?«"
+msgstr "á??á??á?ºá??á?¾á?­ á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?¾á??á?ºá??á??á?ºá?¸á??á?»á?­á??á?ºá??á?¾á?­á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
-msgstr "á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?¯á?­á??á?­á??á?¹á?¸á??á?«"
+msgstr "á??á??á??á?º á??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
-msgstr "á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?ºá??á?¹á??á?­á??á?¹á?¸á??á?«"
+msgstr "á??á??á??á?ºá??á?»á?­á??á?ºá??á?¾á?­á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯á?·á??á?¼á?¯á??á?¯á??á?ºá??á?¬á?¸á??á??á?·á?ºá?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?²á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?»á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Cancel"
-msgstr "á??á?ºá??á?¹á??á?­á??á?¹á?¸á??á?«"
+msgstr "á??á?±á??á?±á?¬á?·"
 
 msgctxt "MessageLog"
 msgid "Message Filter"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á??á?­á??á??á?¹á??á??"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á??á?ºá??á?¯á??á?ºá??á?¾á?¯"
 
 msgctxt "MessageLog"
 msgid "Error"
-msgstr "á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??"
+msgstr "á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "MessageLog"
 msgid "Warning"
-msgstr "á??á??á?­á?±á??á?¸á??á?ºá??á?¹"
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "MessageLog"
 msgid "Notice"
-msgstr "á??á??á?­á?»á??á?³á??á??á?¹"
+msgstr "á??á??á?­á??á?¼á?¯á??á??á?º"
 
 msgctxt "MessageLog"
 msgid "Info"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹"
+msgstr "á??á??á??á?ºá?¸"
 
 msgctxt "MessageLog"
 msgid "Debug"
-msgstr "Debug"
+msgstr "á?¡á??á?¾á?¬á?¸á??á??á?º"
 
 msgctxt "MessageLog"
 msgid "Message Log History"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á??á?½á??á?¹á??á??á?¹á?¸ history"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬ á??á?¾á??á?ºá??á??á?ºá?¸ á??á?¬á??á??á??á?º"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á??á?½á??á?¹á??á??á?¹á?¸ window á??á?¼á??á?¹á?»á??á??á??á??á?¹ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á?¡á?±á??á?¡á??á?¼á??á?¹"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?¾á??á?ºá??á??á?ºá?¸ á??á?¼á??á?½á??á?ºá??á?½á??á?º á??á?¼á??á??á??á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸ á?¡á??á?±á?¡á??á?½á??á?º"
 
 msgctxt "MessageLog"
 msgid "messages"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid "Browse"
-msgstr "Browse"
+msgstr "á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¬á??á?½á?±á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?½á??á?¹á??á??á?¹á?¸ á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?¯á?­ á??á?¯á?­á??á?¹á??á??á?¹á??á?¯á??á?­á?¯á?? á?¡á?»á??á?²á??á??á?¹á?¸ á??á?­á??á?¹á?¸á??á?¼á??á?¹á?· á?»á??á?³á??á?«"
+msgstr "á??á?­á?¯á??á?ºá??á?²á??á?­á?¯á?· á??á?¾á??á?ºá??á??á?ºá?¸á??á??á??á?ºá?¸á??á?½á?¾á?¬á?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?­á??á?ºá?¸á?¡á?±á?¬á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?½á??á?¹á??á??á?¹á?¸ á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ á??á?¯á?­á??á?¹á??á??á?¹á??á?¯á??á?­á?¯á?? á??á?­á??á?¹á?¸á??á?«"
+msgstr "á??á?­á?¯á??á?ºá??á?²á??á?­á?¯á?· á??á?¾á??á?ºá??á??á?ºá?¸á??á??á??á?ºá?¸á??á?½á?¾á?¬á?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid "Basic"
-msgstr ""
+msgstr "á?¡á??á?¼á?±á??á?¶"
 
 msgctxt "MessageLog"
 msgid "Tor Status"
-msgstr ""
+msgstr "Tor á?¡á??á?¼á?±á?¡á??á?±"
 
 msgctxt "MessageLog"
 msgid "Advanced"
-msgstr ""
+msgstr "á?¡á??á??á?·á?ºá??á?¼á??á?·á?º"
 
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
-msgstr "á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?½á??á?¹á??á??á?¹á?¸á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?¡á?»á??á?²á??á??á?¹á?¸ á??á?­á??á?¹á?¸á??á?«"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸á??á??á??á?ºá?¸á??á?½á?¾á?¬á?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯á?¡á??á?¼á?²á??á??á?ºá?¸ á??á?­á??á?ºá?¸á??á?«á??"
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
+msgstr "á??á??á?ºá??á?¯á?¶á??á??á?ºá??á?¬ á??á?¯á?¶á?¸á?? á??á?¾á?¬á?¸á??á?½á??á?ºá?¸á??á?±á??á?¼á?®á?¸ Tor á??á??á?º á??á?¾á?±á?·á??á??á?ºá?? \ná??á??á?½á?¬á?¸á??á?±á?¬á?·á??á?±á?¬á?¡á??á?« á??á?±á?«á?ºá??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
+msgstr "Tor á??á?¾á??á?·á?º á??á??á?ºá??á??á?ºá?? á??á??á?ºá??á?¯á?¶á??á??á?ºá??á?¬ á??á?¯á?¶á?¸á??\ná??á?¾á?¬á?¸á??á?½á??á?ºá?¸á??á?±á??á?±á?¬á?¡á??á?«á??á?¾á??á?¬ á??á?±á?«á?ºá??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid ""
@@ -2421,38 +2426,38 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
+msgstr "á??á?¯á?¶ Tor á??á??á??á?ºá??á??á?ºá??á??á?ºá??á?¾á?¯ á?¡á??á?»á?­á??á?ºá??á?»á?¬á?¸á??á?½á??á?º á??á?±á?«á?ºá??á?»á??á?ºá??á??á?·á?ºá?¡á??á?»á?­á??á?º á??á?? á??á?±á?«á?ºá??á?¬á??á??á?ºá??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á?? á??á??á?ºá?¸ á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¾á?¬á?¸á??á?»á?¬á?¸á??á?¯ á??á??á?°á??á??á?¬á?¸á??á?±á?¬á?ºá??á??á?ºá?¸ á??á??á?·á?º á?¡á??á?±á??á?¼á??á?·á?º á?¡á??á?±á?¸á??á?­á?¯á??á?ºá??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?ºá??á??á?­á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
+msgstr "á??á?¯á?¶á??á?¾á??á?º Tor á??á??á??á?ºá??á??á?ºá??á??á?ºá??á?¾á?¯ á?¡á??á?»á?­á??á?ºá?¡á??á?½á??á?ºá?¸ á??á?±á?«á?ºá??á?»á??á?ºá??á??á?·á?ºá?¡á??á?»á?­á??á?º \ná??á?? á??á?±á?«á?ºá??á?¬á??á??á?ºá??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸"
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
+msgstr "á?¡á??á?½á??á?ºá?¡á??á??á?ºá?¸ á??á?¬á??á?¬á?¸á??á?¾á??á?ºá??á??á?·á?º á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?»á?¬á?¸á??á??á?º Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?±á?¸á??á?¬á?¸á??á?¼á??á?°á??á?»á?¬á?¸\ná?¡á??á?½á??á?º á?¡á??á?°á?¸á??á??á??á?º á??á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á?±á??á??á?ºá??"
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
+msgstr "%1 á??á?­á?¯á??á?ºá??á?­á?¯ á??á?±á?¸á?? á??á??á??á?«á??\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
-msgstr "Tor Network á?±á?»á??á??á?¶á?¯"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼ á??á?¼á?±á??á?¯á?¶á??á?­á?¯ á??á?­á??á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Refresh"
-msgstr "á?»á??á??á?¹á??á??á?¹ á?¡á??á??á?¹á??á??á?¹á?»á??á??á?«"
+msgstr "á?¡á??á??á?ºá??á??á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
-msgstr "Tor relays á??á?ºá?¬á?¸á??á?½á??á?¹á?· á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á?? á??á?¬á??á??á?¹á?¸á??á?­á?¯ á?»á??á??á?¹á??á??á?¹ á?¡á??á??á?¹á??á??á?¹á?»á??á??á?«"
+msgstr "Tor Relay á??á?»á?¬á?¸á??á?¾á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á??á?¬á??á??á?ºá?¸á??á?­á?¯ á??á?¼á??á?ºá??á??á?º á??á?­á?¯á??á?ºá??á?¼á??á?·á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Ctrl+R"
@@ -2464,11 +2469,11 @@ msgstr "á?¡á??á?°á?¡á??á?®"
 
 msgctxt "NetViewer"
 msgid "Show the network map help"
-msgstr "Network á?±á?»á??á??á?¶á?¯ á?¡á??á?°á?¡á??á?®á??á?¯á?­ á?»á??á??á??á?«"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼á??á?¼á?±á??á?¯á?¶ á?¡á??á?°á?¡á??á?®á??á?­á?¯ á??á?¼á??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Show network map help"
-msgstr "Network á?±á?»á??á??á?¶á?¯ á?¡á??á?°á?¡á??á?®á??á?¯á?­ á?»á??á??á??á?«"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼ á??á?¼á?±á??á?¯á?¶ á?¡á??á?°á?¡á??á?®á??á?­á?¯ á??á?¼á??á?«á??"
 
 msgctxt "NetViewer"
 msgid "F1"
@@ -2476,11 +2481,11 @@ msgstr "F1"
 
 msgctxt "NetViewer"
 msgid "Close"
-msgstr "á??á?­á??á?¹á??á?«"
+msgstr "á??á?­á??á?ºá??á?­á??á?ºá?¸"
 
 msgctxt "NetViewer"
 msgid "Close the network map"
-msgstr "Network á?±á?»á??á??á?¶á?¯á??á?¯á?­ á??á?­á??á?¹á??á?«"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼ á??á?¼á?±á??á?¯á?¶á??á?­á?¯ á??á?­á??á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Esc"
@@ -2488,11 +2493,11 @@ msgstr "Esc"
 
 msgctxt "NetViewer"
 msgid "Zoom In"
-msgstr "á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?ºá??á?¹ á??á?ºá?²á??á??á?«"
+msgstr "á??á?»á?²á?·á??á?«"
 
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
-msgstr "Network á?±á?»á??á??á?¶á?¯á??á?¯á?­ á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?ºá??á?¹á??á?ºá?²á??á??á?«"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼ á??á?¼á?±á??á?¯á?¶á?¡á?¬á?¸ á??á?¯á?¶á??á?¼á?®á?¸á??á?»á?²á?·á??á?«á??"
 
 msgctxt "NetViewer"
 msgid "+"
@@ -2500,11 +2505,11 @@ msgstr "+"
 
 msgctxt "NetViewer"
 msgid "Zoom Out"
-msgstr "á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?ºá?¶á?³á??á??á?«"
+msgstr "á??á?»á?¯á?¶á?·á??á?«"
 
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
-msgstr "Network á?±á?»á??á??á?¶á?¯á??á?¯á?­ á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?ºá?¶á?³á??á??á?«"
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼ á??á?¼á?±á??á?¯á?¶á?¡á?¬á?¸ á??á?¯á?¶á??á?±á?¸á??á?»á?¯á?¶á?·á??á?«á??"
 
 msgctxt "NetViewer"
 msgid "-"
@@ -2512,12 +2517,11 @@ msgstr "-"
 
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
-msgstr "á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?­á?¯ á??á??á?¹á?·á?±á??á?ºá?¬á?¹á?±á??á?¬ á?¡á?±á??á?¡á??á?¬á?¸á??á?­á?¯á??  á?»á??á?³á?»á??á??á?¹á??á?«"
+msgstr "á??á?½á??á?ºá??á?­á??á?¼á??á?ºá?¡á?±á?¬á??á?ºá??á?¯á??á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
-"á??á??á?¹á??á?½á?­ á?»á??á??á??á?¬á?¸á?±á??á?¬ á??á?¬á?¸á??á??á?¹á??á?ºá?¬á?¸á?? á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?¯á?­ á??á??á?¹á?·á?±á??á?ºá?¬á?¹á?±á??á?¬ á?¡á?±á??á?¡á??á?¬á?¸á??á?­á?¯á?? á?»á??á?³á?»á??á??á?¹á??á?«"
+msgstr "á??á??á?ºá??á?¾á?­ á??á?±á?¬á?ºá??á?¼á??á?¬á?¸á??á??á?·á?º á??á?¬á?¸á??á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸á??á?¯á?¶á?¸ á?¡á??á?¼á??á?·á?ºá??á??á?ºá??á??á?º á??á?»á?¯á?¶á?·á??á?»á?²á?· á??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
@@ -2525,309 +2529,291 @@ msgstr "Ctrl+Z"
 
 msgctxt "NetViewer"
 msgid "Relay Not Found"
-msgstr ""
+msgstr "Relay á??á?¾á?¬á??á??á?½á?±á?·á??á?«á??"
 
 msgctxt "NetViewer"
 msgid "No details on the selected relay are available."
-msgstr ""
+msgstr "á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?º Relay á??á?¾á??á?·á?º á??á??á?ºá??á??á?ºá?? á?¡á??á?±á?¸á??á?­á??á?ºá??á?»á?¬á?¸ á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Unknown"
-msgstr ""
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "NetViewer"
 msgid "Full Screen"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?®á??á?¬á?¡á??á?¼á??á?·á?º"
 
 msgctxt "NetViewer"
 msgid "View the network map as a full screen window"
-msgstr ""
+msgstr "á??á?½á??á?ºá??á??á?ºá??á?¼á??á?¼á?±á??á?¯á?¶á??á?­á?¯ á??á??á?ºá?¸á??á?­á?¯á?¸á?¡á??á?¼á??á?·á?º á??á?¼á??á?·á?ºá??á?«á??"
 
 msgctxt "NetViewer"
 msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "á??á??á?®á?±á??á?ºá?¬á?¹á?±á??á?¬ Bridge"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "á?±á??á?¬á?¹á?»á??á??á?¬á?¸á?±á??á?¬ bridge á?±á??á?¬á?¹á?»á??á??á?ºá??á?¹á??á??á?¹ á??á??á?®á?±á??á?ºá?¬á?¹á??á?«"
+msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
-msgstr "á??á?°á?¸á??á?°á??á??á?¹  (Ctrl+C)"
+msgstr "á??á?°á?¸á??á?°á??á?«á?? (Ctrl+C)"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Tor á??á?¯á?­ á?¡á??á?¶á?¯á?¸á?»á??á?³á?? á?¡á??á?¹á??á?¬á??á??á?¹á??á?¯á?­ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ á?¡á?­á?¯á??á?¹á??á?®á??á?­á??á?¹á??á?¬á??á?½á??á?¹á?· hostname "
-"á??á?½á??á?¹á??á?¯á??á?¶á?¯á?¸á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á?±á??á?¬á?¹á?»á??á?±á??á?¸á??á??á??á?¹"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á?¯á?¶á?¸á??á?½á?²á??á??á?º á??á??á?±á?¬á??á?·á?ºá??á?®á??á??á?ºá??á?¯á??á?­á?¯ á??á?¯á?¶á?¸á??á??á?º tor á??á?­á?¯ á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á??á?º á??á??á?ºá??á??á?º á?¡á?­á?¯á??á?ºá??á?®á??á?­á??á?ºá??á?¬á??á??á?ºá??á?¯ (á??á?­á?¯á?·) á??á??á?ºá?¡á??á??á?ºá??á??á?ºá??á?¯ á??á?¾á??á?·á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?ºá??á??á?ºá??á?¯ á??á?­á?¯á?·á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"á??á??á?¹á?? firewall á??á?½ á??á??á?¹á?·á??á?¯á?­ á??á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹á?·á??á?±á??á??á??á?¹ port á??á??á?¹á??á?¯á??á?­á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á??á?¯á??á??á?¹á??á?­á?¯á??"
-" á??á??á?¹á??á?½á??á?¹á?±á??á?¬á?¹á?»á??á?±á??á?¸á??á??á??á?¹"
+msgstr "á??á??á?ºá?? á??á?­á?¯á??á?ºá??á?¬á?¸á??á?±á?«á??á?­á?¯ á??á??á?·á?ºá?¡á?¬á?¸ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?­á?¯á??á?ºá??á?±á??á??á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á??á?ºá??á?¯(á??á?­á?¯á?·)á??á??á?ºá??á?¯á??á??á?ºá??á??á??á?­á?¯ á??á??á?ºá??á??á?º á??á??á?ºá??á?¾á??á?ºá??á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
-msgstr "'%1' á??á??á?¹ á??á?®á?±á??á?ºá?¬á?¹á?±á??á?¬ port á??á?¶á??á?«á??á?¹á??á??á?¯á??á?¹á??á?«"
+msgstr "'%1' á??á??á?º á??á??á?ºá??á?¶á??á?­á?¯á??á?ºá??á?±á?¬ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á??á?ºá??á?¯ á??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"á?¡á??á?¹á??á?¬á??á??á?¹á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á??á??á?½á?­á??á??á?¹ á??á??á?¹á?? local network á??á??á?¹ proxy á??á?­á?¯á?¡á??á?¹á??á?? á??á?½á?­á??á??á?½á?­ "
-"á??á??á?¹á?±á??á?¸á??á?«"
+msgstr "á??á??á?ºá?? á??á?­á?¯á??á??á?º á??á?½á??á?ºá??á??á?º á??á??á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á?¯á?·á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á??á?±á?¬á??á?ºá??á?® á??á?­á?¯á?¡á??á?ºá??á??á?¬á?¸ á??á?­á?¯á??á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
-msgstr "á?¡á??á?¹á??á?¬á??á??á?¹á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹ proxy á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?«á??á??á?¹"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á?¯á?·á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á??á?±á?¬á??á?ºá??á?®á??á?­á?¯ á??á?¯á?¶á?¸á??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
-msgstr "proxy á??á??á?¹á??á?½á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á??á?±á?¬á??á?·á?ºá??á?® á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "NetworkPage"
 msgid "Username:"
-msgstr "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á?? á?¡á??á??á?¹ :"
+msgstr "á??á?¯á?¶á?¸á??á?½á?²á??á?°á?¡á??á??á?º -"
 
 msgctxt "NetworkPage"
 msgid "Password:"
-msgstr "á??á??á?¬á?¸á??á?½á??á?¹ :"
+msgstr "á??á??á?¬á?¸á??á?¾á??á?º - "
 
 msgctxt "NetworkPage"
 msgid "Port:"
-msgstr "Port:"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"á??á??á?¹á?? firewall á??á?½ á??á?¼á??á?¹á?·á?»á??á?³á?±á??á?¬ port á??á?ºá?¬á?¸á??á?¯á?­á??á?¬á?¡á??á?¶á?¯á?¸á?»á??á?³á?? relay á??á?ºá?¬á?¸á??á?­á?¯ "
-"á??á??á?¹á??á?¼á??á?¹á?±á??á??á??á?¹ á??á??á?¹á?±á??á?¸á??á?«"
+msgstr "á??á??á?ºá?? á??á?­á?¯á??á??á?º á??á??á?ºá??á??á?º á??á??á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á?¯á?·á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á??á?±á?¬á??á?ºá??á?® á??á?­á?¯á?¡á??á?ºá??á??á?¬á?¸ á??á?­á?¯á??á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr "á??á?­á??á?­á?? firewall á??á??á?¹ á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ port á??á?ºá?¬á?¸á??á?­á?¯á??á?¬ á??á??á?¹á??á?¼á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "á??á?»á?½á??á?ºá??á?±á?¬á?ºá?? á??á?­á?¯á??á?ºá??á?¬á?¸á??á?±á?«á??á??á?º á??á??á?ºá??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?¬á?¸á??á?­á?¯á?·á??á?¬ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?­á?¯á??á?ºá??á?±á??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
-msgstr "Firewall á??á??á?¹á??á?½á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?º á?¡á??á?¬á?¸á?¡á??á?®á?¸ á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
-msgstr "á??á?¼á??á?¹á?·á?»á??á?³á??á?¬á?¸á?±á??á?¬ Ports á??á?ºá?¬á?¸ :"
+msgstr "á??á?½á??á?·á?ºá??á?¼á?¯á??á?¬á?¸á??á??á?·á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?¬á?¸ -"
 
 msgctxt "NetworkPage"
 msgid "80, 443"
-msgstr "80, 443"
+msgstr "á??á??á?? á??á??á??"
 
 msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Directory request á??á?ºá?¬á?¸á??á?¯á?­ encrypt á?»á??á??á?¹á?±á??á??á??á?¹á?? Tor Network á??á?¯á?­ "
-"á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹ bridge relay á??á?ºá?¬á?¸á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?«"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¬á??á?¾á??á?ºá??á??á?º á??á??á?ºá??á?±á?¸á??á?¼á?®á?¸  Bridge Relay á??á?»á?¬á?¸á??á?­á?¯ Tor á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?· á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á??á?ºá??á?¾á??á?ºá??á??á?ºá??á?»á?¾á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?»á??á?ºá??á?¼á?¯á??á??á??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
-msgstr "á??á?­á??á?­á?? ISP á??á?½ Tor Network á??á?­á?¯á?? á??á??á?¹á??á?¼á??á?¹á??á??á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á?«á??á??á?¹"
+msgstr "á??á?»á?½á??á?ºá?¯á??á?ºá?? á?¡á??á?ºá??á?¬á??á??á?ºá??á?¬á?¸á??á??á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¯á??á?¹á??á??á?®á?? Tor á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?· á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
-msgstr "Bridge á??á??á?¹á??á?½á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸"
+msgstr "Bridge á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "NetworkPage"
 msgid "Add a Bridge:"
-msgstr "Bridge á??á??á?¹á??á?¯ á?±á??á?«á??á?¹á?¸á??á??á?¹á?·á??á?« :"
+msgstr "Bridge á??á?­á?¯ á??á??á?·á?ºá??á?«á?? -"
 
 msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ bridges á??á?ºá?¬á?¸á??á?­á?¯ á??á?¬á??á??á?¹á?¸á??á?½ á??á??á?¹á??á?½á?¬á?¸á?±á??á?¸á??á?«"
+msgstr "á??á?¬á??á??á?ºá?¸á??á?²á??á?¾ á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?º Bridge á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?¾á?¬á?¸á??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "Copy the selected bridges to the clipboard"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ bridges á??á?ºá?¬á?¸á??á?¯á?­ clipboard á??á?­á?¯á?? á?±á??á?¬á?¹á??á?® á??á?°á?¸á??á?«"
+msgstr "á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?º Bridge á??á?»á?¬á?¸á??á?­á?¯ á??á?°á?¸á??á?°á??á?¾á??á?ºá??á?¬á?¸á??á?¬á??á?±á??á?¬á??á?­á?¯á?· á??á?°á?¸á??á?°á??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "Find Bridges Now"
-msgstr ""
+msgstr "á??á??á?¯ Bridge á??á?­á?¯ á??á?¾á?¬á??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Bridgeá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?¼á?¬á?¸ á??á??á?ºá??á?²á?·á??á?­á?¯á?· á??á?¾á?¬á??á?­á?¯á??á?ºá??á??á?ºá??á??á?ºá?¸?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Bridge á??á?­á?¯ á??á??á?ºá??á?²á?·á??á?­á?¯á?· á??á?¾á?¬á??á?­á?¯á??á?ºá??á??á?ºá??á??á?ºá?¸ ?</a>"
 
 msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
+msgstr "Bridge á?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?¾á?­á?? á??á??á??á?­á?¯á??á?ºá??á?±á?¸á??á?«á?? á??á??á?ºá??á??á?º á??á?±á??á?¹á?? á??á?±á?¬á??á?·á?ºá??á?­á?¯á??á?¸á??á?¼á?®á?¸á??á?¾ á??á??á?ºá??á?¶á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?¼á??á?·á?ºá??á?­á?¯á??á?ºá??á??á?ºá?? á??á?­á?¯á?·á??á??á?¯á??á?º Bridge á?¡á??á??á?º á??á?¾á?¬á??á??á?º á?¡á??á?¼á?¬á?¸á??á??á?ºá?¸á??á??á?ºá?¸á??á?­á?¯ á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?¼á??á?·á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
+msgstr "Bridge á?¡á??á??á?ºá??á?»á?¬á?¸ á??á?¾á?¬á??á?½á?±á??á??á?º á?¡á??á?¼á?¬á?¸á??á??á?ºá?¸á??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á??á?º á?¡á??á?°á?¡á??á?® á??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á??"
 
 msgctxt "NetworkPage"
 msgid "Address:"
-msgstr ""
+msgstr "á??á?±á??á??á?ºá??á?­á??á?ºá??á?¬ -"
 
 msgctxt "NetworkPage"
 msgid "Type:"
-msgstr ""
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸ : "
 
 msgctxt "NetworkPage"
 msgid "You must select the proxy type."
-msgstr ""
+msgstr "á??á??á?±á?¬á??á?ºá??á?®á?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á??á??á?ºá??"
 
 msgctxt "NetworkPage"
 msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
 
 msgctxt "NetworkPage"
 msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
+msgid "You must specify one or more bridges."
+msgstr "bridge á??á??á?ºá??á?¯ á??á?­á?¯á?·á??á??á?¯á??á?º á??á??á?ºá??á?¯á??á??á?ºá??á?? á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á??á??á?ºá??"
 
 msgctxt "Policy"
 msgid "accept"
-msgstr "á??á??á?¹á??á?¶á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á?¶á??á?«á??"
 
 msgctxt "Policy"
 msgid "reject"
-msgstr "á?»á??á??á?¹á?¸á??á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á?¼á??á?ºá?¸á??á??á?ºá??á?«á??"
 
 msgctxt "RouterDescriptor"
 msgid "Online"
-msgstr "Online"
+msgstr "á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸"
 
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
-msgstr "Hibernating"
+msgstr "á??á??á?ºá?¡á?¬á?¸ á??á?±á??á?¹á?? á??á??á?ºá??á?¬á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "RouterDescriptor"
 msgid "Offline"
-msgstr "Offline"
+msgstr "á??á?­á?¯á??á?ºá?¸á??á?¼á??á?ºá??"
 
 msgctxt "RouterDescriptorView"
 msgid "Location:"
-msgstr "á??á??á?¹á?±á??á??á?¬ :"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá??á?±á??á?¬ :"
 
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
-msgstr "á?¡á?­á?¯á??á?¹á??á?® á??á?­á??á?¹á??á?¬ :"
+msgstr "IP á??á?­á??á?ºá??á?¬ -"
 
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
-msgstr "Platform:"
+msgstr "á??á??á??á?ºá??á?±á?¬á??á?ºá?¸ -"
 
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
-msgstr "Bandwidth:"
+msgstr "á??á??á?ºá??á??á?·á?º - "
 
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
-msgstr "á??á??á??á?¹á??á?­á?¯á?¸á??á??á?ºá?­á??á?¹:"
+msgstr "á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?»á?­á??á?º -"
 
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
-msgstr "á?±á??á?¬á??á?¹á??á?¶á?¯á?¸ á?¡á??á??á?¹á?»á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á?? :"
+msgstr "á??á?±á?¬á??á?ºá??á?¯á?¶á?¸ á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?¾á?¯á??á?»á?¬á?¸ -"
 
 msgctxt "RouterDescriptorView"
 msgid "Copy"
-msgstr "á?±á??á?¬á?¹á??á?®á??á?°á?¸á??á??á?¹"
+msgstr "á??á?°á?¸á??á?°á??á?«á??"
 
 msgctxt "RouterInfoDialog"
 msgid "Hibernating"
-msgstr ""
+msgstr "á??á??á?ºá?¡á?¬á?¸ á??á?±á??á?¹á?? á??á??á?ºá??á?¬á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "RouterInfoDialog"
 msgid "Online"
-msgstr ""
+msgstr "á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸"
 
 msgctxt "RouterInfoDialog"
 msgid "Offline"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá?¸á??á?¼á??á?ºá??"
 
 msgctxt "RouterInfoDialog"
 msgid "Unknown"
-msgstr ""
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "RouterInfoDialog"
 msgid "Relay Details"
-msgstr ""
+msgstr "Relay á?¡á??á?±á?¸á??á?­á??á?ºá?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "RouterInfoDialog"
 msgid "Summary"
-msgstr ""
+msgstr "á?¡á??á?»á?¯á??á?º"
 
 msgctxt "RouterInfoDialog"
 msgid "Name:"
-msgstr ""
+msgstr "á??á?¬á??á??á?º-"
 
 msgctxt "RouterInfoDialog"
 msgid "Status:"
-msgstr ""
+msgstr "á?¡á??á?±á?¡á??á?¬á?¸ :"
 
 msgctxt "RouterInfoDialog"
 msgid "Location:"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá??á?±á??á?¬ :"
 
 msgctxt "RouterInfoDialog"
 msgid "IP Address:"
-msgstr ""
+msgstr "IP á??á?­á??á?ºá??á?¬ -"
 
 msgctxt "RouterInfoDialog"
 msgid "Platform:"
-msgstr ""
+msgstr "á??á??á??á?ºá??á?±á?¬á??á?ºá?¸ -"
 
 msgctxt "RouterInfoDialog"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?·á?º - "
 
 msgctxt "RouterInfoDialog"
 msgid "Uptime:"
-msgstr ""
+msgstr "á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?»á?­á??á?º -"
 
 msgctxt "RouterInfoDialog"
 msgid "Contact:"
-msgstr ""
+msgstr "á??á??á?ºá??á?½á??á?ºá??á??á?º -"
 
 msgctxt "RouterInfoDialog"
 msgid "Last Updated:"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá??á?¯á?¶á?¸ á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?¾á?¯á??á?»á?¬á?¸ -"
 
 msgctxt "RouterInfoDialog"
 msgid "Descriptor"
-msgstr ""
+msgstr "Descriptor"
 
 msgctxt "RouterListItem"
 msgid "Offline"
-msgstr "Offline"
+msgstr "á??á?­á?¯á??á?ºá?¸á??á?¼á??á?ºá??"
 
 msgctxt "RouterListItem"
 msgid "Hibernating"
-msgstr "Hibernating"
+msgstr "á??á??á?ºá?¡á?¬á?¸ á??á?±á??á?¹á?? á??á??á?ºá??á?¬á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?º á??á?»á?¾á??á?º %1  á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "RouterListWidget"
 msgid "Relay"
@@ -2835,438 +2821,418 @@ msgstr "Relay"
 
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
-msgstr "Relay á??á?¯á?­á??  á??á?¯á?­á?¸á??á?¼á?¬á?¸á??á?«"
+msgstr "Relay á??á?­á?¯ á??á?¯á?¶á?¡á??á?½á??á?ºá?¡á??á?¬á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?«á??"
 
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
-msgstr "%1 relays online"
+msgstr "%1 relay á??á?»á?¬á?¸ á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸á??á?±á?«á?ºá??á?½á??á?º á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "RouterListWidget"
 msgid "Copy"
-msgstr "á?±á??á?¬á?¹á??á?®á??á?°á?¸á??á??á?¹"
+msgstr "á??á?°á?¸á??á?°á??á?«á??"
 
 msgctxt "RouterListWidget"
 msgid "Nickname"
-msgstr "á?¡á??á??á?¹á??á?½á??á?¹"
+msgstr "á?¡á??á??á?ºá??á?¼á?±á?¬á??á?º"
 
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
-msgstr "á??á??á?¹á?±á??á?¼"
+msgstr "á??á??á?ºá??á?½á?±á??á?¬"
 
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
-msgstr "Bridge á?±á??á?¬á??á?¹á??á?¶á?·á??á?? á??á??á??á?¯á?­á??á?¹á??á?«"
+msgstr "Bridge á?¡á??á?±á?¬á??á?ºá?¡á??á?¶á?· á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"á??á??á?¹ Tor á??á?¯á?­ bridge á??á?²á?·á??á?­á?¯á?? á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á??á?¹ á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á??á?«á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á?¹ á??á??á?¹á?? Tor "
-"version á??á??á?¹ bridges á??á?­á?¯á?? á?¡á?±á??á?¬á??á?¹á?¡á??á?·á?¶á??á?±á??á?¸á??á?¯á?­á??á?¹á??á?«"
+msgstr "á??á??á?¬á?¸á??á??á??á?ºá?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?°á??á?»á?¬á?¸á?¡á??á?½á??á?º Bridge Relay á?¡á??á?±á??á?¼á??á?·á?º á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á??á?º  á??á??á?ºá??á??á?º Tor á?¡á?¬á?¸ á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??  á??á?­á?¯á?·á??á?±á?¬á?º á??á??á?ºá?? Tor á??á?¬á?¸á??á?¾á??á?ºá?¸á??á?¾á?¬ Bridge á??á?»á?¬á?¸á??á?­á?¯ á??á??á?±á?¬á??á?ºá??á?¶á?·á??á?«á??"
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?? Tor á?±á??á?¬á?·á??á?²á??á?¯á?­ á?¡á??á??á?¹á?·á?»á??á??á??á?¹á?·á??á?« á??á?­á?¯á??á??á??á?¯á??á?¹ Tor á??á?­á?¯ á??á?¶á?¯á??á?½á??á?¹ Tor "
-"relay á??á?²á?·á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹á??á??á?»á??á?³á??á?¯á??á?¹á??á?«"
+msgstr "á??á??á?ºá?? Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?º á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?«á?? á??á?­á?¯á?·á??á??á?¯á??á?ºá??á?«á?? á??á?¯á?¶á??á?¾á??á?º Tor Relay á?¡á??á?±á??á?¼á??á?·á?º á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? Tor á?¡á?¬á?¸ á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
-msgstr "á??á??á?¹á?? bridge relay á?¡á??á?¯á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á??á?? á??á??á?½á?­á??á?«"
+msgstr "á??á??á?ºá?? Bridge Relay á??á?¾á?¬ á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«á??"
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr "á??á??á?¹ á?¡á??á??á?¹á?¸á??á?¶á?¯á?¸ relay á?¡á??á??á?¹á??á?½á??á?¹ á??á?½á??á?¹á?· port á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á?±á??á?¸á??á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á??á?º á?¡á??á??á?ºá?¸á??á?¯á?¶á?¸ Relay á?¡á??á??á?ºá??á?¼á?±á?¬á??á?ºá??á?¾á??á?·á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?­á?¯á?·á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?±á?¸á??á??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
-msgstr "Client á??á?²á?·á??á?¯á?­á??á??á?¬ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?«"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor Network á?¡á??á?¼á??á?¹ Relay traffic"
+msgstr "á??á??á?­á?¯á??á?ºá?¸á??á??á?·á?ºá?¡á??á?±á??á?¼á??á?·á?ºá??á?¬ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Relay Port:"
-msgstr "Relay Port:"
+msgstr "Relay á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º -"
 
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
-msgstr "Relay directory á??á?¯á?­ mirror á?»á??á?³á??á?¯á??á?¹á??á?¯á?­á??á?¹á??á??á?¹"
+msgstr "Relay á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?­á??á?¹á??á?°á??á?½á?¬á?¸á??á?­á?¯á??á?ºá??á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
-msgstr ""
-"Port forwarding á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á??á?¹á??á?½á??á?¹á?»á??á??á?¹á?¸ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹á?»á??á?³á??á?¯á??á?¹á??á??á?¹ á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á??"
+msgstr "Port Forwarding á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á??á?ºá?¸á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Test"
-msgstr "á??á??á?¹á?¸á??á??á?¹á??á??á?¹"
+msgstr "á??á??á?ºá??á?±á?¸á??á?¾á?¯"
 
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
-msgstr "Port forwarding á?±á??á??á??á?¼á??á?¹ á?¡á??á?°á?¡á??á?® á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?ºá?¬á?¸ á?»á??á??á??á??á?¹"
+msgstr "Port Forwarding á??á?¾á??á?·á?º á??á??á?ºá??á??á?ºá??á??á?·á?º á?¡á??á?°á?¡á??á?® á??á?±á?«á??á?ºá?¸á??á??á?ºá??á?­á?¯ á??á?±á?¬á?ºá??á?¼á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Directory Port:"
-msgstr "Directory Port:"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º -"
 
 msgctxt "ServerPage"
 msgid "Directory Port Number"
-msgstr "Directory Port á??á?¶á??á?«á??á?¹"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?º"
 
 msgctxt "ServerPage"
 msgid "Contact Info:"
-msgstr "á??á??á?¹á??á?¼á??á?¹á??á??á?¹ á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸ :"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á??á?º á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?º - "
 
 msgctxt "ServerPage"
 msgid "Name of your relay"
-msgstr "á??á??á?¹á?? relay á?¡á??á??á?¹"
+msgstr "á??á??á?ºá?? Relay á?¡á??á??á?º"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸á??á?½á??á?¹á?· á?¡á?»á??á?¬á?¸ relay á??á?ºá?¬á?¸á??á?½ á??á??á?¹á?? relay á??á?­á?¯á?? á??á??á?¹á??á?¼á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ port"
+msgstr "á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?°á??á?»á?¬á?¸á??á?¾á??á?·á?º á?¡á??á?¼á?¬á?¸ Relay á??á?»á?¬á?¸ á??á?¾á?­ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á??á?º á??á??á?ºá?? Relay á??á?¾á??á?·á?º á?¡á??á?¼á??á?ºá?¡á??á?¾á??á?º á??á??á?ºá??á?½á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
-msgstr "á?¡á??á??á?¹á??á?½á??á?¹:"
+msgstr "á??á?®á?¸á??á??á?·á?ºá?¡á??á??á?º - "
 
 msgctxt "ServerPage"
 msgid "Basic Settings"
-msgstr "á?¡á?±á?»á??á??á?¶ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸"
+msgstr "á?¡á??á?¼á?±á??á?¶ á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"á?±á??á?«á??á?¹á?¸á??á?¯á??á?¹á?»á??á??á?¹á??á??á?¹á?? upload á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á?¬ á?¡á??á?¹á??á?¬á??á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á?¡á??á?¼á??á?¹ á??á??á?¹á?? "
-"upload á?¡á?»á??á??á?¹á??á??á??á?¹á?¸á??á?­á?¯ á?¤á?±á??á??á?¬á??á?¼á??á?¹ á?±á??á?¬á?¹á?»á??á??á?«á??"
+msgstr "á??á?±á?«á??á?ºá?¸á??á?¯á??á?ºá??á?¯á??á?ºá??á?¾á?¯á??á?ºá?¸á??á?¼á??á?ºá??á?¼á?®á?¸ á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸á??á?±á?«á?ºá??á?±á??á?¬á??á??á?ºá??á?¾á?¯á??á?ºá?¸á??á?¾á?±á?¸á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?º á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á?¡á??á?½á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá?? á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸á??á?±á?«á?ºá??á?±á??á?¬á??á??á?ºá??á??á?·á?ºá??á?¾á?¯á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á??á?¬á?? á??á?¬á??á??á?ºá?¸á??á?¼á?¯á??á?¯á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
+msgstr "á??á?±á??á??á?º/á??á?®á?¡á??á?ºá??á?ºá?¡á??á?ºá??á?º á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??á??á?? á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
+msgstr "á??á?±á??á??á?º/á??á?®á?¡á??á?ºá??á?ºá?¡á??á?ºá??á?º á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??á??á?? á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
+msgstr "á??á?±á??á??á?º/á??á?®á?¡á??á?ºá??á?ºá?¡á??á?ºá??á?º á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??á??á?? á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1.5 Mbps"
+msgstr "á??á?® á??/á??á?±á??á??á?º/á??á?®á?¡á??á?ºá??á?ºá?¡á??á?ºá??á?º á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??.á?? á??á??á?¹á??á?«á??á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr "> á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??.á?? á??á??á?¹á??á?«á??á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "Custom"
-msgstr "á??á?­á??á?¹á?¾á??á?­á?³á??á?¹á?»á??á??á?¹á??á??á?¹á??á??á?¹"
+msgstr "á??á?­á??á?ºá??á?¼á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"á??á??á?¹á?? á?¡á??á?¹á??á?¬á??á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á??á??á?½á??á?¹á?· á?¡á??á?®á?¸á??á??á?¹á??á?¶á?¯á?¸ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á?¬á?¸á??á?ºá??á?¹á??á?­á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
+msgstr "á??á??á?ºá?? á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?¾á??á?·á?º á?¡á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?½á?¬ á??á?°á??á?®á??á??á?·á?º á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
-msgstr "Bandwidth á??á?½á??á?¹á?¸ á??á??á?¹á??á??á??á?¹á??á?ºá??á?¹á?¡á??á?¼á??á?¹ á?¡á??á?°á?¡á??á?®á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?ºá?¬á?¸ á?»á??á??á??á??á?¹"
+msgstr "á??á??á?ºá??á??á?·á?ºá??á?¾á?¯á??á?ºá?¸á??á??á?·á?ºá??á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸á??á?¾á??á?·á?ºá??á??á?ºá??á??á?ºá??á??á?·á?º á?¡á??á?°á?¡á??á?®á??á?±á?¸á??á?±á?«á??á?ºá?¸á??á??á?ºá??á?­á?¯ á??á?¼á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "Average Rate"
-msgstr "á??á?ºá??á?¹á?¸á??á?½á?º á??á??á??á?¹á?¸"
+msgstr "á??á?»á??á?ºá?¸á??á?»á?¾ á??á?¾á?¯á??á?ºá?¸"
 
 msgctxt "ServerPage"
 msgid "Long-term average bandwidth limit"
-msgstr "á?±á??á??á?½á??á?¹ á??á?ºá??á?¹á?¸á??á?½á?º bandwidth á??á??á?¹á??á?½á??á?¹á??á?ºá??á?¹"
+msgstr "á??á?±á??á?¾á??á?º á??á?»á??á?ºá?¸á??á?»á?¾ á??á?±á??á?¬á??á?°á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¾á?¯á??á?ºá?¸ á??á??á?·á?ºá??á??á?ºá??á?»á??á?º"
 
 msgctxt "ServerPage"
 msgid "KB/s"
-msgstr "KB/s"
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "ServerPage"
 msgid "Maximum Rate"
-msgstr "á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸ á??á??á??á?¹á?¸"
+msgstr "á?¡á??á?¼á??á?·á?ºá??á?¯á?¶á?¸ á??á?¾á?¯á??á?ºá?¸"
 
 msgctxt "ServerPage"
 msgid "Peak bandwidth rate limit"
-msgstr "á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸ bandwidth á??á??á??á?¹á?¸ á??á??á?¹á??á??á??á?¹á??á?ºá??á?¹"
+msgstr "á?¡á??á?¼á??á?·á?ºá??á?¯á?¶á?¸ á??á?±á??á?¬á??á?°á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¾á?¯á??á?ºá?¸ á??á??á?·á?ºá??á??á?ºá??á?»á??á?º"
 
 msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"á??á??á?¹á?? á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸ bandwidth á??á??á??á?¹á?¸ á??á??á?¹á??á?ºá??á?¹á?¸á??á?½á?º bandwidth á??á??á??á?¹á?¸ á??á??á?¹ á??á?­á?¯á?»á??á??á?¹á?¸ "
-"á??á?­á?¯á??á??á??á?¯á??á?¹ á??á?°á??á?®á??á??á?«á??á??á?¹á?? á??á??á?¹á??á?­á?¯á?¸ á??á?½á??á?¹á??á?¯á??á?¶á?¯á?¸á??á??á?¹ á?¡á??á??á?¹á?¸á??á?¶á?¯á?¸ 20 KB/s á??á?½á?­á??á??á?«á??á??á?¹á??"
+msgstr "á??á??á?ºá?? á?¡á??á?»á?¬á?¸á??á?¯á?¶á?¸ á??á?±á??á?¬á??á?°á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¾á?¯á??á?ºá?¸á??á??á?º á??á??á?ºá?? á??á?»á??á?ºá?¸á??á?»á?¾á??á?±á??á?¬á??á?°á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¾á?¯á??á?ºá?¸á??á??á?º á??á?­á?¯á??á?»á?¬á?¸ (á??á?­á?¯á?·) á??á?°á??á?® á??á??á?·á?ºá??á??á?ºá?? á??á??á?ºá?¸á??á?±á??á?¬á??á?°á?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¾á?¯á??á?ºá?¸ á??á??á?ºá??á?­á?¯á?¸á??á?»á?¬á?¸á??á??á?º á?¡á??á??á?ºá?¸á??á?¯á?¶á?¸ á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º á??á?? á??á?®á??á?­á?¯á??á?­á?¯á??á?º á??á?¾á?­á??á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
-msgstr "Bandwidth á??á??á?¹á??á??á??á?¹á??á?ºá??á?¹"
+msgstr "á??á??á?ºá??á??á?·á?ºá??á??á?·á?ºá??á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "ServerPage"
 msgid "Ports 6660 - 6669 and 6697"
-msgstr "Ports 6660 - 6669 and 6697"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?ºá??á?»á?¬á?¸ á??á??á??á??-á??á??á??á?? á??á?¾á??á?·á?º á??á??á??á??"
 
 msgctxt "ServerPage"
 msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+msgstr "á?¡á??á?ºá??á?¬á??á??á?º á??á?®á??á?±á?¸ á??á??á?¬á?¸á??á?¼á?±á?¬ á??á??á?­á?¯á??á??á??á?º (IRC)"
 
 msgctxt "ServerPage"
 msgid "Ports 110, 143, 993 and 995"
-msgstr "Ports 110, 143, 993 and 995"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?ºá??á?»á?¬á?¸ á??á??á??á?? á??á??á??á?? á??á??á?? á??á?¾á??á?·á?º á??á??á??"
 
 msgctxt "ServerPage"
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr "á??á?¬á??á??á?¹á??á?¼á??á?¹ á??á??á?°á??á??á?¹ (POP, IMAP)"
+msgstr "á??á?±á?¸á??á?ºá??á?»á?¬á?¸ á??á??á?°á??á?«á?? (POP, IMAP)"
 
 msgctxt "ServerPage"
 msgid "Ports unspecified by other checkboxes"
-msgstr "á?¡á?»á??á?¬á?¸ checkboxes á??á?ºá?¬á?¸á??á?½ á??á??á?¹á??á?½á??á?¹á??á??á?¬á?¸á?±á??á?¬ Ports á??á?ºá?¬á?¸"
+msgstr "á?¡á??á?¼á?¬á?¸á??á?±á?¬ á?¡á??á?¾á??á?ºá??á?¼á??á?ºá??á?½á??á?ºá??á?»á?¬á?¸á??á?¾ á??á??á??á?ºá??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "ServerPage"
 msgid "Misc Other Services"
-msgstr "á?¡á?»á??á?¬á?¸ á?¡á?±á??á?¼á?±á??á?¼ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸"
+msgstr " á?¡á??á?¼á?¬á?¸ á??á?»á?±á?¬á??á?ºá??á?±á?¬á??á?º á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?ºá??á?»á?¬á?¸ á??á??á??á?? á??á??á??á??á?? á??á??á??á??á?? á??á??á??á??á?? á??á??á??á??á?? á??á??á??á?? á??á?¾á??á?·á?º á??á??á??á??"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
-msgstr "á??á??á?¹á?±á??á?·á??á?ºá??á?¹á??á?ºá??á?¹á?¸á??á?­á?¯á??á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ (IM)"
+msgstr "á??á??á??á?ºá?¸á??á?­á?¯ á??á?­á?¯á?·á??á?¾á?¯ á??á??á??á?º (IM)"
 
 msgctxt "ServerPage"
 msgid "Port 443"
-msgstr "Port 443"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?º á??á??á??"
 
 msgctxt "ServerPage"
 msgid "Secure Websites (SSL)"
-msgstr "á??á?¶á?¯á?»á??á?¶á?³á??á??á??á?½á?­á?±á??á?¬ á??á??á?¹á??á??á?¹á??á?¯á?­á??á?¹á??á?ºá?¬á?¸ (SSL)"
+msgstr "á??á?­á??á?ºá??á?»á??á??á??á?·á?º á??á??á?ºá??á?ºá??á?­á?¯á??á?ºá??á?»á?¬á?¸ (SSL)"
 
 msgctxt "ServerPage"
 msgid "Port 80"
-msgstr "Port 80"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?¶á??á?«á??á?º á??á??"
 
 msgctxt "ServerPage"
 msgid "Websites"
-msgstr "á??á??á?¹á??á?¹á??á?­á?¯á??á?¹á??á?ºá?¬á?¸"
+msgstr "á??á??á?ºá??á?ºá??á?­á?¯á??á?ºá??á?»á?¬á?¸"
 
 msgctxt "ServerPage"
 msgid "Show help topic on exit policies"
-msgstr "á?¡á??á?¼á??á?¹á?±á??á??á??á??á?®á?¡á??á?¼á??á?¹ á?¡á??á?°á?¡á??á?®á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?ºá?¬á?¸ á?»á??á??á??á??á?¹"
+msgstr "Exit Policies á??á?¾á??á?·á?ºá??á??á?ºá??á??á?ºá?? á?¡á??á?°á?¡á??á?®á??á?­á?¯á??á?±á?¬á?ºá??á?¼á??á?«á??"
 
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"á??á??á?¹á?? relay á??á?½ á??á??á?¹á??á??á?¹á?· á?¡á??á?¹á??á?¬á??á??á?¹ á?¡á??á??á?¹á?¸á?¡á?»á??á??á?¹á??á?ºá?¬á?¸á??á?¯á?­ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸ "
-"á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á??á?¯á?­á??á?¹á?±á??á??á?«á??á??á?² ?"
+msgstr "á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?°á??á?»á?¬á?¸á?? á??á??á?ºá?? Relay á??á?¾ á??á??á?ºá??á?±á?¬á??á?ºá??á?­á?¯á??á?ºá??á??á?º á??á??á?ºá??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá?¡á??á??á?ºá?¸á?¡á??á?¼á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¯á?¶á?¸á??á?½á?²á??á??á??á?ºá??á??á?ºá?¸ ?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor á??á??á?¹ á?¡á??á?ºá?­á?³á??á?±á??á?¬ á?»á??á??á?¹á??á??á?­á?¯á?? á?­á?¯á??á??á??á??á?¹á??á??á?¹á?· á?±á??á?¸á??á?¹á??á?ºá?¬á?¸á??á?½á??á?¹á?· á??á?­á?¯á??á?¹á??á?½á?ºá?±á??á?±á??á?¬ "
-"application á??á?ºá?¬á?¸á??á?­á?¯ spam á??á?½á??á?¹á?· á?¡á?»á??á?¬á?¸ á?¡á??á?²á?¼á??á?¶á?¯á?¸á??á??á??á?ºá?¬á?¸ á?±á??á?ºá?¬á?·á??á?ºá??á?¯á?­á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ "
-"á??á?¬á?¸á?»á??á??á?¹á??á?¬á?¸á??á?«á??á??á?¹"
+msgstr "Tor á??á??á?º á??á??á?­á?¯á?¡á??á?ºá??á?²á??á?­á?¯á?·á??á?¬á??á??á?·á?º á?¡á?®á?¸á??á?±á?¸á??á?ºá??á?»á?¬á?¸á??á?¾á??á?·á?º á?¡á??á?¼á?¬á?¸ á??á?­á??á?«á?¸á??á?¯á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á??á?»á?±á?¬á?·á??á?»á??á??á?º á??á?¯á?¶á??á?¾á??á?ºá?¡á?¬á?¸á??á?¼á??á?·á?º á?¡á?®á?¸á??á?±á?¸á??á?ºá??á?½á??á?ºá??á?¬á?¡á??á?»á?­á?¯á?·á??á?¾á??á?·á?ºá??á?­á?¯á??á?ºá??á?»á?¾á??á?±á??á??á?·á?ºá?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá??á??á?ºá??á?­á??á?·á?ºá??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
-msgstr "á?±á??á??á??á??á?®á??á?½ á??á?¼á??á?¹á??á??á?¹"
+msgstr "Exit Policies"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"á?¡á?»á??á?¬á?¸á??á?°á??á?ºá?¬á?¸á??á?¯á?­ á??á??á?¹á?? bridge á??á?¯á?­ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á??á?±á??á??á??á?¹ á?±á?¡á?¬á??á?¹á??á?«á??á?¬á??á?¬á?¸á??á?¯á?­ "
-"á??á??á?¹á?¸á??á?­á?¯á??á?¡á?¬á?¸ á?±á??á?¸á??á?« :"
+msgstr "á??á?±á?¬á?ºá??á?¼á??á?« á??á?¬á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á?¡á??á?¼á?¬á?¸á??á?°á??á?»á?¬á?¸á?¡á?¬á?¸ á??á?±á?¸á??á?¼á??á?ºá?¸á?¡á?¬á?¸á??á?¼á??á?·á?º á??á??á?ºá?? Bridge á??á?­á?¯ á??á?­á?¯á??á?°á??á?»á?¬á?¸á??á?­á?¯ á??á?±á?¸á?? á??á??á?ºá??á?±á?¬á??á?ºá??á?½á??á?·á?ºá??á?¼á?¯á??á?«á??"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr "á??á??á?¹á?¸á??á??á?¹ á??á??á?¹á?· bridge á?? á?¡á?»á??á?¬á?¸á??á?°á??á?ºá?¬á?¸á??á?­á?¯á?? á?±á??á?¸á??á?¯á?­á??á?¹á?±á??á?¬ á?¡á??á?½á??á?¹á?¡á??á?¬á?¸á?»á??á??á?¹á??á??á?¹"
+msgstr "á??á??á?ºá?¸á??á?¾á?¬ á??á??á?ºá?? á?¡á??á?¼á?¬á?¸á??á?°á??á?»á?¬á?¸á??á?¶á??á?­á?¯á?· á??á?±á?¸á??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?ºá?? Bridge Relay á?? á?¡á??á?¾á??á?ºá?¡á??á?¬á?¸ á??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "á??á??á?¹á?· Bridge á?? á?¡á??á?½á??á?¹á?¡á??á?¬á?¸á??á?­á?¯ clipboard á??á?­á?¯á?? á?±á??á?¬á?¹á??á?®á??á?°á?¸á??á?«"
+msgstr "á??á??á?ºá?? Bridge Relay á?? á?¡á??á?¾á??á?ºá?¡á??á?¬á?¸á??á?­á?¯ á??á?°á?¸á??á?°á??á?¾á??á?ºá??á?¬á?¸á??á?¬á??á?±á??á?¬á??á?­á?¯á?· á??á?°á?¸á??á?¬á?¸á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "No Recent Usage"
-msgstr ""
+msgstr "á??á??á?¼á?¬á??á?±á?¸á??á?®á?? á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯á??á?»á?¬á?¸ á??á??á?¾á?­á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á?¡á?¬á?¸ á??á??á?¼á?¬á??á?±á?¸á??á?®á?? á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?²á?·á??á??á?·á?º á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á??á??á?¾á?­á??á?«á??"
 
 msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?­á?¯ á??á??á?ºá??á??á?º á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?ºá??á?¼á?¯á??á?¯á??á?ºá??á?¬á?¸á??á?«á?? á??á?­á?¯á?·á??á?¾á??á?¬ á??á??á?­á?¯á??á?ºá?¸á??á??á?·á?ºá??á?»á?¬á?¸á??á?¾á?¬ á??á??á?ºá?¸ Relay á??á?­á?¯ á??á?¾á?¬á??á?½á?±á??á?½á?±á?·á??á?­á??á?¼á?®á?¸á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?­á?¯á??á?ºá??á??á?º á?¡á??á?½á??á?·á?ºá?¡á??á?±á?¸á??á?­á?¯á??á?­á?¯á??á??á?­á?¯á??á?ºá??á??á?ºá??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "Bridge History"
-msgstr ""
+msgstr "Bridge á??á?±á?¬á??á?ºá??á?¶á??á?¬á??á??á??á?º"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
+msgstr "Vidalia á??á??á?º á??á??á?ºá?? Bridge á?? á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯á??á?¬á??á??á??á?ºá??á?­á?¯ á??á??á?­á?¯á??á?ºá??á??á?º á??á??á??á?ºá??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
+msgstr "Vidalia á?? á??á??á?ºá?? Bridge á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯ á??á?¬á??á??á??á?ºá??á?­á?¯ á??á?±á?¬á??á?ºá?¸á??á?­á?¯á??á??á?·á?ºá?¡á??á?« Tor á??á??á?º á??á?¯á?¶á??á?¶á??á??á?»á??á??á??á?·á?º á??á?¼á??á?ºá??á??á?ºá??á?¯á?¶á?·á??á?¼á??á?ºá??á?»á??á?ºá??á?­á?¯ á??á?¼á??á?ºá??á??á?ºá??á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
-msgstr ""
+msgstr "á??á?¼á??á?ºá??á??á?ºá??á??á?¬á??á??á?·á?º á??á?¯á?¶á?·á??á?¼á??á?ºá??á?¾á?¯á??á?¾á?¬ - %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
+msgstr "á??á??á?ºá??á?¾á?¬á?¸á??á?¶á??á??á??á?·á?ºá??á?¯á?¶á?¸á??á?½á?²á??á?°á??á?»á?¬á?¸á??á?­á?¯ Tor á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?· á??á?±á?¬á??á?ºá??á?±á??á??á?º á??á?°á??á?®á??á?«á??"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeUsage\">á??á?»á?½á??á?ºá??á?±á?¬á?ºá??  Bridge á??á?­á?¯ á??á??á?ºá??á?° á?¡á??á?¯á?¶á?¸á??á?­á?¯á??á?ºá??á??á??á?ºá?¸ ?</a>"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">á??á?­á?¯á?¡á??á?¬á??á??á?º á??á?¬á??á?²?</a>"
 
 msgctxt "ServerPage"
 msgid "Automatically distribute my bridge address"
-msgstr ""
+msgstr "á??á?»á?½á??á?ºá??á?±á?¬á?ºá?? Bridge á??á?­á??á?ºá??á?¬á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?¼á??á?·á?ºá??á?±á??á?«á??"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Tor á??á?½á??á?ºá??á??á?ºá?¡á??á?½á??á?º Relay Traffic (Exit Relay)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Tor á??á?½á??á?ºá??á??á?ºá?¡á??á?½á??á?ºá?¸á??á?¾á?­ Relay Traffic ( Exit Relay á??á??á?¯á??á?ºá??á?«á??)"
 
 msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
-msgstr ""
+msgstr "Relay á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á?­á?¯ á??á?­á??á?¹á??á?°á??á?½á?¬á?¸á??á?¬á?¸á??á??á?ºá??"
 
 msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾á??á?·á?º á??á??á?ºá??á??á?ºá?? á??á?¼á?¿á??á?¬á??á??á?¯á?¶á??á??á?¬ á??á?¼á??á?ºá??á?»á?¾á??á?º á??á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?½á?¬á?¸á??á?­á?¯á??á?ºá??á??á?·á?º \ná?¡á?®á?¸á??á?±á?¸á??á?ºá??á?­á??á?ºá??á?¬á?? á??á??á?ºá?? PGP á??á?­á?¯á?·á??á??á?¯á??á?º GPG á??á??á?ºá??á?½á?±á??á?¬á??á??á??á?ºá??á?»á?¬á?¸á??á??á?ºá?¸ á??á?«á??á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
-msgstr ""
-"á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á??á?¯á??á?¹á??á?¯á??á?¹á?»á??á??á?¹á??á??á?ºá?­á??á??á?? á??á?¯á??á?¹á??á?­á??á?¹á?¸á?±á??á??á?¥á?¹ "
-"á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??á??á?½á?­á??á?«á??á??á?¹"
+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 á??á??á?¹á??á?¯á??á?® á??á??á?¹á??á?½á??á?¹á??á?«á?? á?¡á?»á??á?¬á?¸ á?¡á??á?¬á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á??á?½á?¬á?¸á??á?«"
+msgstr "á?¡á??á??á?ºá?¸á??á?¯á?¶á?¸ á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á?·á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?¯á?¡á?¬á?¸á??á?¼á??á?ºá??á??á?ºá??á?« á??á?¼á?®á?¸á??á?»á?¾á??á?º á?¡á??á?¯á?¡á??á?±á?¬á??á?ºá??á?±á?«á??á?ºá?? á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á?·á??á??á?ºá??á?¯á??á?»á??á?ºá?¸á??á?®á?¡á?¬á?¸á??á?­á??á?ºá??á??á?ºá?¸á??á??á?ºá??á?­á?¯á?¡á??á?ºá??á??á?ºá?? á??á?¼á?®á?¸á??á?»á?¾á??á?º á?¡á??á?¼á?¬á?¸á??á??á?ºá??á?¯á?¡á?¬á?¸á??á??á?ºá??á?¯á??á?ºá??á?« á??"
 
 msgctxt "ServicePage"
 msgid "Error"
-msgstr "á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á??"
+msgstr "á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "ServicePage"
 msgid "Please select a Service."
-msgstr "á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á??á?¹á??á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
+msgstr "á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á??á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?½á?¾á?±á?¸á??á?«"
 
 msgctxt "ServicePage"
 msgid "Select Service Directory"
-msgstr "Service directory á??á??á?¹á??á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«"
+msgstr "á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á??á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?½á?¾á?±á?¸á??á?«"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtual Port á??á??á?¹ Port á??á?¶á??á?«á??á?¹ á?? á??á?½ á??á??á??á??á?? á?¡á??á?­á??á?¬ á?¡á??á?ºá?¶á?³á?¸á??á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgstr "á?¡á??á?¯á?¡á??á?±á?¬á??á?ºá??á?±á?«á??á?ºá??á??á?·á?º á??á?¼á??á?ºá??á?­á?¯á??á?ºá??á??á?·á?ºá?¡á??á?±á?«á??á?ºá??á?¶á??á??á?º [1..65535]á??á?»á?¬á?¸á??á?¬á??á?«á??á??á?ºá??á??á?º á??"
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr "á??á??á?¹á??á?½á??á?¹á??á??á?¹ á??á?­á??á?¹á??á?¬:port, á??á?­á??á?¹á??á?¬ á??á?­á?¯á??á??á??á?¯á??á?¹ port á??á?¬ á??á?«á??á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?·á?º address:port, address, or port.á??á?¬á??á?«á??á??á?ºá??á??á?º á??"
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
-msgstr "Directory á??á??á?¹ á?¡á?»á??á?¬á?¸ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á??á?¹á??á?¯á??á?½ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á??á?¹á?·á?»á??á?®á?¸ á?»á??á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?º á?¡á??á?¼á?¬á?¸á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á?·á??á?½á??á?ºá?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á??á??á?º "
 
 msgctxt "ServicePage"
 msgid "Form"
-msgstr "á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶"
+msgstr "á??á?±á?¬á??á?º"
 
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
-msgstr "á??á?½á?ºá?­á?³á??á??á?½á??á?¹á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á??á??á?½á?­á?»á??á?®á?¸ á?»á??á??á?¹á??á?«á??á??á?¹"
+msgstr " á?¡á??á?¼á?¬á?¸ á??á?»á?±á?¬á??á?ºá??á?±á?¬á??á?º á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "ServicePage"
 msgid "Onion Address"
-msgstr "Onion á??á?­á??á?¹á??á?¬"
+msgstr "_M  á??á?»á?¾á??á?ºá??á?­á??á?ºá??á?¬ - "
 
 msgctxt "ServicePage"
 msgid "Virtual Port"
-msgstr "Virtual Port"
+msgstr "_M á??á?­á?¯á??á??á?ºá?¸ port - "
 
 msgctxt "ServicePage"
 msgid "Target"
-msgstr "á??á??á?¹á??á?½á??á?¹"
+msgstr "á??á??á?ºá??á?½á?¾á??á?ºá?¸á??á?½á?±á??á?¼á?±á?¸"
 
 msgctxt "ServicePage"
 msgid "Directory Path"
-msgstr "Directory á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸"
+msgstr "_F á??á?­á?¯á??á?ºá??á?½á?²á??á??á?ºá??á?¾á?­á??á?¬á??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ â??"
 
 msgctxt "ServicePage"
 msgid "Enabled"
-msgstr "á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á?¶"
 
 msgctxt "ServicePage"
 msgid "Add new service to list"
-msgstr "á??á?¬á??á??á?¹á?¸á??á?²á??á?­á?¯á?? á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á??á??á?¹ á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á?¹"
+msgstr "á??á?¾á??á?ºá??á?¬á?¸á??á?»á??á?ºá?¡á??á??á?ºá??á?­á?¯ iPod á??á?±á?«á?ºá??á?½á??á?ºá??á??á?·á?ºá??á??á?º"
 
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
-msgstr "á??á?¬á??á??á?¹á?¸á??á?²á??á?½ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?¯á?­ á??á??á?¹á??á?½á?¬á?¸á??á??á?¹"
+msgstr "á??á?¬á??á??á?ºá?¸á??á?²á??á?¾ á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?º Bridge á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?¾á?¬á?¸á??á?«á??"
 
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
-msgstr "á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?? Onion á??á?­á??á?¹á??á?¬á??á?­á?¯ clipboard á??á?­á?¯á?? á??á?°á?¸á??á??á?¹"
+msgstr "Onion á??á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?ºá??á?­á??á?ºá??á?¬á?¡á?¬á?¸á??á?½á?±á?¸á??á?»á??á?ºá?? á??á??á??á?ºá??á?¯á??á?ºá??á?­á?¯á?·á??á?°á?¸á??á?«"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"local á??á?­á?¯á??á?¹ á??á??á??á?¹á?¡á??á?¼á??á?¹á?¸á??á?¼á??á?¹ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á??á?¼á??á?¹ directory "
-"á?±á??á?¼á?¸á??á?ºá??á?¹á?±á??á?¸á??á?«"
+msgstr "á??á?­á?¯á??á??á?ºá??á?­á?¯á??á?ºá??á??á??á?ºá?¡á?¬á?¸á??á?½á??á?·á?ºá??á?«á??á?¼á?®á?¸á??á?»á?¾á??á?º á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á??á?·á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á?·á?¡á??á?½á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯á??á?½á?±á?¸á??á?»á??á?ºá??á?«"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
-msgstr "Tor á??á?½ á??á?®á??á?¼á??á?¹á??á??á?¹á??á?®á?¸á??á??á?¹"
+msgstr "Tor á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?­á?¯á??á?º"
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
-msgstr ""
+msgstr "á??á?¾á??á?ºá??á??á?¬á??á?±á??á?¬á??á?­á?¯á?· á??á?°á?¸á??á?°á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á??á?º á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?º á??á?¬á?¸á??á?¾á??á?ºá?¸  \"%1\" á??á?­á?¯ á??á??á?ºá??á?¾á?­ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á??á?º á?¡á??á?¯á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯ á?¡á??á??á?¾ á??á?¼á??á?ºá?? á??á??á?º  Vidalia á??á?­á??á?ºá?¸á??á?»á?¯á??á?ºá??á?¾á?¯á??á?±á??á?¬á??á?½á??á?º \"Start Tor\" á??á?­á?¯ á??á?¾á?­á??á?ºá??á?«á?? á?¡á??á??á?ºá?? Tor á??á??á?º á??á??á?»á?¾á?±á?¬á?ºá??á??á?·á?ºá??á?² á??á?½á??á?ºá??á?½á?¬á?¸á??á?»á?¾á??á?º á??á?¼á??á?ºá??á?½á?¬á?¸á??á??á?·á?º á??á??á?ºá??á??á?·á?ºá??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á?»á?¬á?¸á??á?¾á??á?·á?ºá??á??á?ºá??á??á?ºá?? á?¡á??á?±á?¸á??á?­á??á?º á??á?­á??á?¾á?­á??á??á?º \"Advanced\" á??á??á?ºá??á?º á??á?­á?¯ á??á?½á?±á?¸á??á?»á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3274,7 +3240,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
+msgstr "á??á??á?ºá??á??á?º á??á?±á?¬á??á?ºá??á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á?¼á??á?ºá?¸ á??á??á?¾á?­á??á?±á?¬á?·á??á?±á?¬ Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá?? á??á?¬á?¸á??á?¾á??á?ºá?¸ \"%1\" á??á?­á?¯ á??á??á?ºá??á?¾á?­á??á?½á??á?º á??á?½á??á?·á?ºá??á?¬á?¸á??á?¼á??á?ºá?¸ á??á?¼á??á?ºá??á??á?ºá?? á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á?¡á??á?±á?¸á??á?¼á?®á?¸á??á??á?·á?º á??á?¯á?¶á??á?¼á?¯á?¶á??á?¾á?¯á?? á??á?¯á?¶á??á?¼á??á?ºá??á?­á??á?ºá??á?»á??á??á?¾á?¯á??á?¾á??á?·á?º á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á??á?«á??á??á?ºá??á??á?·á?º á??á??á?¼á?¬á??á?±á?¸á??á?®á?? á??á?¯á??á?ºá??á?±á?¬ á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯á?· á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3282,31 +3248,31 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
+msgstr "á??á??á?ºá??á??á?º á??á?±á?¬á??á?ºá??á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á?¼á??á?ºá?¸ á??á??á?¾á?­á??á?±á?¬á?·á??á?±á?¬ Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá?? á??á?¬á?¸á??á?¾á??á?ºá?¸ \"%1\" á??á?­á?¯ á??á??á?ºá??á?¾á?­á??á?½á??á?º á??á?½á??á?·á?ºá??á?¬á?¸á??á?¼á??á?ºá?¸ á??á?¼á??á?ºá??á??á?ºá?? á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á?¡á??á?±á?¸á??á?¼á?®á?¸á??á??á?·á?º á??á?¯á?¶á??á?¼á?¯á?¶á??á?¾á?¯á?? á??á?¯á?¶á??á?¼á??á?ºá??á?­á??á?ºá??á?»á??á??á?¾á?¯á??á?¾á??á?·á?º á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸ á??á?«á??á??á?ºá??á??á?·á?º á??á??á?¼á?¬á??á?±á?¸á??á?®á?? á??á?¯á??á?ºá??á?±á?¬ á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯á?· á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?²á??á?ºá??á?¾á?¬ á??á??á?ºá??á??á?ºá?¸á??á?¯á??á?ºá??á?±á??á?¼á?®á??"
 
 msgctxt "StatusEventWidget"
 msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Tor á??á?½á??á?ºá??á??á?ºá??á?¾á??á?·á?º á??á?»á?­á??á?ºá??á??á?ºá??á?½á?¬á?¸á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
+msgstr "á??á?»á?½á??á?ºá??á?±á?¬á?ºá??á?­á?¯á?·á??á??á?º Tor á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?· á?¡á??á?ºá??á?¬á??á??á?º á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á??á?ºá??á?¯á??á?­á?¯ á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?½á?¬ á??á??á?ºá??á?±á?¬á??á?ºá??á?­á?¯á??á?ºá??á?«á??á?¼á?®á?? á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á?¯ á??á?°á??á??á?­á??á?°á??á??á?­ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á??á?º á??á??á?¯ á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?º á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
+msgstr "Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á??á?º á??á??á?­á?¯á??á??á??á?º á?¡á??á?½á??á?ºá?¸á??á?­á?¯á??á?ºá?¸á??á?­á?¯á??á?ºá??á?¬ á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á??á?ºá??á?¯á??á?­á?¯ á??á?½á?±á?·á??á?¬á?¸á??á??á?ºá??  bugs.torproject.org: \"%1\" á??á?¾á?­ Tor á??á?±á?¬á?·á??á?ºá??á?²á??á?º á??á?±á?¸á??á?¬á?¸á??á?¼á??á?°á??á?»á?¬á?¸á??á?¶á??á?­á?¯á?· á??á?±á?¬á?ºá??á?¼á??á?« á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?ºá??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á?¡á??á?®á??á??á?ºá??á?¶á??á?¬á??á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3314,7 +3280,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?½á??á?ºá??á?»á?°á??á?¬á??á?¾á?­ á??á?¬á??á?®á??á??á?º á??á?°á??á??á??á?ºá?¸á??á?¼á?ºá??á?º \"%2\" á??á?¾á??á?·á?º á??á?¾á?­á?¯á??á?ºá?¸á??á?¾á??á?ºá??á?»á?¾á??á?º á??á??á??á?ºá?? %1 á??á??á?¹á??á??á?·á?ºá??á?¯ á??á??á?ºá??á?¾á??á?ºá??á?±á?¬á??á?ºá?¸á??á??á?ºá??á?¾á??á?ºá??á?­á??á?·á?ºá??á??á?ºá??á?¯ Tor á?? á??á??á?ºá??á?±á?¸á??á?½á?±á?·á??á?¾á?­á??á??á?ºá?? á?¡á??á??á?ºá?? á??á??á?ºá?? á??á?¬á??á?®á??á??á?º á??á??á?¾á??á?ºá??á??á?ºá??á?»á?¾á??á?º Tor á??á??á?º á?¡á??á?¯á??á?ºá??á?­á?¯ á??á?±á?¬á??á?ºá?¸á??á?½á?¬ á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?±á?¬á?·á??á??á?ºá??á??á?¯á??á?ºá??á?«á?? á??á??á?ºá?? á??á?½á??á?ºá??á?»á?°á??á?¬á??á??á?º á??á?¬á??á?®á?¡á??á?¾á??á?º á??á?¼á?? á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?±á??á?»á?¬á??á?½á?¬ á??á??á?ºá??á?±á?¸á?¡á??á??á?ºá??á?¼á?¯á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3322,11 +3288,11 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?½á??á?ºá??á?»á?°á??á?¬á??á?¾á?­ á??á?¬á??á?®á??á??á?º á??á?°á??á??á??á?ºá?¸á??á?¼á?ºá??á?º \"%2\" á??á?¾á??á?·á?º á??á?¾á?­á?¯á??á?ºá?¸á??á?¾á??á?ºá??á?»á?¾á??á?º á??á?±á?¬á??á?ºá??á?¬á??á??á?·á?º á?¡á??á?»á?­á??á?ºá??á?¬á??á?? %1 á??á??á?¹á??á??á?·á?ºá??á?¯ á??á??á?ºá??á?¾á??á?ºá??á?±á?¬á??á?ºá?¸á??á??á?ºá??á?¾á??á?ºá??á?­á??á?·á?ºá??á??á?ºá??á?¯ Tor á?? á??á??á?ºá??á?±á?¸á??á?½á?±á?·á??á?¾á?­á??á??á?ºá?? á?¡á??á??á?ºá?? á??á??á?ºá?? á??á?¬á??á?®á??á??á?º á??á??á?¾á??á?ºá??á??á?ºá??á?»á?¾á??á?º Tor á??á??á?º á?¡á??á?¯á??á?ºá??á?­á?¯ á??á?±á?¬á??á?ºá?¸á??á?½á?¬ á??á?¯á??á?ºá??á?­á?¯á??á?ºá??á?±á?¬á?·á??á??á?ºá??á??á?¯á??á?ºá??á?«á?? á??á??á?ºá?? á??á?½á??á?ºá??á?»á?°á??á?¬á??á??á?º á??á?¬á??á?®á?¡á??á?¾á??á?º á??á?¼á?? á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?±á??á?»á?¬á??á?½á?¬ á??á??á?ºá??á?±á?¸á?¡á??á??á?ºá??á?¼á?¯á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?½á??á?ºá??á?»á?°á??á?¬á??á?¾á?­ á??á?¬á??á?®á??á??á?º á??á?¾á?¬á?¸á??á?½á??á?ºá?¸á??á?±á??á?¼á?±á?¬á??á?ºá?¸ á?¡á??á?¬á?¸á?¡á??á?¬á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3334,18 +3300,18 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?½á??á?ºá??á?»á?°á??á?¬á??á?¾á?­ á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á?¡á??á??á?ºá??á??á?ºá??á?¯á??á??á?º á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º %1 á??á?­á?¯á?· Tor á??á?¾á??á??á??á?·á?º á??á?¬á??á?¾á??á?ºá??á??á?¯á??á?ºá??á?±á?¬ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á??á?ºá??á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?¬á??á?²á?·á??á??á?ºá?? Tor á??á?½á??á?ºá??á??á?ºá??á?¾ á??á?¬á??á?¾á??á?ºá??á??á?¯á??á?ºá??á?±á?¬á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?­á?¯ á??á?­á?¯á?·á??á?½á?¾á??á?ºá??á?¼á??á?ºá?¸á??á??á?º á?¡á??á?¹á??á??á?¬á??á?ºá??á?¾á?­á??á?¼á?®á?¸ á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á?¼á??á?ºá?¸ á??á??á?¾á?­á??á?«á?? á??á??á?ºá?? á?¡á??á?¬á?¡á??á?½á??á?ºá?¡á??á?½á??á?º Tor á??á??á?º á??á??á?ºá?¸ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á?¡á??á?­á?¯á?¡á??á?»á?±á?¬á??á?º á??á?­á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
+msgstr "á??á??á?ºá??á??á?½á??á?ºá??á?»á?°á??á?¬á??á?¾á?­ á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á?¡á??á??á?º á??á??á?ºá??á?¯ á??á??á?º %1á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?­á?¯á?· Tor á??á?¾á??á??á??á?·á?º á??á?¬á??á??á?¾á??á?ºá??á?¬á?¸á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?²á?·á??á?±á?¬á??á?ºá?¸á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?²á?·á??á??á?ºá?? Tor á??á?½á??á?ºá??á??á?ºá??á?¾á??á??á??á?·á?º á??á??á?¯á?¶á??á?¼á?¯á?¶á??á??á?·á?º á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?­á?¯á?·á??á?½á?¾á??á?ºá??á?¼á??á?ºá?¸á??á??á?º á?¡á??á?¹á??á??á?¬á??á?ºá??á?»á?¬á?¸á??á?¼á?®á?¸ á?¡á??á?¼á?¶á??á?¼á?¯á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á?¼á??á?ºá?¸á??á??á?¾á?­á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "á?¡á??á?¹á??á??á?¬á??á?ºá??á?»á?¬á?¸á??á?±á?¬ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á??á?¼á??á?ºá??á?¼á?±á?¬á??á?ºá?¸ á?¡á??á?¬á?¸á?¡á??á?¬á??á?¾á?­á??á??á?º !"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3353,81 +3319,81 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
+msgstr "á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á?¡á??á??á?ºá??á??á?ºá??á?¯á??á??á?º á??á??á?ºá??á?¦á?¸á??á??á?ºá??á?¬á??á?¾á??á?·á?ºá??á??á?ºá??á??á?ºá?? á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸ á??á?±á?«á??á?ºá??á?¼á?¬á?¸á??á?±á?¬á??á?ºá?¸á??á?±á?«á??á?ºá??á?¼á?¬á?¸á??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á?­á?¯á??á?±á?¬á??á??á?ºá??á?¯á??á?­á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¬á?¸á??á??á?·á?º \"%1\" á??á?­á?¯á?· Tor á??á?¾á??á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á?²á?·á??á??á?ºá?? á?¡á??á?±á?¸á??á?¾á?­ á??á??á?ºá?¡á??á??á?º á??á??á?ºá??á?¬á?¸á??á?¼á??á?ºá?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸á??á?¾á??á?·á?ºá?¡á??á?° SOCKS4a á??á?­á?¯á?· SOCKS5 á??á?»á?¾á??á?¬ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á??á?ºá??á?¾á?¬ á??á?±á??á?»á?¬á
 ??á?±á??á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­á??á??á?·á?º SOCKS á??á??á?­á?¯á??á?­á?¯á??á?±á?¬"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
+msgstr "á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á?¡á??á??á?ºá??á??á?ºá??á?¯á??á??á?º Tor á?? á??á?¬á?¸á??á??á??á?ºá??á??á?·á?º á??á??á?­á?¯á??á?­á?¯á??á?±á?¬á??á??á?ºá??á?¯á??á?­á?¯ á??á?¯á?¶á?¸á?? Tor á??á?¾á??á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á??á?ºá??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?²á?·á??á??á?ºá?? á?¡á??á?±á?¸á??á?¾á?­ á??á??á?ºá?¡á??á??á?º á??á??á?ºá??á?¬á?¸á??á?¼á??á?ºá?¡á??á?»á?­á?¯á?¸á?¡á??á?¬á?¸á??á?¾á??á?·á?ºá?¡á??á?° SOCKS4 á??á?­á?¯á?· SOCKS5 á??á?»á?¾á??á?¬ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?¬á?¸á??á??á?ºá??á?¾á?¬ á??á?±á??á?»á?¬á??á?±á??á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?·á?ºá??á??á?¶á??á?­á?¯á??á?ºá??á?±á?¬ á?¦á?¸á??á??á?ºá??á?¬ á??á??á?ºá?¡á??á??á?º"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
+msgstr "á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá??á?»á?¬á?¸á?¡á??á??á?º á??á??á?ºá??á?¯á??á??á?º á??á??á?ºá??á?¶á??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?ºá??á?¬á??á??á?ºá?¡á??á?¼á??á?º Tor á?? á??á??á?­á??á?­á?¯á??á?ºá??á??á?·á?º  \"%1\" á??á?­á?¯á?· Tor á??á?¾á??á??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á??á?ºá??  á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá?? á?¡á??á?¯á?¶á?¸á??á?»á??á??á?­á?¯á??á??á??á?ºá?? á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?¼á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
-msgstr ""
+msgstr "á??á?¼á??á?ºá?? á?¡á?­á?¯á??á?ºá??á?® á??á?­á??á?ºá??á?¬ á??á?¼á?±á?¬á??á?ºá?¸á??á?²á??á?¬á?¸á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á?? á?¡á??á?»á?¬á?¸á??á?¯á?¶á?¸ á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á??á?ºá??á?¬á??á?¾á?¬ á??á??á?ºá??á?¾á?­á?? %1%2 á??á?¼á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ Tor á??á??á?º á??á?­á??á?¾á?­á??á?¬á?¸á??á??á?ºá?? á?¡á??á??á?ºá?? á??á??á?ºá?¸á??á?¾á?¬ á??á??á?¾á??á?ºá??á??á?ºá??á?«á??á?»á?¾á??á?º á??á??á?ºá?? Relay á?? á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?»á??á?ºá??  \"á??á?­á??á?ºá??á?¬\" á??á?½á?±á?¸á??á?»á??á?ºá??á?»á??á?ºá??á?­á?¯ á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?·á?ºá??á?½á??á?ºá?¸ á??á??á?ºá?¸á??á?¬á?¸á??á?±á?¸á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "DNS á??á?±á??á?¬á??á?­á?¯á?¸á??á?°á??á?¼á??á?ºá?¸ á??á??á?ºá??á?±á?¸á??á?½á?±á?·á??á?¾á?­á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?­á?¯á??á?­á??á?ºá?¸á?¡á??á??á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¯á??á?¹á??á??á?®á??á??á?º á??á??á??á?ºá??á??á?¾á?­á??á??á?·á?º á??á?­á?¯á??á?­á??á?ºá?¸á??á?»á?¬á?¸á?¡á??á?½á??á?º á??á?¾á?¬á?¸á??á?½á??á?ºá?¸á??á??á?·á?º á??á?¼á??á?ºá??á??á?ºá??á?¯á?¶á?·á??á?¼á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?°á??á?±á??á??á?ºá??á?¯ Tor á?? á??á?­á??á?¾á?­á??á?½á?¬á?¸á??á??á?ºá?? á??á?±á?¬á?ºá??á?¼á??á?« á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?¾á?¬ á?¡á??á?»á?­á?¯á?·á??á?±á?¬ á?¡á??á?ºá??á?¬á??á??á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¯á??á?¹á??á??á?®á??á?»á?¬á?¸á??á?¾á??á?·á?º OpenDNS á??á?²á?·á??á?­á?¯á?·á??á?±á?¬ á?¡á??á?¼á?¬á?¸ á??á?­á?¯á??á?­á??á?ºá?¸á?¡á??á??á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¯á??á?¹á??á??á?®á??á?»á?¬á?¸á??á??á?º á??á?°á??á?­á?¯á?·á??á?¬á??á?¬á??á?°á??á?­á?¯á?· á??á?¾á?¬á??á?½á?±á??á?¾á?¯á??á?¼á?¯á??á?¯á??á?ºá??á??á?º (á??á?­á?¯á?·) á??á?¼á?±á?¬á?ºá??á?¼á?¬á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?­á?¯ á??á?
 ±á?¬á?ºá??á?¼á??á??á?º á?¡á??á?­á?¯á?·á??á?¾á?¬ á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¼á??á?ºá?¸ á??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
+msgstr "á??á??á?ºá?? á??á?­á?¯á??á?­á??á?ºá?¸á?¡á??á??á?ºá??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¯á??á?¹á??á??á?®á??á??á?º á??á?°á??á?­á??á?»á?¬á?¸á??á??á?·á?º á??á?­á?¯á??á?­á??á?ºá?¸á??á?»á?¬á?¸á?¡á??á?½á??á?º á??á?¾á?¬á?¸á??á?½á??á?ºá?¸á??á??á?·á?º á??á?¼á??á?ºá??á??á?ºá??á?¯á?¶á?·á??á?¼á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?°á??á?±á??á??á?ºá??á?¯ Tor á?? á??á?­á??á?¾á?­á??á?½á?¬á?¸á??á??á?ºá?? á??á?­á??á?»á??á??á?·á?º DNS á??á?¼á??á?ºá??á??á?ºá??á?¯á?¶á?·á??á?¼á??á?ºá??á?»á??á?ºá??á?»á?¬á?¸ á??á??á?°á??á??á?º Tor á??á?½á??á?ºá??á??á?º Relay á??á?»á?¬á?¸á?¡á??á?±á?«á?º á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á?? á??á?¾á?®á??á?­á?¯á?¡á?¬á?¸á??á?¬á?¸á??á??á??á??á?ºá?¸á?? á??á??á?ºá?? Relay á?¡á?¬á?¸ Exit Relay á?¡á??á?±á??á?¼á??á?·á?º á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á??á?º á??á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "á??á?¬á??á?¬ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾á?­ á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá?? Tor á??á?½á??á?ºá??á??á?ºá??á?¾ %1:%2 á?? á??á?°á?·á??á?¬á??á?¬á??á?° á??á?»á?­á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸á??á?¼á??á?·á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ Tor á??á??á?º á??á?¯á?¶á?¸á??á?¼á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?±á??á??á?ºá?? á??á??á?ºá?¸á??á??á?ºá??á?±á?¸á??á?¾á?¯á??á?¾á?¬ á??á?­á??á??á?ºá?¡á??á??á?ºá??á?¼á?¬ á??á?¼á?¬á??á?¼á??á?·á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "á??á?¬á??á?¬ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸ á??á??á?ºá??á?±á?¸á??á?¾á?¯ á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á??á?º !"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾á?­ á??á?¬á??á?¬ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á??á?º Tor á??á?½á??á?ºá??á??á?ºá??á?¾ á??á?±á?¬á??á?ºá??á?­á?¯á??á?ºá??á??á?º !"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "á??á?¬á??á?¬ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸ á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3435,30 +3401,30 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á?? á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?­á?¯á?· á?¡á??á?¼á?¬á?¸á??á?±á?¬ Tor á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á??á?¾ á??á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?«á?? á?¡á??á??á?ºá?? á??á??á?ºá??á??á?º Port Forwarding á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á?­á?¯á?¡á??á?ºá??á??á?·á?º Router á??á?­á?¯á?·á??á??á?¯á??á?º Firewall á??á??á?ºá??á?¯á??á?¯ á??á?±á?¬á??á?ºá?? á??á?¾á?­á??á?±á??á?«á??á?»á?¾á??á?º  á??á??á?ºá?¸á??á??á?º á??á?¼á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá?? á?¡á??á??á?ºá?? %1:%2  á??á??á?º á??á??á?ºá?? á??á?¾á??á?ºá??á??á?ºá??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á??á?ºá??á?¬ á??á?¾á??á?·á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?­á?¯á?· á??á??á?¯á??á?ºá??á?»á?¾á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá?? Relay á?? á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?»á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾á?­ á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá?? Tor á??á?½á??á?ºá??á??á?ºá??á?¾ %1:%2 á?? á??á?°á?·á??á?¬á??á?¬á??á?° á??á?»á?­á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸á??á?¼á??á?·á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ Tor á??á??á?º á??á?¯á?¶á?¸á??á?¼á??á?ºá??á??á?º á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?±á??á??á?ºá?? á??á??á?ºá?¸á??á??á?ºá??á?±á?¸á??á?¾á?¯á??á?¾á?¬ á??á?­á??á??á?ºá?¡á??á??á?ºá??á?¼á?¬ á??á?¼á?¬á??á?¼á??á?·á?ºá??á?­á?¯á??á?ºá??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸ á??á??á?ºá??á?±á?¸á??á?¾á?¯ á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á??á?º !"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾ á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á??á?º Tor á??á?½á??á?ºá??á??á?ºá??á?¾ á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á??á?º !"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?½á??á?ºá?¸ á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3466,21 +3432,21 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á?? á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?­á?¯á?· á?¡á??á?¼á?¬á?¸á??á?±á?¬ Tor á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á??á?¾ á??á??á?±á?¬á??á?ºá??á?¾á?­á??á?­á?¯á??á?ºá??á?«á?? á?¡á??á??á?ºá?? á??á??á?ºá??á??á?º Port Forwarding á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??á?­á?¯á?¡á??á?ºá??á??á?·á?º Router á??á?­á?¯á?·á??á??á?¯á??á?º Firewall á??á??á?ºá??á?¯á??á?¯ á??á?±á?¬á??á?ºá?? á??á?¾á?­á??á?±á??á?«á??á?»á?¾á??á?º  á??á??á?ºá?¸á??á??á?º á??á?¼á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá?? á?¡á??á??á?ºá?? %1:%2  á??á??á?º á??á??á?ºá?? á??á?¾á??á?ºá??á??á?ºá??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?ºá??á?­á??á?ºá??á?¬ á??á?¾á??á?·á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?­á?¯á?· á??á??á?¯á??á?ºá??á?»á?¾á??á?º á??á?»á?±á?¸á??á?°á?¸á??á?¼á?¯á?? á??á??á?ºá?? Relay á?? á??á?¯á?¶á??á?¶á??á?»á??á?¾á??á?ºá??á?»á??á?ºá??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?«á??"
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Relay Descriptor á?¡á?¬á?¸ á??á?¼á??á?ºá?¸á??á??á?ºá??á?¬á?¸á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
+msgstr "á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸ á??á??á?ºá?? Relay á??á?­á?¯á?· á??á??á?ºá??á?½á??á?ºá??á?­á?¯á??á?ºá??á?±á??á??á?º á??á??á?ºá?? Relay á?? Descriptor á??á?­á?¯  á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?¬á??á?¬á??á?¾ %1:%2 .á??  á??á?¼á??á?ºá?¸á??á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??  á??á?±á?¸á??á?¬á?¸á??á??á?·á?º á?¡á??á?¼á?±á?¬á??á?ºá?¸á??á?¼á??á?»á??á?ºá??á?¾á?¬ %3 á??á?°á?? á??á?¼á??á?ºá??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á?¾á?¬ á?¡á??á?ºá??á?¬á??á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¬á?¸á??á??á?ºá??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3488,402 +3454,393 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
+msgstr "á??á??á?ºá?? Relay á??á??á?º á??á??á?¯ á?¡á?½á??á?ºá??á?­á?¯á??á?ºá?¸á??á?±á?«á?ºá??á?±á?¬á??á?ºá??á?¾á?­á??á?±á??á?¼á?®á?¸ Tor á??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á?¡á??á?½á??á?º á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º á??á??á?­á?¯á??á?ºá??á??á?ºá?? á??á?±á?¬á??á?ºá??á??á?ºá??á??á?­á?¯á??á?ºá?¸á??á??á?ºá??á?»á?¬á?¸á?? á??á??á?ºá?? Relay á?¡á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á?±á?·á??á?¬á??á?­á??á?¾á?­á??á?¬á??á??á?ºá??á?¾á??á?·á?ºá?¡á??á?»á?¾ á??á?¬á??á?®á?¡á??á??á?ºá?¸á??á??á?ºá?¡á??á?½á??á?ºá?¸ á??á??á?ºá??á??á?·á?ºá??á?¼á??á??á??á?ºá??á?¾ á??á?±á?¬á?ºá??á?¼á??á?¬á?¸á??á??á?·á?º á??á?½á??á?ºá??á??á?º á?¡á??á?½á?¬á?¸á?¡á??á?¬ á??á?¾á?¯á??á?ºá??á?½á?±á?¸á??á?¾á?¯ á??á?­á?¯á??á?»á?¬á?¸á??á?¬á??á??á?ºá??á?­á?¯ á??á??á?ºá??á??á?º á??á?½á?±á?·á??á??á?­á??á?·á?ºá??á??á?ºá?? Tor á??á?½á??á?ºá??á??á?ºá??á?­á?¯á?· á??á?«á??á??á?ºá??á?¶á?·á??á?­á?¯á?¸á??á?±á?¸á??á?¼á??á?ºá?¸á?¡á??á?½á??á?º á??á?»á?±á?¸á??á?°á?¸á??á??á?ºá??á?«á??á??á?ºá??"
 
 msgctxt "Stream"
 msgid "New"
-msgstr "á?¡á??á??á?¹"
+msgstr "á?¡á??á??á?º"
 
 msgctxt "Stream"
 msgid "Resolving"
-msgstr "á?±á?»á??á??á?½á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "á??á?¼á??á?ºá??á??á?ºá??á?¼á?±á??á?¾á??á?ºá?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "Stream"
 msgid "Connecting"
-msgstr "á??á??á?¹á??á?¼á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "á??á?¬á??á?¬á??á?­á?¯á?· á??á?»á?­á??á?ºá??á??á?ºá??á?±á??á?²"
 
 msgctxt "Stream"
 msgid "Open"
-msgstr "á??á?¼á??á?¹á?·á??á?½á??á?¹á??á?«"
+msgstr "á??á?½á??á?·á?ºá??á?«"
 
 msgctxt "Stream"
 msgid "Failed"
-msgstr "á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á??á??á??á?«á??"
 
 msgctxt "Stream"
 msgid "Closed"
-msgstr "á??á?­á??á?¹á??á?¬á?¸á??á?«á??á??á?¹"
+msgstr "á??á?­á??á?ºá??á?¬á?¸á??á??á?º"
 
 msgctxt "Stream"
 msgid "Retrying"
-msgstr "á?»á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á?¶á??á?¼á?­á?¯á?¸á??á?¬á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "Stream"
 msgid "Remapped"
-msgstr " Remap á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á??á?«á?»á??á?®"
+msgstr "á??á?¼á??á?ºá??á??á?ºá??á?±á??á?¬á??á?»á??á?¬á?¸á??á?«á??"
 
 msgctxt "Stream"
 msgid "Unknown"
-msgstr "á??á??á?­á??á??á?«"
+msgstr "á?¡á??á?»á?­á?¯á?¸á?¡á??á??á?ºá??á??á?­"
 
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
-msgstr "á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?? %1 á??á??á?¹á??á??á?¹á??á??á??á?¹ á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?« [%2]"
+msgstr "á??á?¯á??á?ºá??á??á?ºá?¸á??á??á?º  %1 á??á??á?º á??á??á?ºá??á??á?·á?ºá?? á??á??á??á?«á??  [%2]"
 
 msgctxt "TorService"
 msgid "The Tor service is not installed."
-msgstr "The Tor á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á?¬á?¸á??á?«"
+msgstr "Tor á??á?¬á?¸á??á??á?ºá??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯á?· á??á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?¬á?¸á??á?«á??"
 
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
-msgstr "Tor á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á??á??á??á?¹á??á?¯á?­á??á?¹á??á?«"
+msgstr "Tor á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?­á?¯ á?¡á?? á??á??á?¼á?¯á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
-msgstr "á??á??á?¬á?¸á??á?½á??á?¹á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á??á?¹ Hash á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á??á?­á??á?ºá?¸á??á?»á?¯á??á?º á??á??á?¬á?¸á??á?¾á??á?ºá??á?­á?¯ Hash á??á??á?º á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "TorrcDialog"
 msgid "Editing torrc"
-msgstr ""
+msgstr "torrc á??á?­á?¯ á??á?¼á??á?ºá??á??á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
+msgstr "á??á??á?ºá??á??á?ºá??á?»á?¬á?¸á?¡á?¬á?¸á??á?¾á??á?ºá??á?¬á?¸á??á?« á??á??á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á?°á?¸á??á?­á?¯á??á?»á?¾á??á?ºá??á??á?¯á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?±á??á??á?·á?º Tor á??á??á??á?ºá??á??á?ºá??á?»á?¬á?¸á??á?±á?«á?ºá??á?½á??á?ºá??á?¬á??á??á?ºá??á?±á?¬á??á?ºá??á??á?º á??"
 
 msgctxt "TorrcDialog"
 msgid "Cut"
-msgstr ""
+msgstr "á??á?¼á??á?ºá??á?°á??á?«á??"
 
 msgctxt "TorrcDialog"
 msgid "Copy"
-msgstr ""
+msgstr "á??á?°á?¸á??á?°á??á?«á??"
 
 msgctxt "TorrcDialog"
 msgid "Paste"
-msgstr ""
+msgstr "á??á??á?ºá??á?¬á?¸á??á?«á??"
 
 msgctxt "TorrcDialog"
 msgid "Undo"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá??á?¼á??á?º"
 
 msgctxt "TorrcDialog"
 msgid "Redo"
-msgstr ""
+msgstr "á??á?¼á??á?ºá?? á??á?¯á??á?ºá??á?«á??"
 
 msgctxt "TorrcDialog"
 msgid "Select All"
-msgstr ""
+msgstr "Aá?¡á?¬á?¸á??á?¯á?¶á?¸ á??á?½á?±á?¸á??á?»á??á?º"
 
 msgctxt "TorrcDialog"
 msgid "Apply all"
-msgstr ""
+msgstr "á?¡á??á?¾á??á?ºá?¡á??á?¬á?¸á??á?¼á?¯á??á?¬á?¸á??á?±á?¬á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?²á??á?»á?¬á?¸á??á?­á?¯á??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?«"
 
 msgctxt "TorrcDialog"
 msgid "Apply selection only"
-msgstr ""
+msgstr "á??á?±á?«á??á?ºá?¸á??á??á?ºá??á?²á?· á??á?¬á??á?½á??á?ºá??á?¬á??á??á?ºá?¸ á??á??á?ºá??á??á?º"
 
 msgctxt "TorrcDialog"
 msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Tor á??á?­á?¯ á??á?»á?­á??á?ºá??á??á?ºá??á?¬á?? á??á?¼á?¿á??á?¬ á??á?¾á?­á??á?±á??á??á?ºá??"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
+msgstr "á??á??á?ºá??á??á?·á?ºá?¡á??á?¬á??á?¾á??á??á?½á?±á?¸á??á?»á??á?ºá??á?¬á?¸á??á?« á??á??á?¬á??á?¬á?¸á??á?»á?¬á?¸á?¡á?¬á?¸á??á?½á?±á?¸á??á?»á??á?ºá??á?­á?¯á?·á??á?¾á??á?ºá??á?¬á?¸á??á?« \"Apply all\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "%4: á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º: á??á?¬á??á?¼á?±á?¬á??á?ºá?¸á??á?±: %1 - á?¡á??á?­á?¯á??á?º: %2\n%3"
 
 msgctxt "TorrcDialog"
 msgid "Error"
-msgstr ""
+msgstr "á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º"
 
 msgctxt "TorrcDialog"
 msgid "An error ocurred while opening torrc file"
-msgstr ""
+msgstr "torrc á??á?­á?¯á??á?ºá??á?­á?¯ á??á?½á??á?·á?ºá??á?±á??á??á?º á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º á??á?¼á??á?ºá??á?½á?¬á?¸á??á??á?ºá??"
 
 msgctxt "UPNPControl"
 msgid "Success"
-msgstr "á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á?¼á?®á?¸á??á?¯á?¶á?¸á??á?¼á?®"
 
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
-msgstr "UPnP á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ á??á??á?¥á??á?¹á?¸á??á?­á??á?­á??á?¬á??á?ºá?¬á?¸ á??á?±á??á?¼á??á??á?­á?½á??á?«"
+msgstr "UPnP á??á?­á?¯ á??á??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?ºá??á??á?¹á??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á?¬á??á?½á?±á??á??á?½á?±á?·á??á?¾á?­á??á?«á??"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"á??á??á?¹á?·á?±á??á?½á?ºá?¬á?¹á?±á??á?¬ UPnP á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ á?¡á??á?¹á??á?¬á??á??á?¹ gateway á??á??á?¥á??á?¹á?¸á??á?­á??á?­á??á?¬á??á?ºá?¬á?¸ "
-"á??á?±á??á?¼á??á??á?½á?­á??á?«"
+msgstr "UPnP á??á?­á?¯ á??á??á?­á?¯á??á?ºá??á??á?·á?º á?¡á??á?ºá??á?¬á??á??á?º á??á?¼á?¬á?¸á??á?¶ á??á??á?ºá??á??á?¹á??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?¾á?¬á??á?½á?±á??á??á?½á?±á?·á??á?¾á?­á??á?«á??"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
-msgstr "WSA á??á??á??á?¹á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "WSAStartUp á??á??á??á?º á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
-msgstr "Port mapping á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á??á?·á?ºá??á??á?ºá??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
-msgstr "Port mapping á?»á??á??á?¹á??á??á?¹ á??á??á?°á??á??á?¹ á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?°á??á??á?º á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
-msgstr "Port mapping á??á??á?¹á??á?½á?¬á?¸á??á??á?¹ á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«"
+msgstr "á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á??á??á?ºá??á?¾á?¬á?¸á??á??á?º á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??"
 
 msgctxt "UPNPControl"
 msgid "Unknown error"
-msgstr "á?¡á??á??á?¹á??á??á?­ á??á?ºá?­á?³á??á??á?¼á??á?¹á?¸á??á??"
+msgstr "á?¡á??á??á?ºá??á??á?­á?¡á??á?¾á?¬á?¸"
 
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
-msgstr "UPnP á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?¯á?­á??á?¹á?±á??á?¬ á??á??á?¥á??á?¹á?¸á??á?­á??á?­á??á?¬á??á?ºá?¬á?¸ á??á?½á?¬á?±á??á?¼á?±á??á??á?«á??á??á?¹"
+msgstr "UPnP á??á?­á?¯ á??á??á?­á?¯á??á?ºá??á??á?·á?º á??á??á?ºá??á??á?¹á??á??á?ºá?¸á??á?»á?¬á?¸á??á?­á?¯ á??á?­á?¯á??á?ºá??á?¶á??á?¾á?¬á??á?½á?±á??á?¼á??á?ºá?¸"
 
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
-msgstr "Directory port mapping á??á?­á?¯ á?¡á??á??á?¹á??á??á?¹á?·á??á?¼á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?ºá??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
-msgstr "Relay port mapping á??á?¯á?­ á?¡á??á??á?¹á??á??á?·á?¹á??á?¼á??á?¹á?¸á?±á??á??á?«á??á??á?¹"
+msgstr "Relay á??á??á?ºá??á?½á??á?ºá??á?±á?«á??á?º á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯á??á?­á?¯ á?¡á??á??á?·á?º á??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á?¼á??á?ºá?¸"
 
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
-msgstr "á??á??á?¹á?¸á??á??á?¹á??á?? á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?¼á?¬ á?»á??á?®á?¸á??á?®á?¸á??á?«á?»á??á?®!"
+msgstr "á??á??á?ºá??á?±á?¸á??á?¾á?¯ á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?½á?¬ á??á?¼á?®á?¸á??á?¼á?±á?¬á??á?ºá??á?«á??á?¼á?®!"
 
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
-msgstr "UPnP á?±á??á?¬á??á?¹á??á?¶á?·á??á?? á??á??á?¹á?¸á??á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "UPnP á?¡á??á?±á?¬á??á?ºá?¡á??á?°á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
-msgstr "Universal Plug & Play á?±á??á?¬á??á?¹á??á?¶á?·á??á?? á??á??á?¹á?¸á??á??á?¹á?±á??á??á?«á??á??á?¹"
+msgstr "á??á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á?¡á??á?½á??á?ºá??á??á?° á??á?¼á?¯á??á?ºá??á?­á?¯á??á?ºá?? á??á??á?ºá??á?­á?¯á??á?ºá??á?¾á?¯ á?¡á??á?±á?¬á??á?ºá?¡á??á?¶á?·á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?¼á??á?ºá?¸"
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
+msgstr "'%1' á??á?­á?¯ á??á??á?¾á?¬á??á?½á?±á??á?­á?¯á??á?ºá??á?±á?¬á??á?¼á?±á?¬á??á?·á?º á??á??á?­á?¯á??á?ºá??á?±á?¬ á??á?±á?¬á?·á??á?ºá??á?²á??á?º á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á?¾á?¯á??á?»á?¬á?¸á?¡á??á?½á??á?º Vidalia á?? á??á??á??á?ºá??á?±á?¸á??á?±á?¸á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
+msgstr "Tor á?? á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¯á??á?¾á?¬ á??á??á?»á?¾á?±á?¬á?ºá??á??á?·á?ºá??á?² á??á??á?ºá??á??á?·á?ºá??á?½á?¬á?¸á??á?±á?¬á??á?¼á?±á?¬á??á?·á?º Vidalia á??á??á?º á??á??á?­á?¯á??á?ºá??á??á?·á?º á??á?±á?¬á?·á??á?ºá??á?²á??á?º á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á??á?º á??á??á??á?­á?¯á??á?ºá??á?«á??"
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
-msgstr ""
+msgstr "á??á??á?¾á?­á??á?­á?¯á??á?ºá??á?±á?¬ á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?±á??á?² ..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Hide"
-msgstr ""
+msgstr "á??á?»á?±á?¬á??á?ºá??á?¬á?¸á??á?«á??"
 
 msgctxt "UpdateProgressDialog"
 msgid "Downloading updates..."
-msgstr ""
+msgstr "á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?±á?«á??á?ºá?¸á??á?¯á??á?º á??á?¼á?¯á??á?¯á??á?ºá??á?±á??á?² .."
 
 msgctxt "UpdateProgressDialog"
 msgid "Installing updated software..."
-msgstr ""
+msgstr "á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á?¬á?¸á??á??á?·á?º á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá??á?­á?¯ á??á??á?ºá??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?±á??á?² ..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "á??á?¼á?®á?¸á??á?½á?¬á?¸á??á?¼á?®! á??á?±á?¬á?·á??á?ºá??á?ºá??á?ºá??á?¾á?¬ á??á??á?¯ á??á?±á?¬á??á?ºá??á?¯á?¶á?¸á??á?½á??á?ºá??á?¬á?¸á??á?¾á??á?ºá?¸ á??á?¼á??á?ºá??á?½á?¬á?¸á??á?¼á?®á??"
 
 msgctxt "UpdateProgressDialog"
 msgid "OK"
-msgstr ""
+msgstr "á??á?±á?¬á??á?ºá?¸á??á?¼á?®"
 
 msgctxt "UpdateProgressDialog"
 msgid "Software Updates"
-msgstr ""
+msgstr "á??á?±á?¬á?·á??á?ºá??á?²á??á?ºá?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for updates..."
-msgstr ""
+msgstr "á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á??á?ºá??á?±á?¸á??á?±á??á?² ..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Cancel"
-msgstr ""
+msgstr "á??á?±á??á?±á?¬á?·"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Software Updates Available"
-msgstr ""
+msgstr "á??á??á?¾á?­á??á?­á?¯á??á?ºá??á?±á?¬ á??á?±á?¬á?·á??á?ºá??á?²á??á?º á?¡á??á??á?·á?ºá??á?¼á?¾á??á?·á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Remind Me Later"
-msgstr ""
+msgstr "á??á?­á??á?­á?¡á?¬á?¸ á??á?±á?¬á??á?ºá??á?¾ á??á??á?ºá?¡á??á?­á??á?±á?¸á??á?«á??"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Install"
-msgstr ""
+msgstr "á??á??á?ºá?¡á??á?½á??á?ºá?¸á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?«á??"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
+msgstr "á??á?±á?¬á?ºá??á?¼á??á?« á?¡á??á??á?·á?ºá??á?­á?¯á?¸á??á?¼á?¾á??á?·á?ºá??á??á?·á?º á??á?±á?¬á?·á??á?ºá??á?²á??á?º á?¡á??á?¯á?¶á??á?­á?¯á??á?º á??á??á?º á??á??á?ºá??á?½á??á?ºá?¸á??á?­á?¯á?· á??á??á?·á?ºá??á?½á??á?ºá?¸á??á?¼á??á?ºá?¸á?¡á??á?½á??á?º á?¡á??á??á?ºá??á??á?·á?º á??á?¼á??á?ºá??á?¼á?®á?? -"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
-msgstr ""
+msgstr "á??á??á?ºá??á?±á?·"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Version"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Uploading Crash Report"
-msgstr ""
-
-msgctxt "UploadProgressDialog"
-msgid "Unable to send report: %1"
-msgstr ""
+msgstr "á??á?¬á?¸á??á?¾á??á?ºá?¸"
 
 msgctxt "VMessageBox"
 msgid "OK"
-msgstr "á?¡á?­á?¯á?±á??"
+msgstr "á??á?±á?¬á??á?ºá?¸á??á?¼á?®"
 
 msgctxt "VMessageBox"
 msgid "Cancel"
-msgstr "á??á??á?¹á??á?ºá??á?¹á??á??á?¹"
+msgstr "á??á?±á??á?±á?¬á?·"
 
 msgctxt "VMessageBox"
 msgid "Yes"
-msgstr "á??á?½á??á?¹á??á?«á??á??á?¹"
+msgstr "á??á?¯á??á?ºá??á?²á?·"
 
 msgctxt "VMessageBox"
 msgid "No"
-msgstr "á??á??á?¯á??á?¹á??á?«"
+msgstr "á??á??á?·á?ºá?¡á??á?ºá?¸"
 
 msgctxt "VMessageBox"
 msgid "Help"
-msgstr "á??á?°á??á?®á??á??"
+msgstr "á?¡á??á?°á?¡á??á?®"
 
 msgctxt "VMessageBox"
 msgid "Retry"
-msgstr "á?»á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á??á?¹"
+msgstr "á??á??á?ºá??á?¼á?­á?¯á?¸á??á?¬á?¸"
 
 msgctxt "VMessageBox"
 msgid "Show Log"
-msgstr "á??á?½á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸ á?»á??á??á??á??á?¹"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸ á??á?¼á??á?«á??"
 
 msgctxt "VMessageBox"
 msgid "Show Settings"
-msgstr "á?»á??á??á?¹á??á??á?¹á??á?­á??á?¹á?¸á??á?­á??á??á??á??á?ºá?¬á?¸ á?»á??á??á??á??á?¹"
+msgstr "á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¼á??á?«á??"
 
 msgctxt "VMessageBox"
 msgid "Continue"
-msgstr "á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á??á?¹"
+msgstr "á??á??á?ºá??á?¯á??á?º"
 
 msgctxt "VMessageBox"
 msgid "Quit"
-msgstr "á??á?¼á??á?¹á??á??á?¹"
+msgstr "á??á?½á??á?ºá??á??á?º"
 
 msgctxt "VMessageBox"
 msgid "Browse"
-msgstr "Browse"
+msgstr "á??á??á?ºá??á?±á?¬á??á?ºá??á?¾á?¬á??á?½á?±á??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Invalid Argument"
-msgstr "á??á??á?½á??á?¹á??á??á?¹á?±á??á?¬ Argument"
+msgstr "á??á??á?ºá??á??á?·á?ºá??á??á?¶á??á?±á?¬ á??á?±á?¸á??á?»á??á?º"
 
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
-msgstr "Vidalia á?¡á??á?¯á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á?»á??á?®á?¸á?»á??á??á?¹á??á?«á??á??á?¹"
+msgstr "Vidalia á??á??á?º á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?±á??á?¾á??á?·á?ºá??á?¼á?®á??"
 
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
-msgstr "á?¤ á??á?¯á??á?¹á?±á??á?¬á??á?¹á??á?? á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?­á?¯ á?»á??á??á?? á??á?¼á??á?¹á??á?«"
+msgstr "á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á?¾á?¯á??á?¼á??á??á??á?ºá?¸á??á?½á?¾á?¬á??á?­á?¯á??á?¼á??á??á?¼á?®á?¸á??á?½á??á?ºá??á?½á?¬á?¸á??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
-msgstr "Vidalia á?»á??á??á?¹á??á??á?¹á??á?­á??á?¹á?¸á??á?­á?½á??á??á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¯á?­ á??á?°á??á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??á?«"
+msgstr "á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?±á?¬ á??á?­á??á?ºá?¸á??á?¬á?¸á??á??á?·á?º Vidalia á??á??á??á?ºá??á?¼á??á?ºá??á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?­á?¯ á??á?¼á??á?ºá??á??á?ºá??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
-msgstr "Vidalia data file á??á?ºá?¬á?¸ á?¡á??á?¼á??á?¹ directory á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "á??á?±á??á?¬á??á?­á?¯á??á?ºá??á?»á?¬á?¸á?¡á??á?½á??á?º Vidalia á??á?¯á?¶á?¸á??á??á?º á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Vidalia á?? pidfile á??á?¯á?­ á?¡á??á??á?¹á??á?½á??á?¹á?·á?±á??á??á?¬á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "Vidalia á?? pidfile á?¡á??á??á?ºá??á?¾á??á?·á?º á??á??á?ºá??á?±á??á?¬ á??á?­á?¯á?·á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Vidalia á?? á??á?½á??á?¹á??á??á?¹á?¸á??á?¯á?­á??á?¹á??á?¯á?­ á?¡á??á??á?¹á??á?½á??á?¹á?·á?±á??á??á?¬á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "Vidalia á?? á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯á??á?º á?? á?¡á??á??á?ºá??á?¾á??á?·á?º á??á??á?ºá??á?±á??á?¬á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
-"Vidalia á?? á??á?½á??á?¹á??á??á?¹á?¸á??á??á?¹á?»á??á??á?¹á?¸ á??á??á?¹á??á?½á?º á??á?½á??á?¹á?¾á??á?¬á??á?¼á?¬á??á?¬á?¸á??á?½á?­á??á??á?¹á??á?­á?¯á??á??á?¹á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "Vidalia á?? á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á??á?ºá?¸á??á?¼á??á?ºá?¸á?? verbosity á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
-msgstr "Vidalia á?? á?¾á??á?¬á?¸á??á?¶á??á??á?¹á??á?¼á??á?¹á??á?? á??á?¶á?¯á??á?¶á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "Vidalia á?? á??á?»á??á?ºá??á?¾á?¬á??á?¬ á??á?®á??á?­á?¯á??á?ºá?¸á??á?¯á?¶á??á?¶á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
-msgstr "Vidalia á?? á??á?¬á??á?¬á??á??á?¬á?¸á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á?«"
+msgstr "Vidalia á?? á??á?¬á??á?¬á??á??á?¬á?¸ á??á?­á?¯ á??á??á?ºá??á?¾á??á?ºá??á?«á??"
 
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
-msgstr "Vidalia á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸"
+msgstr "Vidalia á??á?¯á?¶á?¸á??á?½á?²á??á?¾á?¯ á??á??á??á?ºá?¸á?¡á??á?»á??á?ºá?¡á??á??á?º"
 
 msgctxt "Vidalia"
 msgid "Unable to open log file '%1': %2"
-msgstr "á??á?½á??á?¹á??á??á?¹á?¸ á??á?¯á?­á??á?¹á??á?¯á?­ á??á??á?¼á??á?¹á?·á??á?­á?¯á??á?¹á??á?« '%1': %2"
+msgstr "á??á?¾á??á?ºá??á??á?ºá?¸á??á?­á?¯á??á?º  '%1': %2 á??á?­á?¯ á??á??á?½á??á?·á?ºá??á?­á?¯á??á?ºá??á?«á??"
+
+msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr "á??á?«á??á?¬á??á?®á??á?¬á?¡á??á?½á??á?º á??á?­á?¯á?¡á??á?ºá??á?±á?¬ á??á??á?ºá??á?­á?¯á?¸ -"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
-msgstr ""
+msgstr "á??á??á?¾á??á?ºá??á??á?ºá??á?±á?¬ á??á?¬á??á?¬á??á??á?¬á?¸ á??á?¯á??á?ºá??á?¶á??á?«á??á?º á??á??á?ºá??á?¾á??á?ºá??á?»á??á?º - "
 
 msgctxt "Vidalia"
 msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "á??á??á?¾á??á?ºá??á??á?ºá??á?±á?¬ á??á?»á??á?ºá??á?¾á?¬á??á?¬á?¡á??á?½á??á?ºá?¡á??á?¼á??á?ºá??á??á?­á?¯á??á?ºá??á??á?ºá??á?¾á??á?ºá??á?»á??á?º -"
 
 msgctxt "Vidalia"
 msgid "Invalid log level specified:"
-msgstr ""
+msgstr "á??á??á?¾á??á?ºá??á??á?ºá??á?±á?¬ á??á?¾á??á?ºá??á??á?ºá?¸ á?¡á??á??á?·á?ºá?¡á??á??á?ºá?¸ á??á??á?ºá??á?¾á??á?ºá??á?»á??á?º -"
 
 msgctxt "Vidalia"
 msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
+msgstr "á?¡á??á?¼á?¬á?¸ Vidalia á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?»á??á?ºá??á?¾á?¬ á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá?¸á??á?¯á??á?ºá??á?±á??á??á?ºá?? á?¡á??á??á?ºá?? á?¡á??á?¼á?¬á?¸ Vidalia á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á?¬á??á?ºá??á?»á??á?ºá??á?¾á?¬ á?¡á??á?¾á??á?ºá??á??á??á?º á?¡á??á?¯á??á?ºá??á?¯á??á?ºá??á?±á??á?»á?¾á??á?º á??á??á?ºá??á??á?·á?ºá??á??á?ºá?¸á??á??á?ºá?¸á??á?¼á??á?·á?ºá??á??á?­á?¯ á??á??á?ºá??á?½á?¬á?¸á??á??á?º á??á?½á?±á?¸á??á?»á??á?ºá??á?­á?¯á??á?ºá??á??á?ºá??\n\nVidalia á??á?­á?¯ á?¡á??á??á?¼á?¯á?? á??á??á?ºá??á?½á?¬á?¸á??á?»á??á?ºá??á?«á??á??á?¬á?¸á??"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
-msgstr ""
+msgstr "%1 á??á??á?¹á??á??á?·á?º"
 
 msgctxt "stringutil.h"
 msgid "%1 B/s"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º %1 á??á?­á?¯á??á?º"
 
 msgctxt "stringutil.h"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?º á??á?»á?¾á??á?º %1  á??á?®á??á?­á?¯á??á?­á?¯á??á?º"
 
 msgctxt "stringutil.h"
 msgid "%1 MB/s"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º %1 á??á??á?¹á??á?«á??á?­á?¯á??á?º"
 
 msgctxt "stringutil.h"
 msgid "%1 GB/s"
-msgstr ""
+msgstr "á??á??á?ºá??á??á?¹á??á??á?·á?ºá??á?»á?¾á??á?º %1 á??á??á?ºá??á?«á??á?­á?¯á??á?º"
 
 msgctxt "stringutil.h"
 msgid "%1 days"
-msgstr ""
+msgstr "%1 á??á??á?º"
 
 msgctxt "stringutil.h"
 msgid "%1 hours"
-msgstr ""
+msgstr "%1 á??á?¬á??á?®"
 
 msgctxt "stringutil.h"
 msgid "%1 mins"
-msgstr ""
-
-
+msgstr "%1 á??á?­á??á??á?º"
diff --git a/src/vidalia/i18n/po/nah/qt_nah.po b/src/vidalia/i18n/po/nah/qt_nah.po
index 90d2fc4..7e81cec 100644
--- a/src/vidalia/i18n/po/nah/qt_nah.po
+++ b/src/vidalia/i18n/po/nah/qt_nah.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nah/vidalia_nah.po b/src/vidalia/i18n/po/nah/vidalia_nah.po
index 844bdf6..2548a22 100644
--- a/src/vidalia/i18n/po/nah/vidalia_nah.po
+++ b/src/vidalia/i18n/po/nah/vidalia_nah.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/nap/qt_nap.po b/src/vidalia/i18n/po/nap/qt_nap.po
index 075d88b..b06e33a 100644
--- a/src/vidalia/i18n/po/nap/qt_nap.po
+++ b/src/vidalia/i18n/po/nap/qt_nap.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nap/vidalia_nap.po b/src/vidalia/i18n/po/nap/vidalia_nap.po
index b55a2f0..2d86fa5 100644
--- a/src/vidalia/i18n/po/nap/vidalia_nap.po
+++ b/src/vidalia/i18n/po/nap/vidalia_nap.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/nb/qt_nb.po b/src/vidalia/i18n/po/nb/qt_nb.po
index 18ab098..569ee75 100644
--- a/src/vidalia/i18n/po/nb/qt_nb.po
+++ b/src/vidalia/i18n/po/nb/qt_nb.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 finnes allerede.\n"
-"Vil du overskrive?"
+msgstr "%1 finnes allerede.\nVil du overskrive?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Filen ble ikke funnet.\n"
-"Vennligst se at riktig filnavn ble angitt."
+msgstr "%1\nFilen ble ikke funnet.\nVennligst se at riktig filnavn ble angitt."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Katalogen ble ikke funnet.\n"
-"Vennligst se at riktig katalognavn ble angitt."
+msgstr "%1\nKatalogen ble ikke funnet.\nVennligst se at riktig katalognavn ble angitt."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' er skrivebeskyttet.\n"
-" Vil du slette den allikevel?"
+msgstr "'%1' er skrivebeskyttet.\n Vil du slette den allikevel?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Navnet \"%1\" kunne ikke bli brukt.</b><p>Prøv å bruke et annet navn, med"
-" færre bokstaver eller ingen punktumer."
+msgstr "<b>Navnet \"%1\" kunne ikke bli brukt.</b><p>Prøv å bruke et annet navn, med færre bokstaver eller ingen punktumer."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/nb/vidalia_nb.po b/src/vidalia/i18n/po/nb/vidalia_nb.po
index a96f11f..8f3b20d 100644
--- a/src/vidalia/i18n/po/nb/vidalia_nb.po
+++ b/src/vidalia/i18n/po/nb/vidalia_nb.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-28 03:27+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: FreedomIsGreat <kmdl@xxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -44,8 +44,7 @@ msgstr "'%1' er ikke en gyldig IP adresse."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Du valgte 'Passord' autentisering, men du spesifiserte ikke ett passord."
+msgstr "Du valgte 'Passord' autentisering, men du spesifiserte ikke ett passord."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -177,9 +176,7 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Den følgende mappe plasseringen inneholder tegn som ikke kan brukes i ditt "
-"system sitt 8-bit karakter kodifikasjon"
+msgstr "Den følgende mappe plasseringen inneholder tegn som ikke kan brukes i ditt system sitt 8-bit karakter kodifikasjon"
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -203,13 +200,17 @@ 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"
-"\n"
-"Du kan bli nødt til å måtte fjerne det manuelt."
+msgstr "Vidalia klarte ikke å fjerne Tor-tjenesten.\n\nDu kan bli nødt til å måtte fjerne det manuelt."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -231,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunne ikke laste inn den valgte språkoversettelsen"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Siden:"
@@ -451,9 +469,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia har koblet seg til en Tor-prosess som krever et passord. Vennligst "
-"skriv inn ditt kontrollpassord:"
+msgstr "Vidalia har koblet seg til en Tor-prosess som krever et passord. Vennligst skriv inn ditt kontrollpassord:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1291,8 +1307,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia manuelt."
+msgstr "Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia manuelt."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1534,10 +1549,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia kan åpne lenken du valgte i din standard nettleser. Hvis din "
-"nettleser er foreløpig ikke konfigurert til å bruke Tor vil forespørsel ikke"
-" bli anonym."
+msgstr "Vidalia kan åpne lenken du valgte i din standard nettleser. Hvis din nettleser er foreløpig ikke konfigurert til å bruke Tor vil forespørsel ikke bli anonym."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1551,9 +1563,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kunne ikke åpne den valgte lenken i nettleseren. Du kan kopiere URL-"
-"en og lime den inn i nettleseren."
+msgstr "Vidalia kunne ikke åpne den valgte lenken i nettleseren. Du kan kopiere URL-en og lime den inn i nettleseren."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1764,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "Koblet til Tor-nettverket!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ukjent oppstartstatus."
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diverse"
 
@@ -1835,9 +1841,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du "
-"har oppgitt Tor-programmets riktige navn og plassering."
+msgstr "Vidalia kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du har oppgitt Tor-programmets riktige navn og plassering."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1875,9 +1879,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor-programvaren trenger at Vidalia sender innholdet i en informasjonskapsel"
-" for autentisering, men Vidalia klarte ikke å finne én."
+msgstr "Tor-programvaren trenger at Vidalia sender innholdet i en informasjonskapsel for autentisering, men Vidalia klarte ikke å finne én."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1899,9 +1901,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia klarte ikke å registrere noen hendelser. Mange av Vidalias "
-"funksjoner kan være utilgjengelig."
+msgstr "Vidalia klarte ikke å registrere noen hendelser. Mange av Vidalias funksjoner kan være utilgjengelig."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1923,9 +1923,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Den installerte versjonen av Tor er utdatert eller ikke lengre anbefalt. "
-"Besøk nettsiden til Tor for å laste ned nyeste versjon."
+msgstr "Den installerte versjonen av Tor er utdatert eller ikke lengre anbefalt. Besøk nettsiden til Tor for å laste ned nyeste versjon."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1935,8 +1933,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser."
+msgstr "Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2031,17 +2028,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia prøvde å tilbakestille Tors kontrollpassord, men klarte ikke å "
-"starte Tor på nytt. Vennligst sjekk din Oppgavebehandler for å være sikker "
-"på at ingen andre Tor-prosesser kjører."
+msgstr "Vidalia prøvde å tilbakestille Tors kontrollpassord, men klarte ikke å starte Tor på nytt. Vennligst sjekk din Oppgavebehandler for å være sikker på at ingen andre Tor-prosesser kjører."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Den innstallerte versjonen av Tor er utdatert eller ikke lengre anbefalt."
+msgstr "Den innstallerte versjonen av Tor er utdatert eller ikke lengre anbefalt."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2056,8 +2049,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor har automatisk lukket din forbindelse for å beskytte din anonymitet."
+msgstr "Tor har automatisk lukket din forbindelse for å beskytte din anonymitet."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2071,9 +2063,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Det er ingen nye Tor-oppdateringer tilgjengelig for ditt system for "
-"øyeblikket."
+msgstr "Det er ingen nye Tor-oppdateringer tilgjengelig for ditt system for øyeblikket."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2095,54 +2085,61 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "feilet (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably Telnet)"
 msgstr ""
-"Din relé stenges ned.\n"
-"Trykk på \"Stopp\" igjen for å stenge din relé nå."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"Du kjører for tiden en relé. Ved å avslutte din relé vil du avslutte alle åpne forbindelser til klienter.\n"
-"\n"
-"Vil du avslutte gradvis å la klientene få tid til å finne en annen relé?"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "feilet (%1)"
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Din relé stenges ned.\nTrykk på \"Stopp\" igjen for å stenge din relé nå."
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
-"Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n"
-"\n"
-"Vennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Du kjører for tiden en relé. Ved å avslutte din relé vil du avslutte alle åpne forbindelser til klienter.\n\nVil du avslutte gradvis å la klientene få tid til å finne en annen relé?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n\nVennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2416,17 +2413,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Meldinger som oppstår når noe har gått\n"
-"veldig galt og Tor ikke kan fortsette."
+msgstr "Meldinger som oppstår når noe har gått\nveldig galt og Tor ikke kan fortsette."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Meldinger som kun oppstår når\n"
-"noe har gått veldig galt med Tor."
+msgstr "Meldinger som kun oppstår når\nnoe har gått veldig galt med Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2434,37 +2427,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Meldinger som oppstår av og til\n"
-"under en normal Tor-operasjon og\n"
-"er ikke ansett som feilmeldinger\n"
-"men som du kanskje vil bry deg om."
+msgstr "Meldinger som oppstår av og til\nunder en normal Tor-operasjon og\ner ikke ansett som feilmeldinger\nmen som du kanskje vil bry deg om."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Meldinger som ofte oppstår\n"
-"i en normal Tor-operasjon."
+msgstr "Meldinger som ofte oppstår\ni en normal Tor-operasjon."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Lange meldinger som er mest\n"
-"av interesse for Tor-utviklere."
+msgstr "Lange meldinger som er mest\nav interesse for Tor-utviklere."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Kan ikke skrive til fil %1\n"
-"\n"
-"%2."
+msgstr "Kan ikke skrive til fil %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2571,14 +2553,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ugyldig Bro"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den oppgitte broidentifikatoren er ikke gyldig"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopier (Ctrl+C)"
 
@@ -2586,17 +2560,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Du må spesifisere både IP adresse eller vertsnavn og et portnummer for å "
-"konfigurere Tor til å bruke en proxy for å koble til Internett."
+msgstr "Du må spesifisere både IP adresse eller vertsnavn og et portnummer for å konfigurere Tor til å bruke en proxy for å koble til Internett."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Du må spesifisere en eller flere porter som din brannmur tillater deg å "
-"koble til."
+msgstr "Du må spesifisere en eller flere porter som din brannmur tillater deg å koble til."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2604,8 +2574,7 @@ msgstr "'%1' er ikke ett gyldig portnummer."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Sjekk om ditt lokale nettverk krever en proxy for å koble til Internett"
+msgstr "Sjekk om ditt lokale nettverk krever en proxy for å koble til Internett"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2629,9 +2598,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Velg for kun å koble seg til reléer ved bruk av porter som er åpne i din "
-"brannmur"
+msgstr "Velg for kun å koble seg til reléer ved bruk av porter som er åpne i din brannmur"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2653,9 +2620,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Velg for å kryptere katalogforespørsler og, valgfritt, bruk broer for å "
-"skape en forbindelse til Tor-nettverket."
+msgstr "Velg for å kryptere katalogforespørsler og, valgfritt, bruk broer for å skape en forbindelse til Tor-nettverket."
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2693,9 +2658,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ingen nye broer er for tiden tilgjengelige. Du kan enten vente og prøve "
-"igjen, eller prøve en annen metode for å finne nye broer."
+msgstr "Ingen nye broer er for tiden tilgjengelige. Du kan enten vente og prøve igjen, eller prøve en annen metode for å finne nye broer."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2722,13 +2685,13 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aksepter"
@@ -2885,17 +2848,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Du har satt opp Tor til å være et bro-relé for sensurerte brukere, men din "
-"versjon av Tor støtter ikke broer."
+msgstr "Du har satt opp Tor til å være et bro-relé for sensurerte brukere, men din versjon av Tor støtter ikke broer."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Vennligst oppgrader din Tor programvare eller sett opp Tor som et vanlig "
-"relé."
+msgstr "Vennligst oppgrader din Tor programvare eller sett opp Tor som et vanlig relé."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2910,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "Kjør kun som klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Videresend trafikk for Tor-nettverket (Relé)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Reléport:"
 
@@ -2965,9 +2920,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Vennligst oppgi din opplastningshastighet her hvis du har rask "
-"nedlastningshastighet med treg opplastningshastighet."
+msgstr "Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3025,9 +2978,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Din ratio på maksimal hastighet må være større eller like stor som din "
-"gjennomsnittlige hastighet. Begge verdiene må være minst 20 KB/s."
+msgstr "Din ratio på maksimal hastighet må være større eller like stor som din gjennomsnittlige hastighet. Begge verdiene må være minst 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3088,17 +3039,13 @@ msgstr "Vis hjelpeteksten for tillatte utgående forbindelser"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Hvilke ressurser skal brukere av ditt relé kunne få tilgang til på "
-"internett?"
+msgstr "Hvilke ressurser skal brukere av ditt relé kunne få tilgang til på internett?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor vil fortsatt blokkere utgående epost og fildelingsprogrammer med "
-"standardinstillinger for å redusere mengden søppelpost og andre misbruk."
+msgstr "Tor vil fortsatt blokkere utgående epost og fildelingsprogrammer med standardinstillinger for å redusere mengden søppelpost og andre misbruk."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3129,8 +3076,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"La din relé kjørende så klienter har større sjanse til å finne og bruke den."
+msgstr "La din relé kjørende så klienter har større sjanse til å finne og bruke den."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3144,9 +3090,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor returnerte en feilformatert respons når Vidalia sendte forespørsel om "
-"din bros historikk."
+msgstr "Tor returnerte en feilformatert respons når Vidalia sendte forespørsel om din bros historikk."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3154,8 +3098,7 @@ msgstr "Den returnerte responsen var: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"Hjelp sensurerte brukere å nå Tor nettverket (Tor 0.2.0.8-alpha eller nyere)"
+msgstr "Hjelp sensurerte brukere å nå Tor nettverket (Tor 0.2.0.8-alpha eller nyere)"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3170,6 +3113,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Speil relékatalogen"
 
@@ -3177,9 +3128,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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\n"
-"problem med din relé. Du kan også inkludere ditt PGP eller GPG fingeravtrykk."
+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"
@@ -3189,9 +3138,7 @@ 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."
+msgstr "Vennligst konfigurer minst en tjenestekatalog og en virituell port for hver tjeneste du vil lagre. Fjern de andre."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3286,10 +3233,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Klikk \"start Tor\" ved Vidalia kontroll panelet for og starte Tor "
-"programmet på nytt. Hvis Tor avsluttet uventet, Velg \"Avansert\" ovenfor, "
-"for informasjon om eventuelle feil som oppstod. "
+msgstr "Klikk \"start Tor\" ved Vidalia kontroll panelet for og starte Tor programmet på nytt. Hvis Tor avsluttet uventet, Velg \"Avansert\" ovenfor, for informasjon om eventuelle feil som oppstod. "
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3687,17 +3631,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi den kunne "
-"ikke finne '%1'"
+msgstr "Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi den kunne ikke finne '%1'"
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi Tor sin "
-"oppdateringsprosess ble uventet avbrutt."
+msgstr "Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi Tor sin oppdateringsprosess ble uventet avbrutt."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3872,10 +3812,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Det er mulig en annen Vidalia-prosess kjører. Hvis du er sikker på at det ikke kjører andre Vidalia-prosesser, kan du velge å fortsette allikevel.\n"
-"\n"
-"Vil du fortsatt starte Vidalia?"
+msgstr "Det er mulig en annen Vidalia-prosess kjører. Hvis du er sikker på at det ikke kjører andre Vidalia-prosesser, kan du velge å fortsette allikevel.\n\nVil du fortsatt starte Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3908,5 +3845,3 @@ msgstr "%1 timer"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minutter"
-
-
diff --git a/src/vidalia/i18n/po/ne/qt_ne.po b/src/vidalia/i18n/po/ne/qt_ne.po
index 5e57801..44ab9a6 100644
--- a/src/vidalia/i18n/po/ne/qt_ne.po
+++ b/src/vidalia/i18n/po/ne/qt_ne.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ne/vidalia_ne.po b/src/vidalia/i18n/po/ne/vidalia_ne.po
index 1336ea5..899d9d7 100644
--- a/src/vidalia/i18n/po/ne/vidalia_ne.po
+++ b/src/vidalia/i18n/po/ne/vidalia_ne.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/nl/qt_nl.po b/src/vidalia/i18n/po/nl/qt_nl.po
index e26a896..2fbd4e3 100644
--- a/src/vidalia/i18n/po/nl/qt_nl.po
+++ b/src/vidalia/i18n/po/nl/qt_nl.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 # Shondoit Walker <shondoit+transifex@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-10-12 20:28+0000\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
 "Last-Translator: Shondoit Walker <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 bestaat al.\n"
-"Wilt u het vervangen?"
+msgstr "%1 bestaat al.\nWilt u het vervangen?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Bestand niet gevonden.\n"
-"Controleer of de bestandsnaam correct is."
+msgstr "%1\nBestand niet gevonden.\nControleer of de bestandsnaam correct is."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Map niet gevonden.\n"
-"Gelieve te controleren of de juiste mapnaam werd gegeven."
+msgstr "%1\nMap niet gevonden.\nGelieve te controleren of de juiste mapnaam werd gegeven."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' is beschermd tegen overschrijven.\n"
-"Wilt u het toch verwijderen?"
+msgstr "'%1' is beschermd tegen overschrijven.\nWilt u het toch verwijderen?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>De naam \"%1\" kan niet worden gebruikt.</b><p>Probeer een andere naam te"
-" gebruiken met minder letters of zonder punten of komma's."
+msgstr "<b>De naam \"%1\" kan niet worden gebruikt.</b><p>Probeer een andere naam te gebruiken met minder letters of zonder punten of komma's."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/nl/vidalia_nl.po b/src/vidalia/i18n/po/nl/vidalia_nl.po
index b5488f1..221a484 100644
--- a/src/vidalia/i18n/po/nl/vidalia_nl.po
+++ b/src/vidalia/i18n/po/nl/vidalia_nl.po
@@ -4,15 +4,15 @@
 #   <flabber@xxxxxxxxx>, 2011.
 #   <louisboy@xxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
-# Shondoit Walker <shondoit+transifex@xxxxxxxxx>, 2011.
+# Shondoit Walker <shondoit+transifex@xxxxxxxxx>, 2011, 2012.
 #   <zero.point.transifex@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-09 13:28+0000\n"
-"Last-Translator: Zero.Point <zero.point.transifex@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-30 21:13+0000\n"
+"Last-Translator: Shondoit Walker <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,8 +48,7 @@ msgstr "'%1' is geen geldig IP adres."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"U heeft voor wachtwoordauthenticatie gekozen maar geen wachtwoord opgegeven."
+msgstr "U heeft voor wachtwoordauthenticatie gekozen maar geen wachtwoord opgegeven."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -105,7 +104,7 @@ msgstr "Cookie"
 
 msgctxt "AdvancedPage"
 msgid "Password"
-msgstr "wachtwoord"
+msgstr "Wachtwoord"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
@@ -145,7 +144,7 @@ msgstr "Selecteer de map om de gegevens van Tor op te slaan"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr "Tor Control"
+msgstr "Tor-beheer"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
@@ -175,17 +174,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Het opgegeven Tor configuratie locatie bestand bevat tekens die niet kunnen "
-"worden weergegeven in uw huidige systeem 8-bits tekenset codering."
+msgstr "Het opgegeven Tor configuratie locatie bestand bevat tekens die niet kunnen worden weergegeven in uw huidige systeem 8-bits tekenset codering."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"De opgegeven data Tor directory bevat tekens die niet kunnen worden "
-"weergegeven in uw huidige systeem 8-bits tekenset codering."
+msgstr "De opgegeven data Tor directory bevat tekens die niet kunnen worden weergegeven in uw huidige systeem 8-bits tekenset codering."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -209,13 +204,17 @@ msgstr "Configureer ControlPort automatisch"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Je hebt de autoconfiguratie optie aangevinkt voor de ControlPort, maar hebt geen data folder opgegeven. Voeg er één toe of vink \"Configureer ControlPort automatisch\" uit."
+
+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"
-"\n"
-"De service moet misschien handmatig verwijderd worden."
+msgstr "Vidalia kon de Tor service niet verwijderen.\n\nDe service moet misschien handmatig verwijderd worden."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -237,6 +236,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kon de gekozen taal niet laden."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "Systeem-icoon instellingen (aanpassingen zijn effectief wanneer je Vidalia herstart)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Geef het systeemvak- en het dock-icoon weer (standaard)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Verberg het systeemvak-icoon"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Verberg het dock-icoon"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Sinds:"
@@ -347,7 +363,7 @@ msgstr "Nieuw"
 
 msgctxt "Circuit"
 msgid "Open"
-msgstr "Openen"
+msgstr "Open"
 
 msgctxt "Circuit"
 msgid "Building"
@@ -383,11 +399,11 @@ msgstr "Zoom in op circuit"
 
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
-msgstr "Circuit sluiten (Del)"
+msgstr "Sluit circuit (Del)"
 
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
-msgstr "Stream sluiten (Del)"
+msgstr "Sluit stream (Del)"
 
 msgctxt "ConfigDialog"
 msgid "General"
@@ -403,7 +419,7 @@ msgstr "Delen"
 
 msgctxt "ConfigDialog"
 msgid "Services"
-msgstr "Diensten"
+msgstr "Services"
 
 msgctxt "ConfigDialog"
 msgid "Appearance"
@@ -457,9 +473,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia probeert een verbinding op te zetten met een gestart Tor proces dat "
-"een wachtwoord nodig heeft. Gelieve het wachtwoord op te geven: "
+msgstr "Vidalia probeert een verbinding op te zetten met een gestart Tor proces dat een wachtwoord nodig heeft. Gelieve het wachtwoord op te geven: "
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -471,9 +485,7 @@ msgstr "Fout bij het verzenden van het beheer commando. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Socket verbrak de verbinding bij poging tot het lezen van een regel met "
-"data."
+msgstr "Socket verbrak de verbinding bij poging tot het lezen van een regel met data."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
@@ -1299,9 +1311,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"We waren niet in staat om Vidalia automatisch te herstarten. Start Vidalia "
-"a.u.b. handmatig op."
+msgstr "We waren niet in staat om Vidalia automatisch te herstarten. Start Vidalia a.u.b. handmatig op."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1311,27 +1321,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Er is een crash report gegenereerd dat u naar de Vidalia ontwikkelaars kunt "
-"verzenden om hen te helpen het probleem te identificeren en op te lossen. "
-"Het ingediende report bevat geen persoonlijk gegevens."
+msgstr "Er is een crash report gegenereerd dat u naar de Vidalia ontwikkelaars kunt verzenden om hen te helpen het probleem te identificeren en op te lossen. Het ingediende report bevat geen persoonlijk gegevens."
 
 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 ""
-"met een beschrijving van waarmee u bezig was, samen met de volgende "
-"bestanden aan het crash report gerelateerd zijn:"
+msgstr "met een beschrijving van waarmee u bezig was, samen met de volgende bestanden aan het crash report gerelateerd zijn:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1347,7 +1350,7 @@ msgstr "Proxy-toepassing selecteren"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
-msgstr "Er moet een naam gekozen worden voor uw Tor-toepassing"
+msgstr "Je moet de naam opgeven van je Tor-executable"
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
@@ -1359,7 +1362,7 @@ msgstr "Bladeren"
 
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
-msgstr "De Tor toepassing starten als Vidalia start"
+msgstr "Start de Tor-applicatie wanneer Vidalia start"
 
 msgctxt "GeneralPage"
 msgid "Tor"
@@ -1371,7 +1374,7 @@ msgstr "Proxy toepassing (optioneel)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr "De proxy toepassing starten als Tor start"
+msgstr "Start een proxy-applicatie wanneer Tor start"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
@@ -1487,7 +1490,7 @@ msgstr "(Ctrl+F)"
 
 msgctxt "HelpBrowser"
 msgid "Close"
-msgstr "Sluiten"
+msgstr "Sluit"
 
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
@@ -1550,10 +1553,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia kan de geselecteerde link openen in uw standaard browser. Als uw "
-"browser niet ingesteld is om via Tor te werken, dan zal de vraag niet "
-"anoniem zijn."
+msgstr "Vidalia kan de geselecteerde link openen in uw standaard browser. Als uw browser niet ingesteld is om via Tor te werken, dan zal de vraag niet anoniem zijn."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1567,9 +1567,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kon de geselecteerde link niet in uw browser openen. U kunt de URL "
-"wel kopiëren en daarna plakken in uw browseradresbalk."
+msgstr "Vidalia kon de geselecteerde link niet in uw browser openen. U kunt de URL wel kopiëren en daarna plakken in uw browseradresbalk."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1641,15 +1639,15 @@ msgstr "Tor starten"
 
 msgctxt "MainWindow"
 msgid "Exit"
-msgstr "Sluiten"
+msgstr "Sluit af"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr "Bandbreedte Grafiek"
+msgstr "Bandbreedtegrafiek"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr "Berichten Logboek"
+msgstr "Berichtenlogboek"
 
 msgctxt "MainWindow"
 msgid "Network Map"
@@ -1673,7 +1671,7 @@ msgstr "Help"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr "Nieuwe Identiteit"
+msgstr "Nieuwe identiteit"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
@@ -1741,7 +1739,7 @@ msgstr "Vidalia kon de geconfigureerde proxy server niet starten"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr "Verbinden met een verbindingslijst"
+msgstr "Verbinden met een relay directory"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
@@ -1769,7 +1767,7 @@ msgstr "Laden van verbindingsinformatie"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr "Verbinden met het Tor netwerk"
+msgstr "Verbinden met het Tor-netwerk"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
@@ -1777,11 +1775,7 @@ msgstr "Maken van een Tor circuit"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
-msgstr "Verbonden met het Tor netwerk!"
-
-msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Onbekende opstartstatus"
+msgstr "Verbonden met het Tor-netwerk!"
 
 msgctxt "MainWindow"
 msgid "miscellaneous"
@@ -1829,11 +1823,11 @@ msgstr "Tor is bezig met afsluiten."
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr "Tor nu stoppen"
+msgstr "Stop Tor nu"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr "Tor stoppen"
+msgstr "Stop Tor"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
@@ -1851,9 +1845,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia was niet in staat om Tor te starten. Raadpleeg uw instellingen om te"
-" zien of de naam en locatie van uw Tor executable juist is ingesteld."
+msgstr "Vidalia was niet in staat om Tor te starten. Raadpleeg uw instellingen om te zien of de naam en locatie van uw Tor executable juist is ingesteld."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1865,7 +1857,7 @@ msgstr "Verbindingsfout"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr "Doorsturen is ingeschakeld"
+msgstr "Relaying is ingeschakeld"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
@@ -1891,9 +1883,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"De Tor software verlangt van Vidalia om een authenticatiecookie te sturen "
-"maar Vidalia heeft er geen gevonden."
+msgstr "De Tor software verlangt van Vidalia om een authenticatiecookie te sturen maar Vidalia heeft er geen gevonden."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1915,9 +1905,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia kon bepaalde gebeurtenissen niet registreren. Hierdoor zijn "
-"verschillende functies van Vidalia niet beschikbaar."
+msgstr "Vidalia kon bepaalde gebeurtenissen niet registreren. Hierdoor zijn verschillende functies van Vidalia niet beschikbaar."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1939,9 +1927,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"De huidige geïnstalleerde versie van Tor is verlopen en niet langer "
-"aangeraden. Bezoek de Tor website om de nieuwste versie te laden."
+msgstr "De huidige geïnstalleerde versie van Tor is verlopen en niet langer aangeraden. Bezoek de Tor website om de nieuwste versie te laden."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1951,13 +1937,11 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Alle eerstvolgende verbindingen zullen anders lijken dan uw oude "
-"verbindingen."
+msgstr "Alle eerstvolgende verbindingen zullen anders lijken dan uw oude verbindingen."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
-msgstr "Creëren van Nieuwe Identiteit Mislukt"
+msgstr "Creëren van nieuwe identiteit mislukt"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
@@ -1989,15 +1973,15 @@ msgstr "Begin een relay en help het netwerk groeien"
 
 msgctxt "MainWindow"
 msgid "View the Network"
-msgstr "Bekijk het Netwerk"
+msgstr "Bekijk het netwerk"
 
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
-msgstr "Bekijk een kaart van het Tor netwerk"
+msgstr "Bekijk een kaart van het Tor-netwerk"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr "Gebruik een Nieuwe Identiteit"
+msgstr "Gebruik een nieuwe identiteit"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
@@ -2025,7 +2009,7 @@ msgstr "Bekijk versie en licentie informatie"
 
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
-msgstr "Vidalia afsluiten"
+msgstr "Sluit Vidalia af"
 
 msgctxt "MainWindow"
 msgid "Show this window on startup"
@@ -2048,26 +2032,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia probeerde Tor's controle wachtwoord te resetten, maar was niet niet "
-"in staat om de Tor software te herstarten. Controleert u alstublieft uw "
-"Taakbeheerder om er zeker van te zijn dat er geen andere Tor processen "
-"draaien."
+msgstr "Vidalia probeerde Tor's controle wachtwoord te resetten, maar was niet niet in staat om de Tor software te herstarten. Controleert u alstublieft uw Taakbeheerder om er zeker van te zijn dat er geen andere Tor processen draaien."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"De huidige geïnstalleerde versie van Tor is gedateerd of wordt niet meer "
-"aangeraden."
+msgstr "De huidige geïnstalleerde versie van Tor is gedateerd of wordt niet meer aangeraden."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Wilt u controleren of er een nieuwere versie beschikbaar is om te "
-"installeren?"
+msgstr "Wilt u controleren of er een nieuwere versie beschikbaar is om te installeren?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2077,9 +2053,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor heeft uw verbinding automatisch verbroken om uw anonimiteit te "
-"beschermen."
+msgstr "Tor heeft uw verbinding automatisch verbroken om uw anonimiteit te beschermen."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2093,9 +2067,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Er zijn op dit moment geen nieuwe Tor software pakketten beschikbaar voor uw"
-" computer."
+msgstr "Er zijn op dit moment geen nieuwe Tor software pakketten beschikbaar voor uw computer."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2114,10 +2086,25 @@ 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."
-msgstr ""
-"Alles wat worden verzonden via deze verbinding zou kunnen worden "
-"afgeluisterd. Controleer uw applicatie configuratie en gebruik, indien "
-"mogelijk, alleen gecodeerde protocollen zoals SSL."
+msgstr "Alles wat worden verzonden via deze verbinding zou kunnen worden afgeluisterd. Controleer uw applicatie configuratie en gebruik, indien mogelijk, alleen gecodeerde protocollen zoals SSL."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Opstarten van torrc van %1 tot %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(waarschijnlijk Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(waarschijnlijk een e-mail client)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Een van uw applicaties %1 lijkt een potentieel onveilige en niet-versleutelde verbinding met poort %2 te maken."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2127,49 +2114,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Uw relay is aan het afsluiten.\n"
-"Klik opnieuw op 'Stop' om uw relay nu te stoppen."
+msgstr "Uw relay is aan het afsluiten.\nKlik opnieuw op 'Stop' om uw relay nu te stoppen."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Opstarten van torrc van %1 tot %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia weet niet hoe met Tor te communiceren omdat hij het volgende bestand niet kan openen: %1\n\nHier is het laatste foutbericht: %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 "Het lijkt er op dat Tor gestopt is sinds Vidalia het gestart heeft.\n\nZie de geavanceerde berichten log voor meer informatie."
 
 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?"
-msgstr ""
-"U draait momenteel een relay. Het beëindigen hiervan zal clientverbindingen met een open verbinding direct afbreken.\n"
-"\n"
-"Wilt u uw relay normaal beëindigen en cliënten de tijd geven om een nieuwe relay te zoeken?"
+msgstr "U draait momenteel een relay. Het beëindigen hiervan zal clientverbindingen met een open verbinding direct afbreken.\n\nWilt u uw relay normaal beëindigen en cliënten de tijd geven om een nieuwe relay te zoeken?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia heeft vastgesteld dat de Tor software onverwacht is afgesloten.\n"
-"\n"
-"Controleert u alstublieft het berichtenlog voor recente waarschuwingen of foutmeldingen."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(waarschijnlijk Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(waarschijnlijk een e-mail client)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Een van uw applicaties %1 lijkt een potentieel onveilige en niet-"
-"versleutelde verbinding met poort %2 te maken."
+msgstr "Vidalia heeft vastgesteld dat de Tor software onverwacht is afgesloten.\n\nControleert u alstublieft het berichtenlog voor recente waarschuwingen of foutmeldingen."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2177,16 +2151,15 @@ msgstr "Fout bij Filter Instellen"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
-"Vidalia was niet in staat zich aan te melden bij Tor's voor log meldingen."
+msgstr "Vidalia was niet in staat zich aan te melden bij Tor's voor log meldingen."
 
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
-msgstr "Fout bij Openen Logboek Bestand"
+msgstr "Fout bij openen logboekbestand"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia was niet in staat het opgegeven logboek bestand te openen."
+msgstr "Vidalia was niet in staat het opgegeven logboekbestand te openen."
 
 msgctxt "MessageLog"
 msgid "Log Filename Required"
@@ -2194,17 +2167,15 @@ msgstr "Log Bestandsnaam Vereist"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"U dient een bestandsnaam op te geven om logberichten op te kunnen slaan in "
-"een bestand."
+msgstr "U dient een bestandsnaam op te geven om logberichten op te kunnen slaan in een bestand."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
-msgstr "Selecteer Logboek Bestand"
+msgstr "Selecteer logboekbestand"
 
 msgctxt "MessageLog"
 msgid "Save Log Messages"
-msgstr "Logboek Berichten Opslaan"
+msgstr "Logboekberichten opslaan"
 
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
@@ -2216,7 +2187,7 @@ msgstr "Vidalia"
 
 msgctxt "MessageLog"
 msgid "Find in Message Log"
-msgstr "Vind in Berichten Logboek"
+msgstr "Vind in berichtenlogboek"
 
 msgctxt "MessageLog"
 msgid "Find:"
@@ -2232,7 +2203,7 @@ msgstr "De zoekopdracht heeft niets opgeleverd."
 
 msgctxt "MessageLog"
 msgid "Message Log"
-msgstr "Berichten Logboek"
+msgstr "Berichtenlogboek"
 
 msgctxt "MessageLog"
 msgid "Message Filters..."
@@ -2256,7 +2227,7 @@ msgstr "Wissen"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Wis alle berichten van het Berichten Logboek (Ctrl+E)"
+msgstr "Wis alle berichten van het berichtenlogboek (Ctrl+E)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
@@ -2308,7 +2279,7 @@ msgstr "Instellingen"
 
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
-msgstr "Verander Berichten Logboek Instellingen"
+msgstr "Pas berichtenlogboek instellingen aan"
 
 msgctxt "MessageLog"
 msgid "Ctrl+T"
@@ -2328,11 +2299,11 @@ msgstr "F1"
 
 msgctxt "MessageLog"
 msgid "Close"
-msgstr "Sluiten"
+msgstr "Sluit"
 
 msgctxt "MessageLog"
 msgid "Close the Message Log"
-msgstr "Sluit het Berichten Logboek"
+msgstr "Sluit het berichtenlogboek"
 
 msgctxt "MessageLog"
 msgid "Esc"
@@ -2364,7 +2335,7 @@ msgstr "Bericht"
 
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
-msgstr "Slaat de huidige Berichten Logboek instellingen op"
+msgstr "Slaat de huidige berichtenlogboek instellingen op"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
@@ -2446,17 +2417,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Bericht dat verschijnt wanneer iets\n"
-"helemaal is fout gegaan en daardoor Tor niet meer kan doorgaan. "
+msgstr "Bericht dat verschijnt wanneer iets\nhelemaal is fout gegaan en daardoor Tor niet meer kan doorgaan. "
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Berichten die alleen verschijnen wanneer \n"
-"iets is fout gegaan met Tor."
+msgstr "Berichten die alleen verschijnen wanneer \niets is fout gegaan met Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2464,38 +2431,30 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Berichten die onregelmatig verschijnen tijdens normaal Tor-gebruik en worden"
-" niet beschouwd als fouten, maar die wel interessant voor u kunnen zijn. "
+msgstr "Berichten die onregelmatig verschijnen tijdens normaal Tor-gebruik en worden niet beschouwd als fouten, maar die wel interessant voor u kunnen zijn. "
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Berichten die regelmatig verschijnen \n"
-"tijdens normaal Tor-gebruik."
+msgstr "Berichten die regelmatig verschijnen \ntijdens normaal Tor-gebruik."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Hyper-uitgebreide berichten, met name van belang voor Tor ontwikkelaars."
+msgstr "Hyper-uitgebreide berichten, met name van belang voor Tor ontwikkelaars."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Kan niet schrijven naar het bestand %1\n"
-"\n"
-"%2."
+msgstr "Kan niet schrijven naar het bestand %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
-msgstr "Tor Netwerk Kaart"
+msgstr "Tor-netwerkkaart"
 
 msgctxt "NetViewer"
 msgid "Refresh"
@@ -2527,7 +2486,7 @@ msgstr "F1"
 
 msgctxt "NetViewer"
 msgid "Close"
-msgstr "Sluiten"
+msgstr "Sluit"
 
 msgctxt "NetViewer"
 msgid "Close the network map"
@@ -2598,14 +2557,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ongeldige Bridge"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "De opgegeven bridge identificatie is niet geldig."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopieër (Ctrl+C)"
 
@@ -2613,18 +2564,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"U moet zowel over een IP-adres of hostnaam en een poortnummer beschikken "
-"voor het configureren van Tor om een â??â??proxy te gebruiken voor toegang tot "
-"internet."
+msgstr "U moet zowel over een IP-adres of hostnaam en een poortnummer beschikken voor het configureren van Tor om een â??â??proxy te gebruiken voor toegang tot internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"U moet over één of meer poorten beschikken waarop uw firewall u in staat "
-"stelt verbinding te maken."
+msgstr "U moet over één of meer poorten beschikken waarop uw firewall u in staat stelt verbinding te maken."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2632,9 +2578,7 @@ msgstr "'%1' is geen geldige poort nummer "
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Controleer of uw lokale netwerk een proxyserver vereist voor toegang tot het"
-" internet"
+msgstr "Controleer of uw lokale netwerk een proxyserver vereist voor toegang tot het internet"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2658,14 +2602,11 @@ msgstr "Poort:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Vink aan om alleen verbinding te maken met relays die poorten gebruiken die "
-"door uw firewall zijn toegestaan."
+msgstr "Vink aan om alleen verbinding te maken met relays die poorten gebruiken die door uw firewall zijn toegestaan."
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr ""
-"Mijn firewall staat me alleen toe verbinding te maken met bepaalde poorten"
+msgstr "Mijn firewall staat me alleen toe verbinding te maken met bepaalde poorten"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
@@ -2683,13 +2624,11 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Vink aan om directory verzoeken te versleutelen, en optioneel, gebruik maken"
-" van brigde relays om toegang te krijgen tot het Tor netwerk"
+msgstr "Vink aan om directory verzoeken te versleutelen, en optioneel, gebruik maken van brigde relays om toegang te krijgen tot het Tor-netwerk"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
-msgstr "Mijn ISP blokkeert verbindingen met het Tor netwerk"
+msgstr "Mijn ISP blokkeert verbindingen met het Tor-netwerk"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
@@ -2723,15 +2662,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Er zijn geen nieuwe bridges beschikbaar op dit moment. U  kunt een tijdje "
-"wachten of het opnieuw proberen, of probeer een andere methode voor het "
-"vinden van nieuwe bridges."
+msgstr "Er zijn geen nieuwe bridges beschikbaar op dit moment. U  kunt een tijdje wachten of het opnieuw proberen, of probeer een andere methode voor het vinden van nieuwe bridges."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Klik op Help om andere methoden voor het vinden van nieuwe bridges te zien."
+msgstr "Klik op Help om andere methoden voor het vinden van nieuwe bridges te zien."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2754,13 +2689,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Je moet één of meer bridges opgeven."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "toestaan"
@@ -2917,17 +2852,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"U heeft Tor geconfigureerd als een bridge relay voor gecensureerde "
-"gebruikers, maar uw versie van Tor ondersteunt geen bridges."
+msgstr "U heeft Tor geconfigureerd als een bridge relay voor gecensureerde gebruikers, maar uw versie van Tor ondersteunt geen bridges."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Upgrade uw Tor software of stel Tor in om als een normale Tor relay  te "
-"laten fungeren."
+msgstr "Upgrade uw Tor software of stel Tor in om als een normale Tor relay  te laten fungeren."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2939,11 +2870,7 @@ msgstr "U moet in ieder geval een relay nickname en een poort opgeven."
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
-msgstr "Alleen als client uitvoeren"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Verwerk het verkeer van het Tor netwerk"
+msgstr "Gebruik alleen als client"
 
 msgctxt "ServerPage"
 msgid "Relay Port:"
@@ -2967,11 +2894,11 @@ msgstr "Toon Help-onderwerp voor poort forwarding"
 
 msgctxt "ServerPage"
 msgid "Directory Port:"
-msgstr "Directory Poort:"
+msgstr "Directory poort:"
 
 msgctxt "ServerPage"
 msgid "Directory Port Number"
-msgstr "Directory Poort Nummer"
+msgstr "Directory poort nummer"
 
 msgctxt "ServerPage"
 msgid "Contact Info:"
@@ -2983,8 +2910,7 @@ msgstr "Naam van uw relay"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Poort waarop gebruikers en andere relays kunnen communiceren met uw relay"
+msgstr "Poort waarop gebruikers en andere relays kunnen communiceren met uw relay"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2998,9 +2924,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Voor internetverbindingen met een snelle download, maar langzame upload "
-"snelheid, stel hier alstublieft de upload snelheid in."
+msgstr "Voor internetverbindingen met een snelle download, maar langzame upload snelheid, stel hier alstublieft de upload snelheid in."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3058,9 +2982,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Uw maximale bandbreedte dient groter of gelijk te zijn aan uw gemiddelde "
-"bandbreedte. Beide waarden dienen tenminste 20 KB/s te zijn."
+msgstr "Uw maximale bandbreedte dient groter of gelijk te zijn aan uw gemiddelde bandbreedte. Beide waarden dienen tenminste 20 KB/s te zijn."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3088,13 +3010,11 @@ msgstr "Poorten die niet zijn aangegeven bij andere aanvinkvakjes"
 
 msgctxt "ServerPage"
 msgid "Misc Other Services"
-msgstr "Overige Andere Diensten"
+msgstr "Overige services"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"Poorten 706, 1863, 5050, 5190, 5222, 8300 en 8888 {706, 1863, 5050, 5190, "
-"5222, 5223, 8300 ?}"
+msgstr "Poorten 706, 1863, 5050, 5190, 5222, 8300 en 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3123,17 +3043,13 @@ msgstr "Laat het helponderwerp zien over uitgaand beleid"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Welke Internet-bronnen moeten gebruikers in staat zijn te gebruiken vanuit u"
-" relay?"
+msgstr "Welke Internet-bronnen moeten gebruikers in staat zijn te gebruiken vanuit u relay?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor zal sommige uitgaande e-mail en toepassingen voor bestandsdeling nog "
-"steeds blokkeren om spam en ander misbruik te verminderen."
+msgstr "Tor zal sommige uitgaande e-mail en toepassingen voor bestandsdeling nog steeds blokkeren om spam en ander misbruik te verminderen."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3146,8 +3062,7 @@ msgstr "Verleen anderen toegang tot uw bridge door hen deze lijn te geven:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Dit is de identiteit van uw bridge relay die u aan andere mensen kunt geven"
+msgstr "Dit is de identiteit van uw bridge relay die u aan andere mensen kunt geven"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3159,16 +3074,13 @@ msgstr "Geen recente Gebruik"
 
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
-msgstr ""
-"Er zijn geen cliënten die onlangs gebruik gemaakt hebben van uw relay ."
+msgstr "Er zijn geen cliënten die onlangs gebruik gemaakt hebben van uw relay ."
 
 msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Laat uw relay aan staan zodat cliënten dan een betere kans hebben op het "
-"vinden en het gebruiken van uw relay."
+msgstr "Laat uw relay aan staan zodat cliënten dan een betere kans hebben op het vinden en het gebruiken van uw relay."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3176,16 +3088,13 @@ msgstr "Berichten Log Geschiedenis"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
-"Vidalia was niet in staat zich aan te melden voor Tor's log meldingen."
+msgstr "Vidalia was niet in staat zich aan te melden voor Tor's log meldingen."
 
 msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor ontving een onjuiste geformatteerd reactie toen Vidalia uw bridge's "
-"gebruiksgeschiedenis opvroeg. "
+msgstr "Tor ontving een onjuiste geformatteerd reactie toen Vidalia uw bridge's gebruiksgeschiedenis opvroeg. "
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3193,7 +3102,7 @@ msgstr "De ontvangen reactie was: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr "Help gecensureerde gebruikers het Tor netwerk te bereiken"
+msgstr "Help gecensureerde gebruikers het Tor-netwerk te bereiken"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3208,28 +3117,32 @@ msgid "Automatically distribute my bridge address"
 msgstr "Verdeel automatisch mijn bridge adres"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Herleid verkeer voor het Tor netwerk (exit relay)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Herleid verkeer binnen het Tor-netwerk (non-exit relay)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
-msgstr "Spiegel van de Relay Directory"
+msgstr "Spiegel van de relay directory"
 
 msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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. U kunt ook uw PGP of GPG fingerprint toevoegen."
+msgstr "E-mailadres waarop u kan worden bereikt als er een probleem is met uw server. U kunt ook uw PGP of GPG fingerprint toevoegen."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
-msgstr "Fout bij het weghalen van alle diensten"
+msgstr "Fout bij het weghalen van alle 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 dienst directory en één virtuele poort voor elke "
-"dienst die u wilt opslaan. Verwijder alle andere."
+msgstr "Configureer tenminste één service map en één virtuele poort voor elke service die u wilt opslaan. Verwijder alle andere."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3237,15 +3150,15 @@ msgstr "Fout"
 
 msgctxt "ServicePage"
 msgid "Please select a Service."
-msgstr "Selecteer een dienst."
+msgstr "Selecteer een service."
 
 msgctxt "ServicePage"
 msgid "Select Service Directory"
-msgstr "Selecteer Service Directory"
+msgstr "Selecteer service directory"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtuele Poort mag alleen geldig poortnummers bevatten [1..65535]."
+msgstr "Virtuele poort mag alleen geldige poortnummers bevatten [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
@@ -3253,7 +3166,7 @@ msgstr "Het doel mag alleen adres:poort, adres of poort bevatten"
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
-msgstr "Directory al in gebruik door een andere dienst."
+msgstr "Map al in gebruik door een andere service."
 
 msgctxt "ServicePage"
 msgid "Form"
@@ -3261,15 +3174,15 @@ msgstr "Formulier"
 
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
-msgstr "Bied verborgen diensten aan"
+msgstr "Aangeboden verborgen services"
 
 msgctxt "ServicePage"
 msgid "Onion Address"
-msgstr "Onion Adres"
+msgstr "Onion-adres"
 
 msgctxt "ServicePage"
 msgid "Virtual Port"
-msgstr "Virtuele Poort"
+msgstr "Virtuele poort"
 
 msgctxt "ServicePage"
 msgid "Target"
@@ -3277,7 +3190,7 @@ msgstr "Doel"
 
 msgctxt "ServicePage"
 msgid "Directory Path"
-msgstr "Pad van directory"
+msgstr "Pad van map"
 
 msgctxt "ServicePage"
 msgid "Enabled"
@@ -3285,25 +3198,23 @@ msgstr "Ingeschakeld"
 
 msgctxt "ServicePage"
 msgid "Add new service to list"
-msgstr "Voeg een nieuwe dienst aan de lijst toe"
+msgstr "Voeg een nieuwe service aan de lijst toe"
 
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
-msgstr "Verwijder de geselecteerde diensten uit de lijst"
+msgstr "Verwijder de geselecteerde services uit de lijst"
 
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopieer onion adres van de geselecteerde dienst naar het klemboard"
+msgstr "Kopieer onion-adres van de geselecteerde service naar het klembord"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Blader in het lokale bestandssysteem en kies een directory voor de gekozen "
-"dienst"
+msgstr "Blader in het lokale bestandssysteem en kies een map voor de gekozen service"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
-msgstr "Gemaakt door Tor"
+msgstr "Aangemaakt door Tor"
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
@@ -3326,10 +3237,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Klik op \"Start Tor\" in het Vidalia Configuratiescherm om de Tor software "
-"opnieuw te starten. Als Tor onverwacht getstopt is, selecteer dan hierboven "
-"het tabblad \"Geavanceerd\" voor meer informatie over de opgetreden fouten."
+msgstr "Klik op \"Start Tor\" in het Vidalia Configuratiescherm om de Tor software opnieuw te starten. Als Tor onverwacht getstopt is, selecteer dan hierboven het tabblad \"Geavanceerd\" voor meer informatie over de opgetreden fouten."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3337,9 +3245,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"U gebruikt momenteel versie \"%1\" van de Tor software, deze versie wordt niet meer aangeraden. Upgrade alstublieft naar de meest recente versie van de software die belangrijke beveiliging, betrouwbaarheids- en prestatie-updates kunnen bevatten.\n"
-" "
+msgstr "U gebruikt momenteel versie \"%1\" van de Tor software, deze versie wordt niet meer aangeraden. Upgrade alstublieft naar de meest recente versie van de software die belangrijke beveiliging, betrouwbaarheids- en prestatie-updates kunnen bevatten.\n "
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3347,11 +3253,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"U gebruikt momenteel versie \"%1\" van de Tor software, die mogelijk niet "
-"meer werkt met het huidige Tor netwerk. Upgrade alstublieft naar de meest "
-"recente versie van de software die belangrijke beveiliging, "
-"betrouwbaarheids- en prestatie-updates kunnen bevatten."
+msgstr "U gebruikt momenteel versie \"%1\" van de Tor software, die mogelijk niet meer werkt met het huidige Tor-netwerk. Upgrade alstublieft naar de meest recente versie van de software die belangrijke beveiliging, betrouwbaarheids- en prestatie-updates kunnen bevatten."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3359,15 +3261,13 @@ msgstr "Uw Tor Software is niet meer up-to-date."
 
 msgctxt "StatusEventWidget"
 msgid "Connected to the Tor Network"
-msgstr "Verbonden met het Tor netwerk"
+msgstr "Verbonden met het Tor-netwerk"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"We hebben succesvol verbinding met het Tor-netwerk gemaakt. U kunt nu uw "
-"toepassingen configureren om anoniem het internet te gebruiken."
+msgstr "We hebben succesvol verbinding met het Tor-netwerk gemaakt. U kunt nu uw toepassingen configureren om anoniem het internet te gebruiken."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3377,9 +3277,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"De Tor software heeft een interne bug opgespoord. Meld a.u.b. de volgende "
-"fout aan de Tor ontwikkelaars op bugs.torproject.org:\"%1\""
+msgstr "De Tor software heeft een interne bug opgespoord. Meld a.u.b. de volgende fout aan de Tor ontwikkelaars op bugs.torproject.org:\"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3387,11 +3285,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor heeft opgemerkt dat de klok van uw computer is ingesteld op %1 seconden "
-"in het verleden in vergelijking tot de bron \"%2\". Als uw klok onjuist is, "
-"zal Tor niet kunnen functioneren. Stel a.u.b. uw computer in zodat deze "
-"altijd de juiste tijd weergeeft."
+msgstr "Tor heeft opgemerkt dat de klok van uw computer is ingesteld op %1 seconden in het verleden in vergelijking tot de bron \"%2\". Als uw klok onjuist is, zal Tor niet kunnen functioneren. Stel a.u.b. uw computer in zodat deze altijd de juiste tijd weergeeft."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3399,11 +3293,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor heeft opgemerkt dat de klok van uw computer is ingesteld op %1 seconden "
-"in de toekomst in vergelijking tot de bron \"%2\". Als uw klok onjuist is, "
-"zal Tor niet kunnen functioneren. Stel a.u.b. uw computer in zodat deze "
-"altijd de juiste tijd weergeeft."
+msgstr "Tor heeft opgemerkt dat de klok van uw computer is ingesteld op %1 seconden in de toekomst in vergelijking tot de bron \"%2\". Als uw klok onjuist is, zal Tor niet kunnen functioneren. Stel a.u.b. uw computer in zodat deze altijd de juiste tijd weergeeft."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3415,21 +3305,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Een van uw applicaties op uw computer heeft geprobeerd om een niet-"
-"beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde "
-"informatie over het Tor netwerk is gevaarlijk en word niet aangeraden. Voor "
-"uw veiligheid, heeft Tor automatisch deze verbinding geblokkeerd."
+msgstr "Een van uw applicaties op uw computer heeft geprobeerd om een niet-beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde informatie over het Tor-netwerk is gevaarlijk en word niet aangeraden. Voor uw veiligheid, heeft Tor automatisch deze verbinding geblokkeerd."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Een van uw applicaties op uw computer heeft geprobeerd om een niet-"
-"beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde "
-"informatie over het Tor netwerk is gevaarlijk en word niet aangeraden."
+msgstr "Een van uw applicaties op uw computer heeft geprobeerd om een niet-beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde informatie over het Tor-netwerk is gevaarlijk en word niet aangeraden."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3441,11 +3324,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Een van uw applicaties heeft een verbinding opgezet via Tor naar \"%1\" "
-"gebruik makend van een protocol dat informatie over uw bestemming kan "
-"lekken. Controleer dat uw applicaties zo zijn ingesteld dat ze alleen "
-"SOCKS4a of SOCKS5 met een remote hostname resolution gebruiken."
+msgstr "Een van uw applicaties heeft een verbinding opgezet via Tor naar \"%1\" gebruik makend van een protocol dat informatie over uw bestemming kan lekken. Controleer dat uw applicaties zo zijn ingesteld dat ze alleen SOCKS4a of SOCKS5 met een remote hostname resolution gebruiken."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3456,11 +3335,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Een van uw applicaties heeft geprobeerd om een â??â??verbinding via Tor gebruik "
-"makend met een protocol dat Tor niet begrijpt. Zorg ervoor dat uw "
-"toepassingen ingesteld zijn om alleen SOCKS4a of SOCKS5 te gebruiken met "
-"remote hostnaam resolutie."
+msgstr "Een van uw applicaties heeft geprobeerd om een â??â??verbinding via Tor gebruik makend met een protocol dat Tor niet begrijpt. Zorg ervoor dat uw toepassingen ingesteld zijn om alleen SOCKS4a of SOCKS5 te gebruiken met remote hostnaam resolutie."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3471,10 +3346,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Een van uw applicaties heeft een verbinding opgezet door Tor naar \"%1\", "
-"Tor herkend deze hostname niet als een geldige hostname. Controleer "
-"alstublieft de instellingen van uw applicaties."
+msgstr "Een van uw applicaties heeft een verbinding opgezet door Tor naar \"%1\", Tor herkend deze hostname niet als een geldige hostname. Controleer alstublieft de instellingen van uw applicaties."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3485,10 +3357,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor heeft vastgesteld dat uw relay's openbare IP-adres momenteel %1%2 is. "
-"Als dit niet correct is, raadpleeg alstublieft de instelling 'Adres' in uw "
-"relay's instellingen."
+msgstr "Tor heeft vastgesteld dat uw relay's openbare IP-adres momenteel %1%2 is. Als dit niet correct is, raadpleeg alstublieft de instelling 'Adres' in uw relay's instellingen."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3499,22 +3368,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor heeft gedetecteerd dat uw DNS-provider onjuiste antwoorden geeft over "
-"domeinen die niet bestaan. Sommige ISP's en andere DNS-aanbieders, zoals "
-"OpenDNS, staan â??â??bekend om dit te doen om hun eigen zoekmachines of reclame "
-"weer te geven."
+msgstr "Tor heeft gedetecteerd dat uw DNS-provider onjuiste antwoorden geeft over domeinen die niet bestaan. Sommige ISP's en andere DNS-aanbieders, zoals OpenDNS, staan â??â??bekend om dit te doen om hun eigen zoekmachines of reclame weer te geven."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor heeft gedetecteerd dat uw DNS-provider onjuiste antwoorden geeft over "
-"zeer bekende domeinen. Aangezien de cliënten vertrouwen op Tor netwerk "
-"relays om nauwkeurige DNS reacties, zul uw relay niet worden geconfigureerd "
-"als een exit relay."
+msgstr "Tor heeft gedetecteerd dat uw DNS-provider onjuiste antwoorden geeft over zeer bekende domeinen. Aangezien de cliënten vertrouwen op Tor-netwerk relays om nauwkeurige DNS reacties, zul uw relay niet worden geconfigureerd als een exit relay."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3525,10 +3386,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor probeert vast te stellen of uw relay's server poort te bereiken is via "
-"het Tor netwerk door zichzelf te verbinden naar %1:%2. Deze test kan een "
-"paar minuten in beslag nemen. "
+msgstr "Tor probeert vast te stellen of uw relay's server poort te bereiken is via het Tor-netwerk door zichzelf te verbinden naar %1:%2. Deze test kan een paar minuten in beslag nemen. "
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3536,7 +3394,7 @@ msgstr "Server Poort Bereikbaarheid test geslaagd!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Uw relay server poort is bereikbaar vanaf het Tor netwerk!"
+msgstr "Uw relay server poort is bereikbaar vanaf het Tor-netwerk!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
@@ -3548,25 +3406,18 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Uw relay's server poort is niet bereikbaar voor andere Tor cliënten. Dit kan"
-" gebeuren als u achter een router of een firewall zit die portfowarding "
-"vereist. Als %1:%2 niet uw correcte IP-adres en serverpoort is, controleer "
-"dan alstublieft uw relay's instellingen. "
+msgstr "Uw relay's server poort is niet bereikbaar voor andere Tor cliënten. Dit kan gebeuren als u achter een router of een firewall zit die portfowarding vereist. Als %1:%2 niet uw correcte IP-adres en serverpoort is, controleer dan alstublieft uw relay's instellingen. "
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
-msgstr "Controleert Directory Poort Bereikbaarheid"
+msgstr "Controleren bereikbaarheid directorypoort"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor probeert vast te stellen of uw relay's directory poort beschikbaar is "
-"vanaf het Tor netwerk door zichzelf te verbinden naar %1:%2. Deze test kan "
-"een paar minuten in beslag nemen."
+msgstr "Tor probeert vast te stellen of uw relay's directory poort beschikbaar is vanaf het Tor-netwerk door zichzelf te verbinden naar %1:%2. Deze test kan een paar minuten in beslag nemen."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3574,7 +3425,7 @@ msgstr "Directory Poort Bereikbaarheid test geslaagd!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Uw relay's directory poort is bereikbaar vanaf het Tor netwerk!"
+msgstr "Uw relay's directory poort is bereikbaar vanaf het Tor-netwerk!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
@@ -3586,11 +3437,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Uw relay's directory poort is niet bereikbaar voor andere cliënten. Dit kan "
-"gebeuren als u achter een router of een firewall zit die een poort fowarding"
-" vereist. Als %1:%2 niet uw correcte IP-adres en directory poort is, "
-"controleer alstublieft uw relay's instellingen.  "
+msgstr "Uw relay's directory poort is niet bereikbaar voor andere cliënten. Dit kan gebeuren als u achter een router of een firewall zit die een poort fowarding vereist. Als %1:%2 niet uw correcte IP-adres en directory poort is, controleer alstublieft uw relay's instellingen.  "
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3600,10 +3447,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Uw relay's descriptor, die het mogelijk maakt voor cliënten om verbinding te"
-" maken met uw relay, is verworpen door de directory server op %1/%2. De "
-"reden daarvoor was: %3 "
+msgstr "Uw relay's descriptor, die het mogelijk maakt voor cliënten om verbinding te maken met uw relay, is verworpen door de directory server op %1/%2. De reden daarvoor was: %3 "
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3615,11 +3459,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Uw relay is nu online en beschikbaar voor het gebruik door Tor-clients. U "
-"zou binnen een paar uur een toename van het netwerkverkeer in de bandbreedte"
-" Graph moeten zien als meer en meer gebruikers kennis nemen van uw relay. "
-"Dank u voor het bijdragen aan het Tor netwerk!"
+msgstr "Uw relay is nu online en beschikbaar voor het gebruik door Tor-clients. U zou binnen een paar uur een toename van het netwerkverkeer in de bandbreedte Graph moeten zien als meer en meer gebruikers kennis nemen van uw relay. Dank u voor het bijdragen aan het Tor-netwerk!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3681,9 +3521,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Instellingen opslaan. Indien niet aangevinkt zal alleen instellingen van het"
-" huidige Tor instantie toevoegt worden."
+msgstr "Instellingen opslaan. Indien niet aangevinkt zal alleen instellingen van het huidige Tor instantie toevoegt worden."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3723,8 +3561,7 @@ msgstr "Fout bij verbinding maken 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 \"Voeg alles toe\" aan "
+msgstr "Selectie is leeg. Selecteer een stuk tekst of vink \"Voeg alles toe\" aan "
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3798,17 +3635,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia kon niet controleren op beschikbare software updates omdat het '%1' "
-"niet kon vinden."
+msgstr "Vidalia kon niet controleren op beschikbare software updates omdat het '%1' niet kon vinden."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia was niet in staat om te controleren op beschikbare software-updates,"
-" want Tor's update-proces stopte onverwacht."
+msgstr "Vidalia was niet in staat om te controleren op beschikbare software-updates, want Tor's update-proces stopte onverwacht."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3860,8 +3693,7 @@ msgstr "Installeren"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"De volgende bijgewerkte software pakketten zijn klaar voor installatie:"
+msgstr "De volgende bijgewerkte software pakketten zijn klaar voor installatie:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3909,7 +3741,7 @@ msgstr "Doorgaan"
 
 msgctxt "VMessageBox"
 msgid "Quit"
-msgstr "Afsluiten"
+msgstr "Sluit af"
 
 msgctxt "VMessageBox"
 msgid "Browse"
@@ -3984,9 +3816,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Een ander Vidalia proces is mogelijk reeds actief is. Als er geen andere Vidalia proces actief is, kunt u ervoor kiezen om toch door te gaan. \n"
-"Wilt u doorgaan met het starten van Vidalia?"
+msgstr "Een ander Vidalia proces is mogelijk reeds actief is. Als er geen andere Vidalia proces actief is, kunt u ervoor kiezen om toch door te gaan. \nWilt u doorgaan met het starten van Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4019,5 +3849,3 @@ msgstr "%1 uren"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minuten"
-
-
diff --git a/src/vidalia/i18n/po/nn/qt_nn.po b/src/vidalia/i18n/po/nn/qt_nn.po
index 957291a..b21c8ed 100644
--- a/src/vidalia/i18n/po/nn/qt_nn.po
+++ b/src/vidalia/i18n/po/nn/qt_nn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nn/vidalia_nn.po b/src/vidalia/i18n/po/nn/vidalia_nn.po
index 90ebc20..de56e31 100644
--- a/src/vidalia/i18n/po/nn/vidalia_nn.po
+++ b/src/vidalia/i18n/po/nn/vidalia_nn.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/nso/qt_nso.po b/src/vidalia/i18n/po/nso/qt_nso.po
index 276f29b..5f40997 100644
--- a/src/vidalia/i18n/po/nso/qt_nso.po
+++ b/src/vidalia/i18n/po/nso/qt_nso.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nso/vidalia_nso.po b/src/vidalia/i18n/po/nso/vidalia_nso.po
index 944508b..2a97c8f 100644
--- a/src/vidalia/i18n/po/nso/vidalia_nso.po
+++ b/src/vidalia/i18n/po/nso/vidalia_nso.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:41+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/oc/qt_oc.po b/src/vidalia/i18n/po/oc/qt_oc.po
index fd2926a..b824048 100644
--- a/src/vidalia/i18n/po/oc/qt_oc.po
+++ b/src/vidalia/i18n/po/oc/qt_oc.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/oc/vidalia_oc.po b/src/vidalia/i18n/po/oc/vidalia_oc.po
index f3ace62..213346e 100644
--- a/src/vidalia/i18n/po/oc/vidalia_oc.po
+++ b/src/vidalia/i18n/po/oc/vidalia_oc.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/or/qt_or.po b/src/vidalia/i18n/po/or/qt_or.po
index 7ab26b8..455e1be 100644
--- a/src/vidalia/i18n/po/or/qt_or.po
+++ b/src/vidalia/i18n/po/or/qt_or.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/or/vidalia_or.po b/src/vidalia/i18n/po/or/vidalia_or.po
index 22b0f4e..b16302b 100644
--- a/src/vidalia/i18n/po/or/vidalia_or.po
+++ b/src/vidalia/i18n/po/or/vidalia_or.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pa/qt_pa.po b/src/vidalia/i18n/po/pa/qt_pa.po
index 74bee92..75e5b14 100644
--- a/src/vidalia/i18n/po/pa/qt_pa.po
+++ b/src/vidalia/i18n/po/pa/qt_pa.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pa/vidalia_pa.po b/src/vidalia/i18n/po/pa/vidalia_pa.po
index b40ee73..a276fa6 100755
--- a/src/vidalia/i18n/po/pa/vidalia_pa.po
+++ b/src/vidalia/i18n/po/pa/vidalia_pa.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/pap/qt_pap.po b/src/vidalia/i18n/po/pap/qt_pap.po
index d305973..d5db222 100644
--- a/src/vidalia/i18n/po/pap/qt_pap.po
+++ b/src/vidalia/i18n/po/pap/qt_pap.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pap/vidalia_pap.po b/src/vidalia/i18n/po/pap/vidalia_pap.po
index b0ed7e9..371b707 100644
--- a/src/vidalia/i18n/po/pap/vidalia_pap.po
+++ b/src/vidalia/i18n/po/pap/vidalia_pap.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/pl/qt_pl.po b/src/vidalia/i18n/po/pl/qt_pl.po
index c2f3146..23dd665 100644
--- a/src/vidalia/i18n/po/pl/qt_pl.po
+++ b/src/vidalia/i18n/po/pl/qt_pl.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 już istnieje.\n"
-"Czy chcesz go zamieniÄ??"
+msgstr "%1 już istnieje.\nCzy chcesz go zamieniÄ??"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Plik nie znaleziony.\n"
-"ProszÄ? o sprawdzenie podanej nazwy pliku."
+msgstr "%1\nPlik nie znaleziony.\nProszÄ? o sprawdzenie podanej nazwy pliku."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Katalog nie znaleziony.\n"
-"Sprawdź podanÄ? nazwÄ? katalogu."
+msgstr "%1\nKatalog nie znaleziony.\nSprawdź podanÄ? nazwÄ? katalogu."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' jest zabezpieczony przed zapisem.\n"
-"Czy na pewno chcesz go skasowaÄ??"
+msgstr "'%1' jest zabezpieczony przed zapisem.\nCzy na pewno chcesz go skasowaÄ??"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Nazwa \"%1\" nie może zostaÄ? użyta.</b><p>Spróbuj użyÄ? nowej nazwy z "
-"mniejszÄ? liczbÄ? znaków lub bez znaków przystankowych."
+msgstr "<b>Nazwa \"%1\" nie może zostaÄ? użyta.</b><p>Spróbuj użyÄ? nowej nazwy z mniejszÄ? liczbÄ? znaków lub bez znaków przystankowych."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 b"
-
-
diff --git a/src/vidalia/i18n/po/pl/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po
index 4a60630..3b41c73 100644
--- a/src/vidalia/i18n/po/pl/vidalia_pl.po
+++ b/src/vidalia/i18n/po/pl/vidalia_pl.po
@@ -1,13 +1,15 @@
 # 
 # Translators:
+#   <achevallier@xxxxxxx>, 2012.
+#   <ipjsdfpojsdf@xxxxxxxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-22 18:06+0000\n"
+"Last-Translator: achevallier <achevallier@xxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +36,7 @@ msgstr "Tor 0.2.0.32"
 
 msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
-msgstr "4.4.2"
+msgstr "Qt 4.4.2"
 
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
@@ -115,9 +117,7 @@ msgstr "Plik konfiguracyjny Tora"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Uruchom oprogramowanie Tora używajÄ?c wybranego pliku konfiguracyjnego "
-"(torrc)"
+msgstr "Uruchom oprogramowanie Tora używajÄ?c wybranego pliku konfiguracyjnego (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -141,73 +141,77 @@ msgstr "Wybierz katalog używany do zapisu danych przez Tora"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr ""
+msgstr "Ustawienia Tor'a"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "Użyj poÅ?Ä?czeÅ? TCP (ControlPort)"
 
 msgctxt "AdvancedPage"
 msgid "Path:"
-msgstr ""
+msgstr "Å?cieżka:"
 
 msgctxt "AdvancedPage"
 msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Użyj gniazd domeny Uniksa (ControlSocket)"
 
 msgctxt "AdvancedPage"
 msgid "Edit current torrc"
-msgstr ""
+msgstr "Edytuj aktualny plik torrc"
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "UWAGA: edytuje aktualnie zaÅ?adowany plik torrc"
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "Podana Å?cieżka nie istnieje."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "Podana Å?cieżka pliku konfiguracyjnego Tora zawiera znaki, które nie mogÄ? zostaÄ? wyÅ?wietlone poprawnie w aktualnym 8-bitowym kodowaniu."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "Podana Å?cieżka katalogu danych Tora zawiera znaki, które nie mogÄ? zostaÄ? wyÅ?wietlone poprawnie w aktualnym 8-bitowym kodowaniu."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "ZmieniÅ?eÅ? Å?cieżkÄ? do pliku torrc, zrestartowaÄ? Tora ?"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Plik konfiguracyjny Tora (torrc);;Wszystkie pliki (*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Wybierz Å?cieżkÄ? do Tora"
 
 msgctxt "AdvancedPage"
 msgid "Configure ControlPort automatically"
-msgstr ""
+msgstr "Konfiguruj Port Kontrolny automatycznie"
+
+msgctxt "AdvancedPage"
+msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "SprawdziÅ?eÅ? autokonfiguracjÄ? dla ControlPort, ale nie dostarczyÅ?eÅ? Katalogu Danych. Dodaj go, albo odznacz opcjÄ? \"Skonfiguruj ControlPort automatycznie\""
 
 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"
-"\n"
-"BÄ?dziesz musiaÅ? usunÄ?Ä? jÄ? rÄ?cznie."
+msgstr "Vidalia nie mogÅ?a usunÄ?Ä? usÅ?ugi Tor.\n\nBÄ?dziesz musiaÅ? usunÄ?Ä? jÄ? rÄ?cznie."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -229,6 +233,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 "Preferencje ikon (ujrzysz zmiany po ponownym wÅ?Ä?czeniu Vidalii)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Pokaż ikonÄ? na pasku zadaÅ? i przyczep ikonÄ? (domyÅ?lne)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Schowaj ikonÄ? z paska zadaÅ?"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Schowaj przyczepionÄ? ikonÄ?"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Wykres od:"
@@ -259,7 +280,7 @@ msgstr "Pokaż wysyÅ?anie"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr "Na wierzchu"
+msgstr "Zawsze na wierzchu"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
@@ -449,9 +470,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia poÅ?Ä?czyÅ?a siÄ? z usÅ?ugÄ? Tora, który wymaga hasÅ?a. ProszÄ? wprowadziÄ? "
-"hasÅ?o:"
+msgstr "Vidalia poÅ?Ä?czyÅ?a siÄ? z usÅ?ugÄ? Tora, który wymaga hasÅ?a. ProszÄ? wprowadziÄ? hasÅ?o:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1167,7 +1186,7 @@ msgstr "Zimbabwe"
 
 msgctxt "CountryInfo"
 msgid "Zaire"
-msgstr ""
+msgstr "Zair"
 
 msgctxt "CountryInfo"
 msgid "Albania"
@@ -1267,52 +1286,52 @@ msgstr "Tajwan"
 
 msgctxt "CrashReportDialog"
 msgid "Submit a Crash Report"
-msgstr ""
+msgstr "WyÅ?lij raport o bÅ?Ä?dzie"
 
 msgctxt "CrashReportDialog"
 msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "Vidalia napotkaÅ?a problem i musi zostaÄ? zamkniÄ?ta"
 
 msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
-msgstr ""
+msgstr "Uruchom VidaliÄ? ponownie"
 
 msgctxt "CrashReportDialog"
 msgid "Don't Restart"
-msgstr ""
+msgstr "Nie uruchamiaj ponownie"
 
 msgctxt "CrashReportDialog"
 msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Ponowne uruchomienie Vidalia nie powiodÅ?o siÄ?"
 
 msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
+msgstr "Nie udaÅ?o siÄ? automatycznie uruchomiÄ? Vidalii. ProszÄ? uruchomiÄ? ponownie rÄ?cznie."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
-msgstr ""
+msgstr "WypeÅ?nij kartÄ? w:"
 
 msgctxt "CrashReportDialog"
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
+msgstr "ZostaÅ? utworzony raport bÅ?Ä?du, który możesz przesÅ?aÄ? do zespoÅ?u Vidalii aby pomóc zidentyfikowaÄ? i usunÄ?Ä? usterkÄ?. PrzesyÅ?any raport nie zawiera żadnych informacji poufnych."
 
 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 ""
+msgstr "wraz z opisem tego co robiÅ?eÅ? przed wystÄ?pieniem usterki, oraz nastÄ?pujÄ?cymi plikami odnoÅ?nie raportu o bÅ?Ä?dzie:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1531,10 +1550,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia może otworzyÄ? wskazany link w domyÅ?lnej przeglÄ?darce. JeÅ?li Twoja "
-"przeglÄ?darka nie jest skonfigurowana na używanie sieci Tor, żÄ?danie nie "
-"bÄ?dzie anonimowe."
+msgstr "Vidalia może otworzyÄ? wskazany link w domyÅ?lnej przeglÄ?darce. JeÅ?li Twoja przeglÄ?darka nie jest skonfigurowana na używanie sieci Tor, żÄ?danie nie bÄ?dzie anonimowe."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1548,9 +1564,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia nie mogÅ?a otworzyÄ? linku w Twojej przeglÄ?darce. Jednakże możesz "
-"skopiowaÄ? adres URL i wkleiÄ? bezpoÅ?rednio do przeglÄ?darki."
+msgstr "Vidalia nie mogÅ?a otworzyÄ? linku w Twojej przeglÄ?darce. Jednakże możesz skopiowaÄ? adres URL i wkleiÄ? bezpoÅ?rednio do przeglÄ?darki."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1594,27 +1608,27 @@ msgstr "Nieznany"
 
 msgctxt "LogTreeItem"
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 msgctxt "LogTreeItem"
 msgid "Info"
-msgstr ""
+msgstr "Informacja"
 
 msgctxt "LogTreeItem"
 msgid "Notice"
-msgstr ""
+msgstr "Powiadomienie"
 
 msgctxt "LogTreeItem"
 msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
 
 msgctxt "LogTreeItem"
 msgid "Error"
-msgstr ""
+msgstr "BÅ?Ä?d"
 
 msgctxt "LogTreeItem"
 msgid "Unknown"
-msgstr ""
+msgstr "Nieznany"
 
 msgctxt "MainWindow"
 msgid "Start Tor"
@@ -1761,10 +1775,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"
 
@@ -1832,9 +1842,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia nie mogÅ?a uruchomiÄ? Tora. ProszÄ? sprawdziÄ? ustawienia, aby upewniÄ? "
-"siÄ? co do Å?cieżki dostÄ?pu do pliku wykonywalnego Tora."
+msgstr "Vidalia nie mogÅ?a uruchomiÄ? Tora. ProszÄ? sprawdziÄ? ustawienia, aby upewniÄ? siÄ? co do Å?cieżki dostÄ?pu do pliku wykonywalnego Tora."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1872,9 +1880,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Oprogramowanie Tor wymaga od Vidalii wysÅ?ania zawartoÅ?ci ciasteczka "
-"uwierzytelniajÄ?cego, jednakże Vidalia nie znalazÅ?a żadnego."
+msgstr "Oprogramowanie Tor wymaga od Vidalii wysÅ?ania zawartoÅ?ci ciasteczka uwierzytelniajÄ?cego, jednakże Vidalia nie znalazÅ?a żadnego."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1896,9 +1902,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia nie mogÅ?a zarejestrowaÄ? siÄ? w systemie do obsÅ?ugi zdarzeÅ?. Wiele "
-"funkcji może byÄ? niedostÄ?pnych."
+msgstr "Vidalia nie mogÅ?a zarejestrowaÄ? siÄ? w systemie do obsÅ?ugi zdarzeÅ?. Wiele funkcji może byÄ? niedostÄ?pnych."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1920,9 +1924,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Zainstalowana obecnie wersja Tora jest przestarzaÅ?a lub nie polecana. ProszÄ?"
-" odwiedziÄ? stronÄ? Tora i Å?ciÄ?gnÄ?Ä? najnowszÄ? wersjÄ?."
+msgstr "Zainstalowana obecnie wersja Tora jest przestarzaÅ?a lub nie polecana. ProszÄ? odwiedziÄ? stronÄ? Tora i Å?ciÄ?gnÄ?Ä? najnowszÄ? wersjÄ?."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1944,8 +1946,7 @@ msgstr "Przekierowanie portu zawiodÅ?o"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia nie zdoÅ?aÅ?a automatycznie skonfigurowaÄ? przekierowania portów."
+msgstr "Vidalia nie zdoÅ?aÅ?a automatycznie skonfigurowaÄ? przekierowania portów."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
@@ -1961,7 +1962,7 @@ msgstr "Skróty Vidalii"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "Ustawienia wÄ?zÅ?a\n"
+msgstr "Ustawienia wÄ?zÅ?a"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
@@ -2028,18 +2029,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia próbowaÅ?a zresetowaÄ? hasÅ?o sterujÄ?ce Tora, ale nie udaÅ?o siÄ? "
-"ponownie uruchomiÄ? aplikacji Tor. Sprawdź w Menedżerze zadaÅ? czy nie ma "
-"uruchomionych procesów Tora."
+msgstr "Vidalia próbowaÅ?a zresetowaÄ? hasÅ?o sterujÄ?ce Tora, ale nie udaÅ?o siÄ? ponownie uruchomiÄ? aplikacji Tor. Sprawdź w Menedżerze zadaÅ? czy nie ma uruchomionych procesów Tora."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Zainstalowana obecnie wersja Tora jest przestarzaÅ?a lub nie polecana. ProszÄ?"
-" odwiedziÄ? stronÄ? Tora i Å?ciÄ?gnÄ?Ä? najnowszÄ? wersjÄ?."
+msgstr "Zainstalowana obecnie wersja Tora jest przestarzaÅ?a lub nie polecana. ProszÄ? odwiedziÄ? stronÄ? Tora i Å?ciÄ?gnÄ?Ä? najnowszÄ? wersjÄ?."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2054,8 +2050,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor automatycznie zamknÄ?Å? Twoje poÅ?Ä?czenie, aby chroniÄ? TwojÄ? anonimowoÅ?Ä?."
+msgstr "Tor automatycznie zamknÄ?Å? Twoje poÅ?Ä?czenie, aby chroniÄ? TwojÄ? anonimowoÅ?Ä?."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2088,7 +2083,25 @@ 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."
-msgstr ""
+msgstr "Każda informacja przesÅ?ana przy użyciu tego poÅ?Ä?czenia może byÄ? monitorowana. Sprawdź ustawienia aplikacji i używaj tylko protokoÅ?ów szyfrowanych, jak np. SSL, jeÅ?li to możliwe."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Å?adowanie poczÄ?tkowe torrc z %1 do %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(prawdopodobnie Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(pradwopodobnie klient email)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Jedna z uruchomionych aplikacji %1 próbuje nawiÄ?zaÄ? potencjalnie nieszyfrowane i niebezpieczne poÅ?Ä?czenie z portem %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2098,47 +2111,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Twój wÄ?zeÅ? zostanie wyÅ?Ä?czony.\n"
-"\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymaÄ?."
+msgstr "Twój wÄ?zeÅ? zostanie wyÅ?Ä?czony.\n\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymaÄ?."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr ""
+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 nie wie jak porozumieÄ? siÄ? z Torem, ponieważ nie może uzyskaÄ? dostÄ?pu do tego pliku: %1 â??\nâ??\nTutaj jest ostatni bÅ?Ä?d:â??\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 "WyglÄ?da na to, że Tor przestaÅ? dziaÅ?aÄ? zanim Vidalia go wÅ?Ä?czyÅ?a â??\nâ??\nZobacz Logi aby uzyskaÄ? wiÄ?cej informacji."
 
 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?"
-msgstr ""
-"Posiadasz uruchomiony wÄ?zeÅ? Tora. WyÅ?Ä?czenie wÄ?zÅ?a przerwie wszystkie otwarte poÅ?Ä?czenia z klientami.\n"
-"\n"
-"Czy chciaÅ?byÅ? uprzedziÄ? ich o tym fakcie i daÄ? czas na znalezienie nowego serwera?"
+msgstr "Posiadasz uruchomiony wÄ?zeÅ? Tora. WyÅ?Ä?czenie wÄ?zÅ?a przerwie wszystkie otwarte poÅ?Ä?czenia z klientami.\n\nCzy chciaÅ?byÅ? uprzedziÄ? ich o tym fakcie i daÄ? czas na znalezienie nowego serwera?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia wykryÅ?a, że Tor nieoczekiwanie zakoÅ?czyÅ? dziaÅ?anie.\n"
-"\n"
-"ProszÄ? sprawdziÄ? logi w celu poznania przyczyny."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Vidalia wykryÅ?a, że Tor nieoczekiwanie zakoÅ?czyÅ? dziaÅ?anie.\n\nProszÄ? sprawdziÄ? logi w celu poznania przyczyny."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2394,15 +2396,15 @@ msgstr "Automatycznie zapisuj wiadomoÅ?ci do pliku"
 
 msgctxt "MessageLog"
 msgid "Basic"
-msgstr ""
+msgstr "Podstawowe"
 
 msgctxt "MessageLog"
 msgid "Tor Status"
-msgstr ""
+msgstr "Status Tor"
 
 msgctxt "MessageLog"
 msgid "Advanced"
-msgstr ""
+msgstr "Zaawansowane"
 
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
@@ -2412,17 +2414,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"WiadomoÅ?ci, które pojawiajÄ? siÄ?, gdy \n"
-"pojawiÅ? siÄ? poważny bÅ?Ä?d i Tor nie mógÅ? kontynuowaÄ?."
+msgstr "WiadomoÅ?ci, które pojawiajÄ? siÄ?, gdy \npojawiÅ? siÄ? poważny bÅ?Ä?d i Tor nie mógÅ? kontynuowaÄ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"WiadomoÅ?ci, które pojawiajÄ? siÄ?, gdy\n"
-"coÅ? poszÅ?o źle z Torem."
+msgstr "WiadomoÅ?ci, które pojawiajÄ? siÄ?, gdy\ncoÅ? poszÅ?o źle z Torem."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2430,36 +2428,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"WiadomoÅ?ci, które pojawiajÄ? siÄ? rzadko \n"
-"podczas normalnej pracy i nie sÄ? uważane za bÅ?Ä?dy,\n"
-"ale mogÄ? CiÄ? zainteresowaÄ?."
+msgstr "WiadomoÅ?ci, które pojawiajÄ? siÄ? rzadko \npodczas normalnej pracy i nie sÄ? uważane za bÅ?Ä?dy,\nale mogÄ? CiÄ? zainteresowaÄ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"WiadomoÅ?ci, które czÄ?sto pojawiajÄ? siÄ? \n"
-"podczas normalnej pracy Tora."
+msgstr "WiadomoÅ?ci, które czÄ?sto pojawiajÄ? siÄ? \npodczas normalnej pracy Tora."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Bardzo szczegóÅ?owe wiadomoÅ?ci, bÄ?dÄ?ce\n"
-"zainteresowaniem programistów Tora."
+msgstr "Bardzo szczegóÅ?owe wiadomoÅ?ci, bÄ?dÄ?ce\nzainteresowaniem programistów Tora."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Nie można zapisywaÄ? do pliku %1\n"
-"\n"
-"%2."
+msgstr "Nie można zapisywaÄ? do pliku %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2566,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Niepoprawny WÄ?zeÅ?-Most"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "OkreÅ?lony identyfikator WÄ?zÅ?a-Mostu nie jest poprawny."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopiuj (Ctrl+C)"
 
@@ -2581,17 +2561,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Musisz okreÅ?liÄ? adres IP lub nazwÄ? hosta oraz numer portu, aby Tor mógÅ? "
-"używaÄ? serwera proxy w dostÄ?pie do Internetu."
+msgstr "Musisz okreÅ?liÄ? adres IP lub nazwÄ? hosta oraz numer portu, aby Tor mógÅ? używaÄ? serwera proxy w dostÄ?pie do Internetu."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Musisz okreÅ?liÄ? jeden lub kilka portów, na których Twój firewall akceptuje "
-"przychodzÄ?ce poÅ?Ä?czenia."
+msgstr "Musisz okreÅ?liÄ? jeden lub kilka portów, na których Twój firewall akceptuje przychodzÄ?ce poÅ?Ä?czenia."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2619,13 +2595,11 @@ msgstr "HasÅ?o:"
 
 msgctxt "NetworkPage"
 msgid "Port:"
-msgstr "Port"
+msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Zaznacz, aby Å?Ä?czyÄ? siÄ? do wÄ?zÅ?ów używajÄ?c portów dozwolonych w Twoim "
-"firewallu"
+msgstr "Zaznacz, aby Å?Ä?czyÄ? siÄ? do wÄ?zÅ?ów używajÄ?c portów dozwolonych w Twoim firewallu"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2647,9 +2621,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Zaznacz aby zaszyfrowaÄ? żÄ?dania dostÄ?pu do katalogu i, opcjonalnie, używaÄ? "
-"wÄ?zÅ?ów-mostów w dostÄ?pie do sieci Tor"
+msgstr "Zaznacz aby zaszyfrowaÄ? żÄ?dania dostÄ?pu do katalogu i, opcjonalnie, używaÄ? wÄ?zÅ?ów-mostów w dostÄ?pie do sieci Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2687,9 +2659,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Nowe wÄ?zÅ?y-mosty nie sÄ? dostÄ?pne. Możesz poczekaÄ? i spróbowaÄ? ponownie, albo"
-" użyÄ? innej metody znalezienia nowych wÄ?zÅ?ów-mostów."
+msgstr "Nowe wÄ?zÅ?y-mosty nie sÄ? dostÄ?pne. Możesz poczekaÄ? i spróbowaÄ? ponownie, albo użyÄ? innej metody znalezienia nowych wÄ?zÅ?ów-mostów."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2697,31 +2667,31 @@ msgstr "Kliknij Pomoc, aby zobaczyÄ? inne metody znajdywania wÄ?zÅ?ów-mostów."
 
 msgctxt "NetworkPage"
 msgid "Address:"
-msgstr ""
+msgstr "Adres:"
 
 msgctxt "NetworkPage"
 msgid "Type:"
-msgstr ""
+msgstr "Typ:"
 
 msgctxt "NetworkPage"
 msgid "You must select the proxy type."
-msgstr ""
+msgstr "Musisz wybraÄ? typ proxy."
 
 msgctxt "NetworkPage"
 msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
 
 msgctxt "NetworkPage"
 msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
+msgid "You must specify one or more bridges."
+msgstr "Musisz wyszczególniÄ? jeden lub wiÄ?cej przekaźników."
 
 msgctxt "Policy"
 msgid "accept"
@@ -2879,9 +2849,7 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"SkonfigurowaÅ?eÅ? swojego Tora jako wÄ?zeÅ?-most dla zablokowanych użytkowników,"
-" ale Twoja wersja Tora nie obsÅ?uguje tej funkcji."
+msgstr "SkonfigurowaÅ?eÅ? swojego Tora jako wÄ?zeÅ?-most dla zablokowanych użytkowników, ale Twoja wersja Tora nie obsÅ?uguje tej funkcji."
 
 msgctxt "ServerPage"
 msgid ""
@@ -2902,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "DziaÅ?aj tylko jako klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "UdostÄ?pnij moje Å?Ä?cze dla sieci Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Port wÄ?zÅ?a:"
 
@@ -2957,9 +2921,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Dla poÅ?Ä?czeÅ? o wysokiej prÄ?dkoÅ?ci Å?ciÄ?gania a niskiej wysyÅ?ania, proszÄ? "
-"wybraÄ? typ o zbliżonej prÄ?dkoÅ?ci wysyÅ?ania."
+msgstr "Dla poÅ?Ä?czeÅ? o wysokiej prÄ?dkoÅ?ci Å?ciÄ?gania a niskiej wysyÅ?ania, proszÄ? wybraÄ? typ o zbliżonej prÄ?dkoÅ?ci wysyÅ?ania."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3017,9 +2979,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Twoja maksymalna przepustowoÅ?Ä? musi byÄ? wiÄ?ksza lub równa Å?redniej "
-"przepustowoÅ?ci. Obie wartoÅ?ci muszÄ? wynosiÄ? co najmniej 20 KB/s."
+msgstr "Twoja maksymalna przepustowoÅ?Ä? musi byÄ? wiÄ?ksza lub równa Å?redniej przepustowoÅ?ci. Obie wartoÅ?ci muszÄ? wynosiÄ? co najmniej 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3051,7 +3011,7 @@ msgstr "Inne usÅ?ugi"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Porty 706, 1863, 5050, 5190, 5222, 8300 i 8888"
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 5223, 8300 i 8888"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3080,18 +3040,13 @@ msgstr "Pokazuje pomoc dotyczÄ?cÄ? reguÅ?"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Jakie zasoby Internetu bÄ?dÄ? dostÄ?pne dla użytkowników korzystajÄ?cych z "
-"twojego serwera ?"
+msgstr "Jakie zasoby Internetu bÄ?dÄ? dostÄ?pne dla użytkowników korzystajÄ?cych z twojego serwera ?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor bÄ?dzie domyÅ?lnie blokowaÅ? niektóre wychodzÄ?ce poÅ?Ä?czenia poczty "
-"elektronicznej i aplikacji p2p, aby zredukowaÄ? liczbÄ? spamu i innych "
-"nadużyÄ?."
+msgstr "Tor bÄ?dzie domyÅ?lnie blokowaÅ? niektóre wychodzÄ?ce poÅ?Ä?czenia poczty elektronicznej i aplikacji p2p, aby zredukowaÄ? liczbÄ? spamu i innych nadużyÄ?."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3099,8 +3054,7 @@ msgstr "Polityka poÅ?Ä?czeÅ?"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Pozwalaj innym na dostÄ?p do Twojego mostu poprzez użycie nastÄ?pujÄ?cej linii:"
+msgstr "Pozwalaj innym na dostÄ?p do Twojego mostu poprzez użycie nastÄ?pujÄ?cej linii:"
 
 msgctxt "ServerPage"
 msgid ""
@@ -3137,9 +3091,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor zwróciÅ? odpowiedź w niepoprawnym formacie, gdy Vidalia poprosiÅ?a o "
-"historiÄ? użycia Twojego wÄ?zÅ?a."
+msgstr "Tor zwróciÅ? odpowiedź w niepoprawnym formacie, gdy Vidalia poprosiÅ?a o historiÄ? użycia Twojego wÄ?zÅ?a."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3147,9 +3099,7 @@ msgstr "Zwrócona odpowiedź: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"Pomóż użytkownikom z ograniczeniami uzyskaÄ? dostÄ?p do sieci Tor (Tor "
-"0.2.0.8-alpha i nowsze)"
+msgstr "Pomóż użytkownikom z ograniczeniami uzyskaÄ? dostÄ?p do sieci Tor (Tor 0.2.0.8-alpha i nowsze)"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3157,11 +3107,19 @@ msgstr "<a href=\"bridges.finding\">Jak mam znaleźÄ? wÄ?zeÅ?-most?</a>"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Co to jest?</a>"
 
 msgctxt "ServerPage"
 msgid "Automatically distribute my bridge address"
-msgstr ""
+msgstr "Automatycznie udostÄ?pniaj mój adres Mostu"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Ruch przekaźników w sieci Tor (przekaźnik wyjÅ?cia)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Ruch przekaźników w sieci Tor (przekaźnik bez wyjÅ?cia)"
 
 msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
@@ -3171,9 +3129,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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\n"
-"problemów z dziaÅ?aniem Twojego wÄ?zÅ?a. Możesz również zamieÅ?ciÄ? sygnatury PGP lub GPG."
+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"
@@ -3183,9 +3139,7 @@ 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Ä?Ä?."
+msgstr "ProszÄ? skonfigurowaÄ? przynajmniej katalog usÅ?ug oraz wirtualny port dla każdej usÅ?ugi. Inne proszÄ? usunÄ?Ä?."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3261,26 +3215,26 @@ msgstr "Utworzone przez Tora"
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Kopiuj do Schowka"
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Tor jest uruchomiony"
 
 msgctxt "StatusEventWidget"
 msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Aktualna wersja Tor to \"%1\"."
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Tor nie jest uruchomiony"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
+msgstr "Wybierz \"Uruchom Tor\" w Panelu Kontrolnym aby zrestartowaÄ? Tor. JeÅ?li Tor zostaÅ? zamkniÄ?ty niespodziewanie, wybierz zakÅ?adkÄ? \"Zaawansowane\" aby poznaÄ? szczegóÅ?y bÅ?Ä?dów."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3288,7 +3242,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
+msgstr "Twoja aktualna wersja Tor \"%1\" nie jest zalecana. Zaktualizuj do najnowszej wersji, która może zawieraÄ? ważne poprawki bezpieczeÅ?stwa, stabilnoÅ?ci i wydajnoÅ?ci."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3296,31 +3250,31 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
+msgstr "Twoja aktualna wersja Tor \"%1\" może nie dziaÅ?aÄ? poprawnie z aktualnÄ? sieciÄ? Tor. Zaktualizuj do najnowszej wersji, która może zawieraÄ? ważne poprawki bezpieczeÅ?stwa, stabilnoÅ?ci i wydajnoÅ?ci."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Twoja wersja Tor jest nieaktualna"
 
 msgctxt "StatusEventWidget"
 msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "PoÅ?Ä?czono z sieciÄ? Tor"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
+msgstr "UdaÅ?o siÄ? nawiÄ?zaÄ? poÅ?Ä?czenie z sieciÄ? Tor. Możesz teraz skonfigurowaÄ? swoje aplikacje do korzystania z internetu anonimowo."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
-msgstr ""
+msgstr "BÅ?Ä?d Tor"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
+msgstr "WewnÄ?trzny bÅ?Ä?d Tor. WyÅ?lij tÄ? wiadomoÅ?Ä? do deweloperów Tora na bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3328,7 +3282,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "Tor ustaliÅ?, że zegar Twojego komputera może byÄ? przestawiony o %1 sekund wstecz w porównaniu do \"%2\". JeÅ?li ustawienie zegara jest niepoprawne, Tor nie bÄ?dzie dziaÅ?aÅ? poprawnie. Upewnij siÄ?, że czas wyÅ?wietlany przez zegar jest prawidÅ?owy."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3336,11 +3290,11 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "Tor ustaliÅ?, że zegar Twojego komputera może byÄ? przestawiony o %1 sekund wprzód w porównaniu do \"%2\". JeÅ?li ustawienie zegara jest niepoprawne, Tor nie bÄ?dzie dziaÅ?aÅ? poprawnie. Upewnij siÄ?, że czas wyÅ?wietlany przez zegar jest prawidÅ?owy."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Ustawienia Zegara Twojego komputera mogÄ? byÄ? nieprawidÅ?owe"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3348,18 +3302,18 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
+msgstr "Jedna z aplikacji na Twoim komputerze probowaÅ?a nawiÄ?zaÄ? nieszyfrowane poÅ?Ä?czenie poprzez Tor na porcie %1. WysyÅ?anie nieszyfrowanych informacji przez sieÄ? Tor jest niebezpieczne. Dla Twojej ochrony, Tor automatycznie zamknÄ?Å? to poÅ?Ä?czenie."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
+msgstr "Jedna z aplikacji na Twoim komputerze probowaÅ?a nawiÄ?zaÄ? nieszyfrowane poÅ?Ä?czenie poprzez Tor na porcie %1. WysyÅ?anie nieszyfrowanych informacji przez sieÄ? Tor jest niebezpieczne."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Potencjalnie niebezpieczne poÅ?Ä?czenie!"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3367,81 +3321,81 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
+msgstr "Jedna z Twoich aplikacji próbowaÅ?a nawiÄ?zaÄ? poÅ?Ä?czenie przez Tor z \"%1\" używajÄ?c protokoÅ?u, który może spowodowaÄ? wyciek informacji o celu poÅ?Ä?czenia. Upewnij siÄ?, że Twoja aplikacja jest skonfigurowana do używania tylko SOCKS4a lub SOCKS5."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "Nieznany protokóÅ?"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
+msgstr "Jedna z Twoich aplikacji próbowaÅ?a nawiÄ?zaÄ? poÅ?Ä?czenie przez Tor używajÄ?c protokoÅ?u nieznanego dla Tora. Upewnij siÄ?, że Twoja aplikacja jest skonfigurowana do używania tylko SOCKS4a lub SOCKS5."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "NieprawidÅ?owa nazwa hosta"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
+msgstr "Jedna z aplikacji próbowaÅ?a nawiÄ?zaÄ? poÅ?Ä?czenie przez Tor z \"%1\", które nie jest rozpoznawane jako prawidÅ?owa nazwa hosta. Sprawdź ustawienia swojej aplikacji."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
-msgstr ""
+msgstr "ZewnÄ?trzny adres IP zmieniony"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
+msgstr "Tor ustaliÅ?, że publiczny adres IP Twojego wÄ?zÅ?a to %1%2. JeÅ?li podany adres nie jest poprawny, wprowadź adres IP w polu 'Adres' w ustawieniach wÄ?zÅ?a."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "Wykryto przekierowanie DNS "
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
+msgstr "Tor wykryÅ?, że Twój dostawca DNS przekazuje faÅ?szywe odpowiedzi dla domen, które nie istniejÄ?. Niektórzy dostawcy internetu i DNS, np. OpenDNS, sÄ? znani z takich dziaÅ?aÅ?, aby pokazaÄ? ich wÅ?asne wyszukiwarki, czy strony reklamowe."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
+msgstr "Tor wykryÅ?, że Twój dostawca DNS przekazuje faÅ?szywe odpowiedzi dla dobrze znanych domen. OdkÄ?d klienci polegajÄ? na przekaźnikach sieci Tor, aby otrzymaÄ? dokÅ?adne odpowiedzi DNS, Twój przekaźnik nie bÄ?dzie skonfigurowany jako przekaźnik wyjÅ?ciowy."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Sprawdzanie, czy port serwera jest osiÄ?galny"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
+msgstr "Tor próbuje sprawdziÄ?, czy port serwera Twojego przekaźnika jest osiÄ?galny z sieci Tor, Å?Ä?czÄ?c siÄ? w %1:%2. To może potrwaÄ? kilka minut."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Test dostÄ?pu do portu serwera przebiegÅ? pomyÅ?lnie!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "Port serwera Twojego przekaźnika jest osiÄ?galny przez sieÄ? Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Test dostÄ?u do portu serwera zakoÅ?czony niepowodzeniem"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3449,30 +3403,30 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
+msgstr "Port serwera Twojego przekaźnika jest niedostÄ?pny dla innych klientów Tora. PrzyczynÄ? może byÄ? Twój router lub firewall, który wymaga od Ciebie ustawienia przekierowania portu. JeÅ?li %1:%2 to nie Twój adres IP i port katalogu, sprawdź konfiguracjÄ? swojego przekaźnika."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Sprawdzanie, czy dostÄ?pny jest katalog portów."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
+msgstr "Tor próbuje sprawdziÄ?, czy port katalogu Twojego przekaźnika jest osiÄ?galny z sieci Tor, Å?Ä?czÄ?c siÄ? w %1:%2. To może potrwaÄ? kilka minut."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Test dostÄ?pu do portu katalogu zakoÅ?czony pomyÅ?lnie!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "Katalog portu Twojego przekaźnika jest dostÄ?pny z sieci Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Test dostÄ?pu do portu katalogu zakoÅ?czony niepowodzeniem"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3480,21 +3434,21 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
+msgstr "Port katalogu Twojego przekaźnika jest niedostÄ?pny dla innych klientów Tora. PrzyczynÄ? może byÄ? Twój router lub firewall, który wymaga od Ciebie ustawienia przekierowania portu. JeÅ?li %1:%2 to nie Twój adres IP i port katalogu, sprawdź konfiguracjÄ? swojego przekaźnika."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Deskryptor WÄ?zÅ?a Odrzucony"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
+msgstr "Deskryptor Twojego WÄ?zÅ?a, który umożliwia klientom Å?Ä?czenie siÄ? z wÄ?zÅ?em, zostaÅ? odrzucony przez serwer %1:%2. Podany powód: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
-msgstr ""
+msgstr "Twój WÄ?zeÅ? jest aktywny"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3502,7 +3456,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
+msgstr "Twoj wÄ?zeÅ? jest aktywny i dostÄ?pny dla innych użytkowników sieci Tor. W ciÄ?gu kilku godzin powinienieÅ? móc zaobserwowaÄ? wzrost ruchu w sieci na wykresie przepustowoÅ?ci. DziÄ?kujemy za wkÅ?ad wniesiony w sieÄ? Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3558,65 +3512,65 @@ msgstr "Haszowanie hasÅ?a sterujÄ?cego nie powiodÅ?o siÄ?."
 
 msgctxt "TorrcDialog"
 msgid "Editing torrc"
-msgstr ""
+msgstr "Edytowanie torrc"
 
 msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
+msgstr "Zapisz ustawienia. JeÅ?li nie zaznaczono, ustawienia zostanÄ? zastosowane tylko do aktualnej instancji Tor"
 
 msgctxt "TorrcDialog"
 msgid "Cut"
-msgstr ""
+msgstr "Wytnij"
 
 msgctxt "TorrcDialog"
 msgid "Copy"
-msgstr ""
+msgstr "Kopiuj"
 
 msgctxt "TorrcDialog"
 msgid "Paste"
-msgstr ""
+msgstr "Wklej"
 
 msgctxt "TorrcDialog"
 msgid "Undo"
-msgstr ""
+msgstr "Cofnij"
 
 msgctxt "TorrcDialog"
 msgid "Redo"
-msgstr ""
+msgstr "Ponów"
 
 msgctxt "TorrcDialog"
 msgid "Select All"
-msgstr ""
+msgstr "Zaznacz wszystko"
 
 msgctxt "TorrcDialog"
 msgid "Apply all"
-msgstr ""
+msgstr "Zatwierdź wszystko"
 
 msgctxt "TorrcDialog"
 msgid "Apply selection only"
-msgstr ""
+msgstr "Zatwierdź tylko wybrane"
 
 msgctxt "TorrcDialog"
 msgid "Error connecting to Tor"
-msgstr ""
+msgstr "BÅ?Ä?d podczas Å?Ä?czenia z Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
+msgstr "Zaznaczenie jest puste. Zaznacz tekst, lub użyj opcji \"Zatwierdź wszystkie\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "BÅ?Ä?d w linii %1 \"%2\""
 
 msgctxt "TorrcDialog"
 msgid "Error"
-msgstr ""
+msgstr "BÅ?Ä?d"
 
 msgctxt "TorrcDialog"
 msgid "An error ocurred while opening torrc file"
-msgstr ""
+msgstr "BÅ?Ä?d podczas otwierania pliku torrc"
 
 msgctxt "UPNPControl"
 msgid "Success"
@@ -3678,17 +3632,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia nie mogÅ?a sprawdziÄ? dostÄ?pnoÅ?ci nowej wersji oprogramowania ponieważ"
-" nie znalazÅ?a '%1'."
+msgstr "Vidalia nie mogÅ?a sprawdziÄ? dostÄ?pnoÅ?ci nowej wersji oprogramowania ponieważ nie znalazÅ?a '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia nie mogÅ?a sprawdziÄ? dostÄ?pnoÅ?ci nowej wersji oprogramowania, "
-"ponieważ skÅ?adnik Tora nieoczekiwanie zakoÅ?czyÅ? dziaÅ?anie."
+msgstr "Vidalia nie mogÅ?a sprawdziÄ? dostÄ?pnoÅ?ci nowej wersji oprogramowania, ponieważ skÅ?adnik Tora nieoczekiwanie zakoÅ?czyÅ? dziaÅ?anie."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3844,7 +3794,7 @@ msgstr "Nie udaÅ?o siÄ? otworzyÄ? pliku logu '%1': %2"
 
 msgctxt "Vidalia"
 msgid "Value required for parameter :"
-msgstr ""
+msgstr "WartoÅ?Ä? wymagana dla parametru :"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
@@ -3863,10 +3813,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Inny proces Vidalii jest prawdopodobnie już uruchomiony. JeÅ?li jesteÅ? pewien że nie, możesz kontynuowaÄ?.\n"
-"\n"
-"Czy chcesz kontynuowaÄ? uruchamianie Vidalii?"
+msgstr "Inny proces Vidalii jest prawdopodobnie już uruchomiony. JeÅ?li jesteÅ? pewien że nie, możesz kontynuowaÄ?.\n\nCzy chcesz kontynuowaÄ? uruchamianie Vidalii?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3899,5 +3846,3 @@ msgstr "%1 godzin"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minut"
-
-
diff --git a/src/vidalia/i18n/po/pms/qt_pms.po b/src/vidalia/i18n/po/pms/qt_pms.po
index 5b69b65..4bed094 100644
--- a/src/vidalia/i18n/po/pms/qt_pms.po
+++ b/src/vidalia/i18n/po/pms/qt_pms.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pms/vidalia_pms.po b/src/vidalia/i18n/po/pms/vidalia_pms.po
index 9ebe381..8b32761 100644
--- a/src/vidalia/i18n/po/pms/vidalia_pms.po
+++ b/src/vidalia/i18n/po/pms/vidalia_pms.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ps/qt_ps.po b/src/vidalia/i18n/po/ps/qt_ps.po
index cc3bb21..38466ba 100644
--- a/src/vidalia/i18n/po/ps/qt_ps.po
+++ b/src/vidalia/i18n/po/ps/qt_ps.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ps/vidalia_ps.po b/src/vidalia/i18n/po/ps/vidalia_ps.po
index 3ced494..25319c8 100644
--- a/src/vidalia/i18n/po/ps/vidalia_ps.po
+++ b/src/vidalia/i18n/po/ps/vidalia_ps.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/pt/qt_pt.po b/src/vidalia/i18n/po/pt/qt_pt.po
index 8b14d9e..b423bf7 100644
--- a/src/vidalia/i18n/po/pt/qt_pt.po
+++ b/src/vidalia/i18n/po/pt/qt_pt.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <miguelmacedo@xxxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-06-06 22:43+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: miguelmacedo <miguelmacedo@xxxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 já existe.\n"
-"Deseja substituí-lo?"
+msgstr "%1 já existe.\nDeseja substituí-lo?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Ficheiro não encontrado.\n"
-"Por favor verifique que foi dado o nome correcto do ficheiro."
+msgstr "%1\nFicheiro não encontrado.\nPor favor verifique que foi dado o nome correcto do ficheiro."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Directoria não encontrada.\n"
-"Por favor verifique que foi dado o nome correcto da pasta."
+msgstr "%1\nDirectoria não encontrada.\nPor favor verifique que foi dado o nome correcto da pasta."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' está protegido contra escrita.\n"
-"Deseja apagar mesmo assim?"
+msgstr "'%1' está protegido contra escrita.\nDeseja apagar mesmo assim?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>O nome \"%1\" não pode ser usado.</b><p>Tente utilizar outro nome, com "
-"menos caractéres ou sem pontuação."
+msgstr "<b>O nome \"%1\" não pode ser usado.</b><p>Tente utilizar outro nome, com menos caractéres ou sem pontuação."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/pt/vidalia_pt.po b/src/vidalia/i18n/po/pt/vidalia_pt.po
index 8462a69..2eca31d 100644
--- a/src/vidalia/i18n/po/pt/vidalia_pt.po
+++ b/src/vidalia/i18n/po/pt/vidalia_pt.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-24 04:31+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: Zeca Gatilho <paulo.mosh@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -45,9 +45,7 @@ msgstr "'%1' não é um endereço de IP válido."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Você seleccionou autenticação de 'Password' , mas não especificou uma "
-"password."
+msgstr "Você seleccionou autenticação de 'Password' , mas não especificou uma password."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -119,8 +117,7 @@ msgstr "Ficheiro de Configuração do Tor"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Iniciar o software Tor com o ficheiro de configuração especificado (torrc)"
+msgstr "Iniciar o software Tor com o ficheiro de configuração especificado (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -174,18 +171,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"A configuração Tor de localização de ficheiros contém caracteres que não "
-"podem ser representados no seu actual sistema de codificação de caracteres "
-"de 8 bits."
+msgstr "A configuração Tor de localização de ficheiros contém caracteres que não podem ser representados no seu actual sistema de codificação de caracteres de 8 bits."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"O directório de dados Tor especificado, contém caracteres que não podem ser "
-"representados no seu actual sistema de codificação de caracteres de 8 bits."
+msgstr "O directório de dados Tor especificado, contém caracteres que não podem ser representados no seu actual sistema de codificação de caracteres de 8 bits."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -209,13 +201,17 @@ msgstr "Configurar automaticamente o ControlPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"O Vidalia falhou na remoção do serviço Tor.\n"
-"\n"
-"Pode ter que o remover manualmente."
+msgstr "O Vidalia falhou na remoção do serviço Tor.\n\nPode ter que o remover manualmente."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -237,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "O Vidalia não pôde carregar a tradução no idioma seleccionado."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Desde:"
@@ -457,9 +470,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"O Vidalia estabeleceu uma ligação a um processo do Tor que necessita de "
-"palavra-passe. Por favor introduza a sua palavra-passe:"
+msgstr "O Vidalia estabeleceu uma ligação a um processo do Tor que necessita de palavra-passe. Por favor introduza a sua palavra-passe:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1297,9 +1308,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Fomos incapazes de reiniciar o Vidalia automaticamente. Por favor reinicie "
-"manualmente."
+msgstr "Fomos incapazes de reiniciar o Vidalia automaticamente. Por favor reinicie manualmente."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1309,27 +1318,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Foi criado um relatório de erro que pode enviar para os programadores do "
-"Vidalia ajudando-os a identificar e corrigir o problema. O relatório "
-"submetido não contém qualquer informação pessoal."
+msgstr "Foi criado um relatório de erro que pode enviar para os programadores do Vidalia ajudando-os a identificar e corrigir o problema. O relatório submetido não contém qualquer informação pessoal."
 
 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 ""
-"com a descrição do que estava fazendo antes da aplicação parar, a par com os"
-" ficheiros seguintes que correspondem ao relatório de erro:"
+msgstr "com a descrição do que estava fazendo antes da aplicação parar, a par com os ficheiros seguintes que correspondem ao relatório de erro:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1548,10 +1550,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"O Vidalia pode abrir a hiperligação que escolheu no seu navegador padrão. Se"
-" o seu navegador não estiver configurado para utilizar o Tor então os seus "
-"pedidos não serão anónimos."
+msgstr "O Vidalia pode abrir a hiperligação que escolheu no seu navegador padrão. Se o seu navegador não estiver configurado para utilizar o Tor então os seus pedidos não serão anónimos."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1565,9 +1564,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"O Vidalia foi incapaz de abrir a ligação seleccionada no seu Navegador Web. "
-"Pode ainda copiar o URL e colá-lo no seu Navegador Web."
+msgstr "O Vidalia foi incapaz de abrir a ligação seleccionada no seu Navegador Web. Pode ainda copiar o URL e colá-lo no seu Navegador Web."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1778,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectado à rede Tor"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicialização não reconhecido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diversos"
 
@@ -1849,10 +1842,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"O Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para "
-"garantir o nome e a localização correta do executável do Tor foram "
-"especificados."
+msgstr "O Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para garantir o nome e a localização correta do executável do Tor foram especificados."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1890,9 +1880,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"O software Tor requer que o Vidalia envie o conteúdo de um cookie de "
-"autenticação, mas o Vidalia foi incapaz de encontrar um."
+msgstr "O software Tor requer que o Vidalia envie o conteúdo de um cookie de autenticação, mas o Vidalia foi incapaz de encontrar um."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1914,9 +1902,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"O Vidalia foi incapaz de registar-se para alguns eventos. Muitas das "
-"características do Vidalia podem estar indisponíveis."
+msgstr "O Vidalia foi incapaz de registar-se para alguns eventos. Muitas das características do Vidalia podem estar indisponíveis."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1928,9 +1914,7 @@ msgstr "Vidalia foi incapaz de autenticar o software Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Por favor, verifique as suas configurações de autenticação da porta de "
-"controle."
+msgstr "Por favor, verifique as suas configurações de autenticação da porta de controle."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1940,9 +1924,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"A versão instalada do Tor está desactualizada ou deixou de ser recomendada. "
-"Por favor, visite o página do Tor para descarregar a última versão."
+msgstr "A versão instalada do Tor está desactualizada ou deixou de ser recomendada. Por favor, visite o página do Tor para descarregar a última versão."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1952,8 +1934,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Todas as ligações seguintes irão parecer diferentes das ligações antigas."
+msgstr "Todas as ligações seguintes irão parecer diferentes das ligações antigas."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1965,8 +1946,7 @@ msgstr "Falha na Porta de Reencaminhamento"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"O Vidalia foi incapaz de configurar o reencaminhamento automático da porta."
+msgstr "O Vidalia foi incapaz de configurar o reencaminhamento automático da porta."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
@@ -2049,23 +2029,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia tentou redefinir a palavra-chave de controlo do Tor, mas foi incapaz"
-" de reiniciar o software Tor. Por favor, verifique o seu Gestor de Tarefas "
-"para garantir que não há outros processos Tor em execução."
+msgstr "Vidalia tentou redefinir a palavra-chave de controlo do Tor, mas foi incapaz de reiniciar o software Tor. Por favor, verifique o seu Gestor de Tarefas para garantir que não há outros processos Tor em execução."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"A versão instalada do Tor está desactualizada ou deixou de ser recomendada."
+msgstr "A versão instalada do Tor está desactualizada ou deixou de ser recomendada."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Gostaria de verificar se um novo pacote está disponível para instalação? "
+msgstr "Gostaria de verificar se um novo pacote está disponível para instalação? "
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2075,9 +2050,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"O Tor encerrou automaticamente a sua ligação a fim de proteger o seu "
-"anonimato."
+msgstr "O Tor encerrou automaticamente a sua ligação a fim de proteger o seu anonimato."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2091,9 +2064,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Neste momento não estão disponíveis novos pacotes de software Tor para o seu"
-" computador."
+msgstr "Neste momento não estão disponíveis novos pacotes de software Tor para o seu computador."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2112,10 +2083,25 @@ 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."
-msgstr ""
-"Qualquer coisa enviada por esta ligação pode estar a ser monitorizada. Por "
-"favor verifique a configuração da sua aplicação e use apenas protocolos "
-"encriptados como o SSL, se possível."
+msgstr "Qualquer coisa enviada por esta ligação pode estar a ser monitorizada. Por favor verifique a configuração da sua aplicação e use apenas protocolos encriptados como o SSL, se possível."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Iniciando torrc de %1 para %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(provavelmente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(provavelmente um cliente de email)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Uma das suas aplicações %1 parece estar a fazer uma potencial conexão desincriptada e insegura ao porto %2"
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2125,49 +2111,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"O seu retransmissor está a encerrar.\n"
-"Clique 'Stop' novamente para parar o seu retransmissor agora."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Iniciando torrc de %1 para %2"
+msgstr "O seu retransmissor está a encerrar.\nClique 'Stop' novamente para parar o seu retransmissor agora."
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ""
-"Está actualmente a executar um retransmissor. Encerrando o seu retransmissor irá interromper qualquer conexão aberta de clientes.\n"
-"\n"
-"Gostaria de encerrar graciosamente e dar tempo aos clientes para encontrar um novo retransmissor?"
 
 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 ""
-"Vidalia detectou que o software Tor encerrou inesperadamente.\n"
-"\n"
-"Por favor, verifique no seu registo de mensagens se há mensagens de aviso ou de erro."
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de email)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Está actualmente a executar um retransmissor. Encerrando o seu retransmissor irá interromper qualquer conexão aberta de clientes.\n\nGostaria de encerrar graciosamente e dar tempo aos clientes para encontrar um novo retransmissor?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Uma das suas aplicações %1 parece estar a fazer uma potencial conexão "
-"desincriptada e insegura ao porto %2"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia detectou que o software Tor encerrou inesperadamente.\n\nPor favor, verifique no seu registo de mensagens se há mensagens de aviso ou de erro."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2191,9 +2164,7 @@ msgstr "O Nome do Arquivo de Registo é Requerido"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Tem de escrever um nome de ficheiro para ser capaz de salvar o registo "
-"mensagens para um ficheiro."
+msgstr "Tem de escrever um nome de ficheiro para ser capaz de salvar o registo mensagens para um ficheiro."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2265,8 +2236,7 @@ msgstr "Copiar"
 
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr ""
-"Copiar as mensagens seleccionadas para a área de transferência (Ctrl+C)"
+msgstr "Copiar as mensagens seleccionadas para a área de transferência (Ctrl+C)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+C"
@@ -2418,9 +2388,7 @@ msgstr "Navegar"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Habilitar o salvamento automático de todas as mensagens novas do registo "
-"para um ficheiro"
+msgstr "Habilitar o salvamento automático de todas as mensagens novas do registo para um ficheiro"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2446,17 +2414,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Mensagens que aparecem quando algo\n"
-"de muito errado aconteceu e o Tor não consegue prosseguir."
+msgstr "Mensagens que aparecem quando algo\nde muito errado aconteceu e o Tor não consegue prosseguir."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Mensagens que apenas aparecem quando \n"
-"algo está errado com o Tor."
+msgstr "Mensagens que apenas aparecem quando \nalgo está errado com o Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2464,37 +2428,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Mensagens que aparecem  pouco frequentemente\n"
-"durante o funcionamento normal do Tor e não \n"
-"são considerados erros, mas você podem\n"
-"interessar-lhe."
+msgstr "Mensagens que aparecem  pouco frequentemente\ndurante o funcionamento normal do Tor e não \nsão considerados erros, mas você podem\ninteressar-lhe."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Mensagens que aparecem frequentemente \n"
-"durante o normal funcionamento do Tor."
+msgstr "Mensagens que aparecem frequentemente \ndurante o normal funcionamento do Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Mensagens Hiper-palavrosas de interesse, \n"
-"principalmente, para os programadores do Tor."
+msgstr "Mensagens Hiper-palavrosas de interesse, \nprincipalmente, para os programadores do Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Não é possível guardar o ficheiro %1\n"
-"\n"
-"%2."
+msgstr "Não é possível guardar o ficheiro %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2601,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ponte inválida"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A ponte especificada não é válida."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiar (Ctrl+C)"
 
@@ -2616,17 +2561,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Deve especificar tanto um endereço IP ou nome do hospedeiro como um número "
-"de porta para configurar o Tor a utilizar um proxy para aceder à Internet."
+msgstr "Deve especificar tanto um endereço IP ou nome do hospedeiro como um número de porta para configurar o Tor a utilizar um proxy para aceder à Internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Deve especificar uma ou mais portas para que o seu firewall permita a sua "
-"ligação."
+msgstr "Deve especificar uma ou mais portas para que o seu firewall permita a sua ligação."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2658,9 +2599,7 @@ msgstr "Porta:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Verificar se apenas se conecta a retransmissores que utilizam as portas "
-"permitidas pela firewall"
+msgstr "Verificar se apenas se conecta a retransmissores que utilizam as portas permitidas pela firewall"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2682,9 +2621,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Verificar pedidos para criptografar pastas e, opcionalmente, utilizar uma "
-"bridge de retransmissão para aceder à rede Tor"
+msgstr "Verificar pedidos para criptografar pastas e, opcionalmente, utilizar uma bridge de retransmissão para aceder à rede Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2712,8 +2649,7 @@ msgstr "Procurar Bridges Agora"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">De que outra forma posso encontrar pontes?</a>"
+msgstr "<a href=\"bridges.finding\">De que outra forma posso encontrar pontes?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2723,14 +2659,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Não existem actualmente bridges disponíveis. Pode esperar um pouco e tentar "
-"novamente ou tentar outro método de localização de bridges."
+msgstr "Não existem actualmente bridges disponíveis. Pode esperar um pouco e tentar novamente ou tentar outro método de localização de bridges."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Clique na Ajuda para ver outros métodos de localização de novas bridges."
+msgstr "Clique na Ajuda para ver outros métodos de localização de novas bridges."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2753,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Aceitar"
@@ -2916,17 +2849,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Configurou o Tor para actuar como uma ponte retransmissora para utilizadores"
-" censurados, mas a sua versão do Tor não suporta pontes."
+msgstr "Configurou o Tor para actuar como uma ponte retransmissora para utilizadores censurados, mas a sua versão do Tor não suporta pontes."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Actualize o seu software Tor ou configure-o para actuar como um "
-"retransmissor normal Tor."
+msgstr "Actualize o seu software Tor ou configure-o para actuar como um retransmissor normal Tor."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2941,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "Executar apenas como cliente"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Retransmitir o tráfego para a rede Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta da Retransmissão:"
 
@@ -2982,9 +2907,7 @@ msgstr "Nome do seu retransmissor"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Porta em que utilizadores e outros retransmissores podem se comunicar com o "
-"seu retransmissor"
+msgstr "Porta em que utilizadores e outros retransmissores podem se comunicar com o seu retransmissor"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2998,9 +2921,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Para ligações de internet de alta velocidade de download mas baixa de "
-"upload, por favor liste sua velocidade de upload aqui."
+msgstr "Para ligações de internet de alta velocidade de download mas baixa de upload, por favor liste sua velocidade de upload aqui."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3058,9 +2979,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"A sua taxa de largura de banda máxima deve ser igual ou superior à sua taxa "
-"média de largura de banda. Ambos os valores devem ser, no mínimo, 20 KB/s."
+msgstr "A sua taxa de largura de banda máxima deve ser igual ou superior à sua taxa média de largura de banda. Ambos os valores devem ser, no mínimo, 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3092,9 +3011,7 @@ msgstr "Miscelânea Outros Serviços"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"Portas 706, 1863, 5050, 5190, 5222, 8300 e 8888 {706, 1863, 5050, 5190, "
-"5222, 5223, 8300 ?}"
+msgstr "Portas 706, 1863, 5050, 5190, 5222, 8300 e 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3123,17 +3040,13 @@ msgstr "Mostrar tópicos de ajuda sobre as políticas de saída"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Quais são os recursos da Internet que os utilizadores poderão aceder a "
-"partir do seu retransmissor?"
+msgstr "Quais são os recursos da Internet que os utilizadores poderão aceder a partir do seu retransmissor?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"O Tor ainda bloqueará por defeito, alguns e-mail's de saída e aplicações de "
-"partilha de ficheiros para reduzir o spam e outros abusos."
+msgstr "O Tor ainda bloqueará por defeito, alguns e-mail's de saída e aplicações de partilha de ficheiros para reduzir o spam e outros abusos."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3146,9 +3059,7 @@ msgstr "Permitir que outros acedam à ponte, por lhes dar esta linha:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Esta é a identidade da sua ponte de retransmissão que poderá dar a outras "
-"pessoas"
+msgstr "Esta é a identidade da sua ponte de retransmissão que poderá dar a outras pessoas"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3166,9 +3077,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Deixe a correr o seu retransmissor para que os clientes tenham mais "
-"hipóteses de o encontrar e usar."
+msgstr "Deixe a correr o seu retransmissor para que os clientes tenham mais hipóteses de o encontrar e usar."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3182,9 +3091,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor encontrou uma resposta formatada incorrectamente quando o Vidalia "
-"solicitou o histórico de utilização da sua ponte."
+msgstr "Tor encontrou uma resposta formatada incorrectamente quando o Vidalia solicitou o histórico de utilização da sua ponte."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3207,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuir automaticamente o endereço da minha ponte"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Espelhar a Pasta de Retransmissão"
 
@@ -3214,10 +3129,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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\n"
-"se ocorrer algum problema com o seu retransmissor.\n"
-"Pode também incluir a sua impressão digital PGP ou GPG."
+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"
@@ -3227,9 +3139,7 @@ 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."
+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"
@@ -3297,9 +3207,7 @@ msgstr "Copiar para o clipboard o endereço cebola do serviço seleccionado"
 
 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"
+msgstr "Navegue no sistema de ficheiros local e escolha pasta para o serviço seleccionado"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3326,10 +3234,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Prima \"Iniciar Tor\" no painel de controlo do Vidalia para reiniciar o "
-"software Tor. Se o Tor desligar inesperadamente, seleccione a aba "
-"\"Avançado\" para detalhes acerca de quaisquer erros encontrados. "
+msgstr "Prima \"Iniciar Tor\" no painel de controlo do Vidalia para reiniciar o software Tor. Se o Tor desligar inesperadamente, seleccione a aba \"Avançado\" para detalhes acerca de quaisquer erros encontrados. "
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3337,11 +3242,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Está actualmente a correr a versão \"%1\" do software Tor, que já não é "
-"recomendada. Por favor melhore para a versão mais recente do software, que "
-"pode conter melhoramentos importantes de segurança, fiabilidade e "
-"desempenho."
+msgstr "Está actualmente a correr a versão \"%1\" do software Tor, que já não é recomendada. Por favor melhore para a versão mais recente do software, que pode conter melhoramentos importantes de segurança, fiabilidade e desempenho."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3349,11 +3250,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Está actualmente a correr a versão \"%1\" do software Tor, que pode já não "
-"funcionar na actual rede Tor. Por favor melhore para a versão mais recente "
-"do software, que pode conter melhoramentos importantes de segurança, "
-"fiabilidade e desempenho."
+msgstr "Está actualmente a correr a versão \"%1\" do software Tor, que pode já não funcionar na actual rede Tor. Por favor melhore para a versão mais recente do software, que pode conter melhoramentos importantes de segurança, fiabilidade e desempenho."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3367,9 +3264,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Conseguimos estabelecer com sucesso uma ligação à rede Tor. Poderá agora "
-"configurar as suas aplicações para usar a internet anonimamente."
+msgstr "Conseguimos estabelecer com sucesso uma ligação à rede Tor. Poderá agora configurar as suas aplicações para usar a internet anonimamente."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3379,9 +3274,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"O software Tor encontrou um erro interno. Por favor reporte a seguinte "
-"mensagem de erro aos programadores em bugs.torproject.org:\"%1\"\n"
+msgstr "O software Tor encontrou um erro interno. Por favor reporte a seguinte mensagem de erro aos programadores em bugs.torproject.org:\"%1\"\n"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3389,11 +3282,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"O Tor determinou que o relógio do seu computador pode estar atrasado %1 "
-"segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o"
-" Tor não poderá funcionar. Por favor verifique se o seu computador tem a "
-"hora correcta."
+msgstr "O Tor determinou que o relógio do seu computador pode estar atrasado %1 segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o Tor não poderá funcionar. Por favor verifique se o seu computador tem a hora correcta."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3401,11 +3290,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"O Tor determinou que o relógio do seu computador pode estar adiantado %1 "
-"segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o"
-" Tor não poderá funcionar. Por favor verifique se o seu computador tem a "
-"hora correcta."
+msgstr "O Tor determinou que o relógio do seu computador pode estar adiantado %1 segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o Tor não poderá funcionar. Por favor verifique se o seu computador tem a hora correcta."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3417,21 +3302,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Uma das aplicações do seu computador pode ter tentado fazer uma ligação não "
-"encriptada através do Tor pela porta %1. Enviar informação não encriptada "
-"através da rede Tor é perigoso e não recomendado. Para sua protecção, o Tor "
-"fechou automaticamente esta ligação."
+msgstr "Uma das aplicações do seu computador pode ter tentado fazer uma ligação não encriptada através do Tor pela porta %1. Enviar informação não encriptada através da rede Tor é perigoso e não recomendado. Para sua protecção, o Tor fechou automaticamente esta ligação."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Uma das aplicações do seu computador pode ter tentado fazer uma ligação não "
-"encriptada através do Tor pela porta %1. Enviar informação não encriptada "
-"através da rede Tor é perigoso e não recomendado."
+msgstr "Uma das aplicações do seu computador pode ter tentado fazer uma ligação não encriptada através do Tor pela porta %1. Enviar informação não encriptada através da rede Tor é perigoso e não recomendado."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3443,11 +3321,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\" "
-"usando um protocolo que pode verter informação acerca do seu destino. Por "
-"favor configure as suas aplicações para usar apenas SOCKS4a ou SOCKS5 com "
-"resolução remota de nome de hospedeiro. "
+msgstr "Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\" usando um protocolo que pode verter informação acerca do seu destino. Por favor configure as suas aplicações para usar apenas SOCKS4a ou SOCKS5 com resolução remota de nome de hospedeiro. "
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3458,11 +3332,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Uma das suas aplicações tentou estabelecer uma ligação através do Tor usando"
-" um protocolo que não é reconhecidor. Por favor configure as suas aplicações"
-" para usar apenas SOCKS4a ou SOCKS5 com resolução remota de nome de "
-"hospedeiro. "
+msgstr "Uma das suas aplicações tentou estabelecer uma ligação através do Tor usando um protocolo que não é reconhecidor. Por favor configure as suas aplicações para usar apenas SOCKS4a ou SOCKS5 com resolução remota de nome de hospedeiro. "
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3473,10 +3343,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\", "
-"que o Tor não reconhece como nome de hospedeiro válido. Por favor verifique "
-"a configuração das suas aplicações."
+msgstr "Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\", que o Tor não reconhece como nome de hospedeiro válido. Por favor verifique a configuração das suas aplicações."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3487,10 +3354,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"O Tor determinou que o IP público do seu retransmissor é actualmente %1%2. "
-"Se isto não for correcto, por favor considere usar a opção ?Endereço? na "
-"configuração do seu retransmissor."
+msgstr "O Tor determinou que o IP público do seu retransmissor é actualmente %1%2. Se isto não for correcto, por favor considere usar a opção ?Endereço? na configuração do seu retransmissor."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3501,22 +3365,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"O Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para "
-"domínios que não existem. Alguns ISPs e outros fornecedores de DNS, como o "
-"OpenDNS, são conhecidos por isto para poderem mostrar as suas próprias "
-"procuras ou páginas de anúncios."
+msgstr "O Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para domínios que não existem. Alguns ISPs e outros fornecedores de DNS, como o OpenDNS, são conhecidos por isto para poderem mostrar as suas próprias procuras ou páginas de anúncios."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para "
-"domínios bem conhecidos. Uma vez que os clientes confiam nos retransmissores"
-" da rede Tor para fornecer respostas DNS precisas, o seu retransmissor não "
-"será configurado como um retransmissor de saída."
+msgstr "Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para domínios bem conhecidos. Uma vez que os clientes confiam nos retransmissores da rede Tor para fornecer respostas DNS precisas, o seu retransmissor não será configurado como um retransmissor de saída."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3527,10 +3383,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor está tentando determinar se o porto do relay está acessível a partir da "
-"rede do Tor, ligando-se a ele próprio em %1:%2. Este teste pode demorar "
-"vários minutos."
+msgstr "Tor está tentando determinar se o porto do relay está acessível a partir da rede do Tor, ligando-se a ele próprio em %1:%2. Este teste pode demorar vários minutos."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3538,8 +3391,7 @@ msgstr "Teste de acessibilidade da porta do servidor com sucesso!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-"A porta do servidor do seu retransmissor é acessível desde a rede Tor!"
+msgstr "A porta do servidor do seu retransmissor é acessível desde a rede Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
@@ -3551,11 +3403,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"A porta de servidor do seu retransmissor não é acessível por outros clientes"
-" Tor. Isto pode acontecer se tiver um router ou uma firewall que requeira "
-"uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de servidor "
-"correctopor favor verifique a configuraçaõ do seu retransmissor."
+msgstr "A porta de servidor do seu retransmissor não é acessível por outros clientes Tor. Isto pode acontecer se tiver um router ou uma firewall que requeira uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de servidor correctopor favor verifique a configuraçaõ do seu retransmissor."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3566,10 +3414,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"O Tor está a tentar determinar se o directório de portas do seu "
-"retransmissor é acessível pela rede Tor, ligando-se a si em %1:%2. Este "
-"teste pode deorar vários minutos."
+msgstr "O Tor está a tentar determinar se o directório de portas do seu retransmissor é acessível pela rede Tor, ligando-se a si em %1:%2. Este teste pode deorar vários minutos."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3577,8 +3422,7 @@ msgstr "Teste de acessibilidade do directório de portas com sucesso!"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-"O directório de portas do seu retransmissor é acessível pela rede Tor!"
+msgstr "O directório de portas do seu retransmissor é acessível pela rede Tor!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
@@ -3590,11 +3434,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"O directório de portas do seu retransmissor não é acessível por outros "
-"clientes Tor. Isto pode acontecer se tiver um router ou uma firewall que "
-"requeira uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de "
-"servidor correctopor favor verifique a configuraçaõ do seu retransmissor."
+msgstr "O directório de portas do seu retransmissor não é acessível por outros clientes Tor. Isto pode acontecer se tiver um router ou uma firewall que requeira uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de servidor correctopor favor verifique a configuraçaõ do seu retransmissor."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3604,10 +3444,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"O descritor do seu retransmissor, que permite aos clientes ligarem-se ao seu"
-" retransmissor foi rejeitado pelo servidor do directório em %1:%2. A razão "
-"dada foi: %3"
+msgstr "O descritor do seu retransmissor, que permite aos clientes ligarem-se ao seu retransmissor foi rejeitado pelo servidor do directório em %1:%2. A razão dada foi: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3619,11 +3456,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"O seu retransmissor está agora online e disponível para os clientes Tor "
-"usarem. Deverá notar um aumento no tráfego de rede mostrado no Gráfico de "
-"Largura de Banda dentro de algumas horas, à medida que mais clientes saibam "
-"do seu retransmissor. Obrigado por contribuir para a rede Tor."
+msgstr "O seu retransmissor está agora online e disponível para os clientes Tor usarem. Deverá notar um aumento no tráfego de rede mostrado no Gráfico de Largura de Banda dentro de algumas horas, à medida que mais clientes saibam do seu retransmissor. Obrigado por contribuir para a rede Tor."
 
 msgctxt "Stream"
 msgid "New"
@@ -3685,9 +3518,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Gravar definições. Se não marcado, só se aplicará às definições actuais do "
-"Tor."
+msgstr "Gravar definições. Se não marcado, só se aplicará às definições actuais do Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3727,8 +3558,7 @@ msgstr "Erro ao conectar ao Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Selecção vazia. Por favor seleccione algum texto, ou escolha Aplicar a todos"
+msgstr "Selecção vazia. Por favor seleccione algum texto, ou escolha Aplicar a todos"
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3752,8 +3582,7 @@ msgstr "Não foram encontrados aparelhos activados para UPnP"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Não foram encontrados aparelhos de porta de Internet activados para UPnP "
+msgstr "Não foram encontrados aparelhos de porta de Internet activados para UPnP "
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
@@ -3803,17 +3632,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia foi incapaz de verificar se há actualizações de software "
-"disponíveis, porque não pôde encontrar '%1'."
+msgstr "Vidalia foi incapaz de verificar se há actualizações de software disponíveis, porque não pôde encontrar '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia foi incapaz de verificar a existência de actualizações do software "
-"porque o processo de actualização do Tor terminou inesperadamente."
+msgstr "Vidalia foi incapaz de verificar a existência de actualizações do software porque o processo de actualização do Tor terminou inesperadamente."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3865,9 +3690,7 @@ msgstr "Instalar"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Os seguintes pacotes de softwares actualizados estão prontos para "
-"instalação:"
+msgstr "Os seguintes pacotes de softwares actualizados estão prontos para instalação:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3990,10 +3813,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Possivelmente já está em execução outro processo Vidalia. Se realmente não estiver em execução outro processo do Vidalia, pode optar por continuar de qualquer maneira.\n"
-"\n"
-"Gostaria de continuar a iniciar o Vidalia?"
+msgstr "Possivelmente já está em execução outro processo Vidalia. Se realmente não estiver em execução outro processo do Vidalia, pode optar por continuar de qualquer maneira.\n\nGostaria de continuar a iniciar o Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4026,5 +3846,3 @@ msgstr "%1 horas"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minutos"
-
-
diff --git a/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po b/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po
index 0c69e51..061fc85 100644
--- a/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po
+++ b/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <amimyself@xxxxxxxxxx>, 2011.
 # Filipe  <nfscp@xxxxxxxxx>, 2012.
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-02 15:27+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: Filipe <nfscp@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -203,9 +203,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 já existe.\n"
-"Você deseja sobrescrevê-lo?"
+msgstr "%1 já existe.\nVocê deseja sobrescrevê-lo?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -213,10 +211,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Arquivo não encontrado.\n"
-"Por favor verifique se o nome do arquivo foi correctamente introduzido."
+msgstr "%1\nArquivo não encontrado.\nPor favor verifique se o nome do arquivo foi correctamente introduzido."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -274,19 +269,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Directório não encontrado.\n"
-"Por favor verifique se o nome do directório foi corretamente introduzido."
+msgstr "%1\nDirectório não encontrado.\nPor favor verifique se o nome do directório foi corretamente introduzido."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' é protegido contra cópia.\n"
-"Você quer realmente apagá-lo ?"
+msgstr "'%1' é protegido contra cópia.\nVocê quer realmente apagá-lo ?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -383,9 +373,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>O nome \"%1\" não pode ser usado.</b><p>Tente um nome com menos "
-"caracteres ou sem pontuação."
+msgstr "<b>O nome \"%1\" não pode ser usado.</b><p>Tente um nome com menos caracteres ou sem pontuação."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -446,5 +434,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
index d02cc4a..739ca81 100644
--- a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
+++ b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
@@ -2,15 +2,17 @@
 # Translators:
 #   <amimyself@xxxxxxxxxx>, 2011.
 # daniel  <>, 2012.
+# Erick de Oliveira Leal <>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 # Sérgio  <theparish2@xxxxxxxxx>, 2012.
+#   <viniciusandrade@xxxxxxxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-31 20:57+0000\n"
-"Last-Translator: yermandu daniel <yermandu@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-30 15:27+0000\n"
+"Last-Translator: Erick de Oliveira Leal <>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -118,8 +120,7 @@ msgstr "Arquivo de configuração do Tor"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Inicie o aplicativo Tor com o arquivo de configuração específico (torrc)"
+msgstr "Inicie o aplicativo Tor com o arquivo de configuração específico (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -173,18 +174,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"O local do arquivo especificado Tor de configuração contém caracteres que "
-"não podem ser representadas em seu sistema de codificação de caracteres "
-"atual de 8 bits."
+msgstr "O local do arquivo especificado Tor de configuração contém caracteres que não podem ser representadas em seu sistema de codificação de caracteres atual de 8 bits."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"O caminho do diretório especificado para o Tor contém caracteres que não "
-"podem ser representados na atual codificação em 8 bits no seu sistema. "
+msgstr "O caminho do diretório especificado para o Tor contém caracteres que não podem ser representados na atual codificação em 8 bits no seu sistema. "
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -208,13 +204,17 @@ msgstr "Configurar ControlPort automaticamente"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Você marcou a opção de configuração automática para o ControlPort, mas não forneceu qualquer diretório de dados. Por favor, adicione um ou desmarque a opção \"Configurar ControlPort automaticamente\"."
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"O Vidalia foi incapaz de remover o serviço Tor.\n"
-"\n"
-"Pode ser necessário removê-lo automaticamente."
+msgstr "O Vidalia foi incapaz de remover o serviço Tor.\n\nPode ser necessário removê-lo automaticamente."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -236,6 +236,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "O Vidalia foi incapaz de carregar a tradução selecionada"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "System Icon Preferences (as alterações terão efeito quando você reiniciar Vidalia)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "Mostre o Tray Icon e Dock Icon (padrão)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "Esconda o Tray Icon"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "Esconda o Dock Icon"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Desde:"
@@ -456,9 +473,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"O Vidalia conectou à um processo Tor existente que requer uma senha. Por "
-"favor insira a sua senha de controle:"
+msgstr "O Vidalia conectou à um processo Tor existente que requer uma senha. Por favor insira a sua senha de controle:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1296,9 +1311,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Não foi possível reiniciar o Vidalia automaticamente. Por favor, reinicie o "
-"Vidalia manualmente."
+msgstr "Não foi possível reiniciar o Vidalia automaticamente. Por favor, reinicie o Vidalia manualmente."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1308,28 +1321,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Um relatório de erro foi criado e você pode enviá-lo aos desenvolvedores do "
-"Vidalia para ajudar a identificar e resolver o problema. Um relatório "
-"enviado não contém nenhuma informação de identificação pessoal."
+msgstr "Um relatório de erro foi criado e você pode enviá-lo aos desenvolvedores do Vidalia para ajudar a identificar e resolver o problema. Um relatório enviado não contém nenhuma informação de identificação pessoal."
 
 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 ""
-"com uma descrição do que você estava fazendo antes da aplicação quebrar, "
-"juntamente com os seguintes arquivos correspondentes ao relatório de "
-"acidente:"
+msgstr "com uma descrição do que você estava fazendo antes da aplicação quebrar, juntamente com os seguintes arquivos correspondentes ao relatório de acidente:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1548,10 +1553,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"O Vidalia pode abrir o link seleciona no seu navegador padrão. Se seu "
-"navegador não estiver atualmente configurado para usar o Tor, esta ação não "
-"será anonima."
+msgstr "O Vidalia pode abrir o link seleciona no seu navegador padrão. Se seu navegador não estiver atualmente configurado para usar o Tor, esta ação não será anonima."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1565,9 +1567,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"O Vidalia foi incapaz de abrir o link selecionado. Alternativamente você "
-"pode copiar o link e colar na barra de endereços do seu navegador."
+msgstr "O Vidalia foi incapaz de abrir o link selecionado. Alternativamente você pode copiar o link e colar na barra de endereços do seu navegador."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1727,9 +1727,7 @@ msgstr "Erro ao iniciar cliente de mensagens instantâneas"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-"O Vidalia foi incapaz de iniciar o cliente de mensagens instantâneas "
-"configurado"
+msgstr "O Vidalia foi incapaz de iniciar o cliente de mensagens instantâneas configurado"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
@@ -1780,10 +1778,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectado à rede Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Estado de inicio não reconhecido"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "variados"
 
@@ -1851,10 +1845,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para "
-"assegurar-se de que o nome e a localização do aplicativo Tor foram "
-"apropriadamente ajustadas."
+msgstr "Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para assegurar-se de que o nome e a localização do aplicativo Tor foram apropriadamente ajustadas."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1892,14 +1883,11 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"O aplicativo Tor necessita que o Vidalia envie um cookie de autenticação, no"
-" entanto ele foi incapaz de encontra-lo."
+msgstr "O aplicativo Tor necessita que o Vidalia envie um cookie de autenticação, no entanto ele foi incapaz de encontra-lo."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"Você gostaria de procurar o arquivo 'control_auth_cookie' manualmente?"
+msgstr "Você gostaria de procurar o arquivo 'control_auth_cookie' manualmente?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
@@ -1917,9 +1905,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia foi incapaz de registrar alguns eventos. Dessa forma, muitas de suas"
-" funções ficarão indisponíveis."
+msgstr "Vidalia foi incapaz de registrar alguns eventos. Dessa forma, muitas de suas funções ficarão indisponíveis."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1941,10 +1927,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"A versão atualmente instalada do Tor está desatualizada ou não é mais "
-"recomendada. Por favor visite a página do Tor para obter a versão mais "
-"recente."
+msgstr "A versão atualmente instalada do Tor está desatualizada ou não é mais recomendada. Por favor visite a página do Tor para obter a versão mais recente."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1966,9 +1949,7 @@ msgstr "Falha ao encaminhar porta"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia foi incapaz de configurar o encaminhamento de portas "
-"automaticamente."
+msgstr "Vidalia foi incapaz de configurar o encaminhamento de portas automaticamente."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
@@ -2051,24 +2032,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia tentou restabelecer a senha de controle do Tor, no entanto foi "
-"incapaz de reiniciar este aplicativo. Por favor verifique se não existe "
-"outra instancia do Tor em execução."
+msgstr "Vidalia tentou restabelecer a senha de controle do Tor, no entanto foi incapaz de reiniciar este aplicativo. Por favor verifique se não existe outra instancia do Tor em execução."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"A versão do Tor atualmente instalada está desatualizada ou não é mais "
-"recomendada."
+msgstr "A versão do Tor atualmente instalada está desatualizada ou não é mais recomendada."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Gostaria de conferir se um novo pacote está disponível para instalação?"
+msgstr "Gostaria de conferir se um novo pacote está disponível para instalação?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2078,9 +2053,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"O Tor fechou a sua conexão automaticamente afim de proteger a sua "
-"anonimidade."
+msgstr "O Tor fechou a sua conexão automaticamente afim de proteger a sua anonimidade."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2094,9 +2067,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Não há nenhum pacote do programa Tor disponível para o seu computador no "
-"momento."
+msgstr "Não há nenhum pacote do programa Tor disponível para o seu computador no momento."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2115,10 +2086,25 @@ 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."
-msgstr ""
-"Tudo o que for enviado por esta conexão pode estar sendo monitorado. Por "
-"favor, verifique a configuração do seu programa e use somente protocolos "
-"encriptados, tais como SSL, se possível.  "
+msgstr "Tudo o que for enviado por esta conexão pode estar sendo monitorado. Por favor, verifique a configuração do seu programa e use somente protocolos encriptados, tais como SSL, se possível.  "
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Inicialização do torrc %1 de %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(provavelmente Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(provavelmente um cliente de e-mail)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Um dos seus programas %1 parece estar fazendo uma conexão potencialmente desencriptada e insegura pela porta %2"
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2128,49 +2114,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Seu condutor está sendo fechado.\n"
-"Clique em 'Parar' denovo para parar o seu condutor agora."
+msgstr "Seu condutor está sendo fechado.\nClique em 'Parar' denovo para parar o seu condutor agora."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Inicialização do torrc %1 de %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia não pode comunicar com Tor porque não pode acessar o arquivo: %1\n\nAqui está a última mensagem de erro:\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 "Parece que Tor parou de funcionar desde que Vidalia começou.\n\nVeja o log de mensagens avançada para mais informações."
 
 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?"
-msgstr ""
-"Você está atualmente rodando um condutor. Finalizar o seu condutor interromperá qualquer conexões abertas de clientes.\n"
-"\n"
-"Você gostaria de fechar graciosamente e dar aos clientes tempo para encontrar um novo condutor?"
+msgstr "Você está atualmente rodando um condutor. Finalizar o seu condutor interromperá qualquer conexões abertas de clientes.\n\nVocê gostaria de fechar graciosamente e dar aos clientes tempo para encontrar um novo condutor?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"O Vidalia detectou que o programa Tor fechou inesperadamente.\n"
-"\n"
-"Por favor confira o registro de mensagens para avisos ou mensagens de erro recentes."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de e-mail)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Um dos seus programas %1 parece estar fazendo uma conexão potencialmente "
-"desencriptada e insegura pela porta %2"
+msgstr "O Vidalia detectou que o programa Tor fechou inesperadamente.\n\nPor favor confira o registro de mensagens para avisos ou mensagens de erro recentes."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2194,9 +2167,7 @@ msgstr "Necessário nome do arquivo de registro"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Você precisa informar um nome de arquivo onde as mensagens de registro serão"
-" salvas."
+msgstr "Você precisa informar um nome de arquivo onde as mensagens de registro serão salvas."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2420,9 +2391,7 @@ msgstr "Procurar"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Habilitar salvamento automático de novas mensagens de registro para um "
-"arquivo"
+msgstr "Habilitar salvamento automático de novas mensagens de registro para um arquivo"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2448,9 +2417,7 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Mensagens que aparecem quando algo deu muito errado e o Tor não pode "
-"prosseguir."
+msgstr "Mensagens que aparecem quando algo deu muito errado e o Tor não pode prosseguir."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2464,33 +2431,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Mensagens que aparecem raramente durante a operação normal do Tor e não são "
-"consideradas erros, mas que podem lhe importar."
+msgstr "Mensagens que aparecem raramente durante a operação normal do Tor e não são consideradas erros, mas que podem lhe importar."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Mensagens que aparecem frequentemente durante a operação normal do Tor."
+msgstr "Mensagens que aparecem frequentemente durante a operação normal do Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Mensagens detalhadas primariamente de interesse dos desenvolvedores do Tor."
+msgstr "Mensagens detalhadas primariamente de interesse dos desenvolvedores do Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Não é possível editar o arquivo %1\n"
-"\n"
-"%2."
+msgstr "Não é possível editar o arquivo %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2597,14 +2557,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ponte inválida"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "A ponte especificada é invalida."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Copiar (Ctrl+C)"
 
@@ -2612,17 +2564,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Você deve especificar um IP, um host e uma porta para configurar o acesso "
-"via proxy do Tor a internet."
+msgstr "Você deve especificar um IP, um host e uma porta para configurar o acesso via proxy do Tor a internet."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Você deve especificar uma ou mais portas liberadas no seu firewall para "
-"conexão."
+msgstr "Você deve especificar uma ou mais portas liberadas no seu firewall para conexão."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2654,9 +2602,7 @@ msgstr "Porta:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Certifique-se de somente conectar a servidores utilizando portas permitidas "
-"pelo seu firewall"
+msgstr "Certifique-se de somente conectar a servidores utilizando portas permitidas pelo seu firewall"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2678,9 +2624,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Certifique-se de criptografar requisições de diretório e, opcionalmente, "
-"utilize servidores ponte para acessar a rede Tor"
+msgstr "Certifique-se de criptografar requisições de diretório e, opcionalmente, utilize servidores ponte para acessar a rede Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2708,9 +2652,7 @@ msgstr "Encontrar bridges agora"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">De que outra forma eu posso encontrar "
-"bridges?</a>"
+msgstr "<a href=\"bridges.finding\">De que outra forma eu posso encontrar bridges?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2720,9 +2662,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Não há novas pontes disponíveis atualmente. Você pode esperar um pouco e "
-"tentar denovo ou tentar outro método de encontrar novas pontes."
+msgstr "Não há novas pontes disponíveis atualmente. Você pode esperar um pouco e tentar denovo ou tentar outro método de encontrar novas pontes."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2749,13 +2689,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Você precisa especificar uma ou mais pontes."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "aceitar"
@@ -2912,17 +2852,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Você configurou o Tor para funcionar como um servidor ponte para usuários "
-"sob censura, mas a sua versão do aplicativo na suporta esta função."
+msgstr "Você configurou o Tor para funcionar como um servidor ponte para usuários sob censura, mas a sua versão do aplicativo na suporta esta função."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Por favor, atualize seu aplicativo Tor ou configure-o para funcionar como um"
-" servidor normal."
+msgstr "Por favor, atualize seu aplicativo Tor ou configure-o para funcionar como um servidor normal."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2930,18 +2866,13 @@ msgstr "Seu servidor ponte não está funcionando."
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr ""
-"Você deve, pelo menos, especificar uma porta e um apelido para o servidor."
+msgstr "Você deve, pelo menos, especificar uma porta e um apelido para o servidor."
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr "Executar somente como cliente"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Encaminhar tráfego para rede Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta do servidor:"
 
@@ -2993,9 +2924,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Para conexões de internet com altas taxas de download mas baixo upload, por "
-"favor selecione sua taxa de upload aqui."
+msgstr "Para conexões de internet com altas taxas de download mas baixo upload, por favor selecione sua taxa de upload aqui."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3053,9 +2982,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Sua banda máxima deve ser maior ou igual a sua taxa média de banda. Ambos "
-"devem ser de pelo menos 20 kb/s"
+msgstr "Sua banda máxima deve ser maior ou igual a sua taxa média de banda. Ambos devem ser de pelo menos 20 kb/s"
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3116,17 +3043,13 @@ msgstr "Exibir ajuda para as regras de saída"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Que tipo de recursos da internet os usuários poderão acessar a partir de seu"
-" servidor?"
+msgstr "Que tipo de recursos da internet os usuários poderão acessar a partir de seu servidor?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"O Tor bloqueará a saída de email e aplicativos de compartilhamento de "
-"arquivos, a fim de evitar spam e outros abusos."
+msgstr "O Tor bloqueará a saída de email e aplicativos de compartilhamento de arquivos, a fim de evitar spam e outros abusos."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3139,8 +3062,7 @@ msgstr "Permite que outros usuários acessem sua ponte dando-lhes esta linha:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Esta é a identidade do seu servidor ponte que pode ser dado a outras pessoas"
+msgstr "Esta é a identidade do seu servidor ponte que pode ser dado a outras pessoas"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3158,9 +3080,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Deixe o seu condutor rodando para que os clientes tenham uma chance melhor "
-"de encontrá-lo e usá-lo."
+msgstr "Deixe o seu condutor rodando para que os clientes tenham uma chance melhor de encontrá-lo e usá-lo."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3174,9 +3094,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"O Tor forneceu uma resposta de formato inapropriado quando o Vidalia "
-"requisitou o histórico de uso da sua ponte."
+msgstr "O Tor forneceu uma resposta de formato inapropriado quando o Vidalia requisitou o histórico de uso da sua ponte."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3199,6 +3117,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuir automaticamente meu endereço de bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Relé para o tráfego da rede Tor (relé de saída)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Tráfego de Retransmissão de dentro da rede Tor (não-saída de relé)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Fazer mirror do Diretório de Condutor"
 
@@ -3206,10 +3132,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Endereço de email no qual você pode ser contactado caso haja um problema com"
-" o seu condutor. Você pode incluir também a sua impressão digital PGP ou "
-"GPG."
+msgstr "Endereço de email no qual você pode ser contactado caso haja um problema com o seu condutor. Você pode incluir também a sua impressão digital PGP ou GPG."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3219,9 +3142,7 @@ 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."
+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"
@@ -3237,8 +3158,7 @@ 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]."
+msgstr "A porta virtual deve conter apenas números de portas validas [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
@@ -3290,9 +3210,7 @@ msgstr "Copiar endereço onion do serviço seleciona para área de transferênci
 
 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"
+msgstr "Procure e defina no sistema de arquivos local um diretório para o serviço escolhido"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3319,10 +3237,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Clique em \"Iniciar Tor\" no painel de controle do Vidalia para reiniciar o "
-"programa Tor. Se o Tor tiver fechado inesperadamente, selecione a aba "
-"\"Avançado\" acima para detalhes sobre erros encontrados."
+msgstr "Clique em \"Iniciar Tor\" no painel de controle do Vidalia para reiniciar o programa Tor. Se o Tor tiver fechado inesperadamente, selecione a aba \"Avançado\" acima para detalhes sobre erros encontrados."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3330,10 +3245,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Você está atualmente rodando a versão \"%1\" do programa Tor, que não é mais"
-" recomendada. Por favor atualize para a versão mais recente do programa, que"
-" contem consertos importantes de segurança, confiança e performance."
+msgstr "Você está atualmente rodando a versão \"%1\" do programa Tor, que não é mais recomendada. Por favor atualize para a versão mais recente do programa, que contem consertos importantes de segurança, confiança e performance."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3341,11 +3253,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Você está atualmente rodando a versão \"%1\" do programa Tor, que pode não "
-"funcionar mais com a rede Tor atual. Por favor atualize para a versão mais "
-"recente do programa, que contem consertos importantes de segurança, "
-"confiança e performance."
+msgstr "Você está atualmente rodando a versão \"%1\" do programa Tor, que pode não funcionar mais com a rede Tor atual. Por favor atualize para a versão mais recente do programa, que contem consertos importantes de segurança, confiança e performance."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3359,9 +3267,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Conseguimos estabelecer uma conexão com a rede Tor com sucesso. Você pode "
-"agora configurar seus aplicativos para usar a internet anonimamente."
+msgstr "Conseguimos estabelecer uma conexão com a rede Tor com sucesso. Você pode agora configurar seus aplicativos para usar a internet anonimamente."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3371,10 +3277,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"O programa Tor encontrou um erro interno. Por favor reporte  a seguinte "
-"mensagem de erro para os desenvolvedores do Tor em "
-"bugs.torproject.org:\"%1\""
+msgstr "O programa Tor encontrou um erro interno. Por favor reporte  a seguinte mensagem de erro para os desenvolvedores do Tor em bugs.torproject.org:\"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3382,11 +3285,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"O Tor determinou que o relógio do seu computador pode estar configurado com "
-"%1 segundos a menos em comparação com a fonte \"%2\". Se o seu relógio não "
-"estiver correto, o Tor não poderá funcionar. Por favor certifique-se de que "
-"o seu computador exiba a hora correta."
+msgstr "O Tor determinou que o relógio do seu computador pode estar configurado com %1 segundos a menos em comparação com a fonte \"%2\". Se o seu relógio não estiver correto, o Tor não poderá funcionar. Por favor certifique-se de que o seu computador exiba a hora correta."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3394,11 +3293,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"O Tor determinou que o relógio do seu computador pode estar configurado com "
-"%1 segundos a mais em comparação com a fonte \"%2\". Se o seu relógio não "
-"estiver correto, o Tor não poderá funcionar. Por favor certifique-se de que "
-"o seu computador exiba a hora correta."
+msgstr "O Tor determinou que o relógio do seu computador pode estar configurado com %1 segundos a mais em comparação com a fonte \"%2\". Se o seu relógio não estiver correto, o Tor não poderá funcionar. Por favor certifique-se de que o seu computador exiba a hora correta."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3410,21 +3305,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Um dos aplicativos no seu computador pode ter tentado fazer uma conexão nao "
-"encriptada pelo Tor na porta %1. O envio de informação não encriptada pela "
-"rede Tor é perigoso e não recomendado. Para a sua proteção, o Tor fechou "
-"essa conexão automaticamente."
+msgstr "Um dos aplicativos no seu computador pode ter tentado fazer uma conexão nao encriptada pelo Tor na porta %1. O envio de informação não encriptada pela rede Tor é perigoso e não recomendado. Para a sua proteção, o Tor fechou essa conexão automaticamente."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Um dos programas no seu computador pode ter tentado uma conexão "
-"descriptografada através do Tor para a porta %1. Enviar informação "
-"descriptografada pela rede Tor é perigoso e não é recomendado."
+msgstr "Um dos programas no seu computador pode ter tentado uma conexão descriptografada através do Tor para a porta %1. Enviar informação descriptografada pela rede Tor é perigoso e não é recomendado."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3436,11 +3324,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Um de seus aplicativos estabeleceu uma conexão pelo Tor em \"%1\" usando um "
-"protocolo que pode vazar informações sobre a sua localização. Por favor "
-"assegure-se de configurar seus aplicativos para usarem apenas SOCKS4a ou "
-"SOCKS5 com resolução de hostname remoto."
+msgstr "Um de seus aplicativos estabeleceu uma conexão pelo Tor em \"%1\" usando um protocolo que pode vazar informações sobre a sua localização. Por favor assegure-se de configurar seus aplicativos para usarem apenas SOCKS4a ou SOCKS5 com resolução de hostname remoto."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3451,11 +3335,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Um de seus aplicativos tentou estabelecer uma conexão pelo Tor usando um "
-"protocolo que o Tor não entende. Por favor assegure-se de configurar seus "
-"aplicativos para usarem apenas SOCKS4a ou SOCKS5 com resolução de hostname "
-"remoto."
+msgstr "Um de seus aplicativos tentou estabelecer uma conexão pelo Tor usando um protocolo que o Tor não entende. Por favor assegure-se de configurar seus aplicativos para usarem apenas SOCKS4a ou SOCKS5 com resolução de hostname remoto."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3466,10 +3346,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Um de seus aplicativos tentou estabelecer uma conexão pelo Tor em \"%1\", "
-"que o Tor não reconhece como um hostname válido. Por favor confira a "
-"configuração do seu aplicativo."
+msgstr "Um de seus aplicativos tentou estabelecer uma conexão pelo Tor em \"%1\", que o Tor não reconhece como um hostname válido. Por favor confira a configuração do seu aplicativo."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3480,10 +3357,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor tem determinado o endereço público do seu relay IP é atualmente %1%2. Se"
-" isso não está correto, por favor, considere a definição do 'Endereço' opção"
-" na configuração do seu relay."
+msgstr "Tor tem determinado o endereço público do seu relay IP é atualmente %1%2. Se isso não está correto, por favor, considere a definição do 'Endereço' opção na configuração do seu relay."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3494,22 +3368,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"O Tor detectou que o seu provedor de DNS está enviando respostas falsas para"
-" domínios que não existem. Alguns provedores de internet e de DNS, como o "
-"OpenDNS, podem fazer isso para mostrar sua própria busca ou páginas de "
-"anúncios."
+msgstr "O Tor detectou que o seu provedor de DNS está enviando respostas falsas para domínios que não existem. Alguns provedores de internet e de DNS, como o OpenDNS, podem fazer isso para mostrar sua própria busca ou páginas de anúncios."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"O Tor detectou que o seu provedor de DNS está enviando respostas falsas para"
-" domínios conhecidos. Já que os clientes dependem que os relays da rede Tor "
-"enviem respostas DNS corretas, seu relay não será configurado como um relay "
-"de saída."
+msgstr "O Tor detectou que o seu provedor de DNS está enviando respostas falsas para domínios conhecidos. Já que os clientes dependem que os relays da rede Tor enviem respostas DNS corretas, seu relay não será configurado como um relay de saída."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3520,10 +3386,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor está tentando determinar se a porta do seu  servidor relay está "
-"acessível a partir da rede Tor, ligando a si mesmo em %1:%2. Este teste pode"
-" demorar alguns minutos."
+msgstr "Tor está tentando determinar se a porta do seu  servidor relay está acessível a partir da rede Tor, ligando a si mesmo em %1:%2. Este teste pode demorar alguns minutos."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3543,12 +3406,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Sua porta do servidor relay não está alcançável por outros clientes Tor. "
-"Isso pode acontecer se você estiver atrás de um roteador ou firewall que "
-"requer que você configure o encaminhamento de porta. Se %1:%2 não é o seu "
-"endereço IP correto e a porta do servidor, por favor, verifique a "
-"configuração do seu relay."
+msgstr "Sua porta do servidor relay não está alcançável por outros clientes Tor. Isso pode acontecer se você estiver atrás de um roteador ou firewall que requer que você configure o encaminhamento de porta. Se %1:%2 não é o seu endereço IP correto e a porta do servidor, por favor, verifique a configuração do seu relay."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3559,10 +3417,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor está tentando determinar se a porta do seu diretório de relay está "
-"alcansavél da rede Tor por conectar-se à %1:%2. Este teste pode levar alguns"
-" minutos."
+msgstr "Tor está tentando determinar se a porta do seu diretório de relay está alcansavél da rede Tor por conectar-se à %1:%2. Este teste pode levar alguns minutos."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3582,12 +3437,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Sua porta do servidor relay não está alcançável por outros clientes Tor. "
-"Isso pode acontecer se você estiver atrás de um roteador ou firewall que "
-"requer que você configure o encaminhamento de porta. Se %1:%2 não é o seu "
-"endereço IP correto e a porta do servidor, por favor, verifique a "
-"configuração do seu relé."
+msgstr "Sua porta do servidor relay não está alcançável por outros clientes Tor. Isso pode acontecer se você estiver atrás de um roteador ou firewall que requer que você configure o encaminhamento de porta. Se %1:%2 não é o seu endereço IP correto e a porta do servidor, por favor, verifique a configuração do seu relé."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3597,9 +3447,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Seu descritor de relay, que ativa clientes para conectar em seu relay, foi "
-"rejeitado pelo servidor de diretório em %1:%2. A razão dada foi %3."
+msgstr "Seu descritor de relay, que ativa clientes para conectar em seu relay, foi rejeitado pelo servidor de diretório em %1:%2. A razão dada foi %3."
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3611,11 +3459,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"O seu Retransmissor está agora online e disponível para uso dos clientes "
-"Tor. Você deve ver um aumento no tráfego de rede mostrado pelo Gráfico de "
-"Largura de Banda em algumas horas à medida que novos clientes descobrem o "
-"seu Retransmissor. Obrigado por contribuir com a rede Tor! "
+msgstr "O seu Retransmissor está agora online e disponível para uso dos clientes Tor. Você deve ver um aumento no tráfego de rede mostrado pelo Gráfico de Largura de Banda em algumas horas à medida que novos clientes descobrem o seu Retransmissor. Obrigado por contribuir com a rede Tor! "
 
 msgctxt "Stream"
 msgid "New"
@@ -3677,9 +3521,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"Salvar configurações. Se desmarcado, as configurações só serão aplicadas à "
-"instância atual do Tor."
+msgstr "Salvar configurações. Se desmarcado, as configurações só serão aplicadas à instância atual do Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3719,9 +3561,7 @@ msgstr "Erro ao conectar ao Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"A seleção está vazia. Por favor selecione algum texto, ou marque \"Aplicar a"
-" todos\""
+msgstr "A seleção está vazia. Por favor selecione algum texto, ou marque \"Aplicar a todos\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3745,8 +3585,7 @@ msgstr "Nenhum dispositivo UPnP-compatível foi encontrado"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Nenhum dispositivo de acesso a internet UPnP-compativel foi encontrado"
+msgstr "Nenhum dispositivo de acesso a internet UPnP-compativel foi encontrado"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
@@ -3796,17 +3635,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"O Vidalia foi incapaz de procurar por atualizações do programa disponíveis "
-"pois não pode encontrar '%1':"
+msgstr "O Vidalia foi incapaz de procurar por atualizações do programa disponíveis pois não pode encontrar '%1':"
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"O Vidalia foi incapaz de procurar por atualizações do programa disponíveis "
-"pois o processo de atualização do Tor fechou inesperadamente."
+msgstr "O Vidalia foi incapaz de procurar por atualizações do programa disponíveis pois o processo de atualização do Tor fechou inesperadamente."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3858,9 +3693,7 @@ msgstr "Instalar"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Os seguintes pacotes de atualização de programa estão prontos para "
-"instalação:"
+msgstr "Os seguintes pacotes de atualização de programa estão prontos para instalação:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3983,10 +3816,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Outro processo Vidalia possivelmente está sendo executado. Se realmente não há outro processo do Vidalia rodando, você pode escolher continuar assim mesmo.\n"
-"\n"
-"Você quer continuar a inicialização do Vidalia?"
+msgstr "Outro processo Vidalia possivelmente está sendo executado. Se realmente não há outro processo do Vidalia rodando, você pode escolher continuar assim mesmo.\n\nVocê quer continuar a inicialização do Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4019,5 +3849,3 @@ msgstr "%1 horas"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minutos"
-
-
diff --git a/src/vidalia/i18n/po/ro/qt_ro.po b/src/vidalia/i18n/po/ro/qt_ro.po
index fe4c716..2f0764b 100644
--- a/src/vidalia/i18n/po/ro/qt_ro.po
+++ b/src/vidalia/i18n/po/ro/qt_ro.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 existÄ? deja.\n"
-"DoriÅ£i sÄ?-l înlocuiÅ£i?"
+msgstr "%1 existÄ? deja.\nDoriÅ£i sÄ?-l înlocuiÅ£i?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"FiÅ?ierul nu a fost gÄ?sit.\n"
-"VerificaÅ£i numele fiÅ?ierului Å?i încercaÅ£i din nou."
+msgstr "%1\nFiÅ?ierul nu a fost gÄ?sit.\nVerificaÅ£i numele fiÅ?ierului Å?i încercaÅ£i din nou."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Directorul nu a fost gÄ?sit.\n"
-"VerificaÅ£i numele directorului Å?i încercaÅ£i din nou."
+msgstr "%1\nDirectorul nu a fost gÄ?sit.\nVerificaÅ£i numele directorului Å?i încercaÅ£i din nou."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' e protejat la scriere.\n"
-"DoriÅ£i sÄ?-l Å?tergeÅ£i oricum?"
+msgstr "'%1' e protejat la scriere.\nDoriÅ£i sÄ?-l Å?tergeÅ£i oricum?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Numele \"%1\" nu poate fi folosit.</b><p>Folosiţi alt nume, cu mai puţine"
-" litere or sau fÄ?rÄ? semne de punctuaÅ£ie."
+msgstr "<b>Numele \"%1\" nu poate fi folosit.</b><p>FolosiÅ£i alt nume, cu mai puÅ£ine litere or sau fÄ?rÄ? semne de punctuaÅ£ie."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KO"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 octeţi"
-
-
diff --git a/src/vidalia/i18n/po/ro/vidalia_ro.po b/src/vidalia/i18n/po/ro/vidalia_ro.po
index 59c0839..f7ba506 100644
--- a/src/vidalia/i18n/po/ro/vidalia_ro.po
+++ b/src/vidalia/i18n/po/ro/vidalia_ro.po
@@ -8,9 +8,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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-27 12:15+0000\n"
-"Last-Translator: tziparu <puturaflorin@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: Florin Putura <puturaflorin@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -118,8 +118,7 @@ msgstr "FiÅ?ierul de configurare Tor"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Tor foloseÅ?te acest fiÅ?ier de configurare (torrc) atunci când este lansat"
+msgstr "Tor foloseÅ?te acest fiÅ?ier de configurare (torrc) atunci când este lansat"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -173,10 +172,7 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Calea fiÅ?ierului de configurare Tor conÅ£ine caractere care nu pot fi "
-"reprezentate în sistemul de codare de caractere curent, reprezentat pe "
-"8-biţi."
+msgstr "Calea fiÅ?ierului de configurare Tor conÅ£ine caractere care nu pot fi reprezentate în sistemul de codare de caractere curent, reprezentat pe 8-biÅ£i."
 
 msgctxt "AdvancedPage"
 msgid ""
@@ -206,13 +202,17 @@ msgstr "Configurare automatÄ? a ControlPort"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Vidalia nu poate È?terge serviciul Tor.\n"
-"\n"
-"Va trebui sÄ?-l È?tergeÈ?i în mod manual. "
+msgstr "Vidalia nu poate È?terge serviciul Tor.\n\nVa trebui sÄ?-l È?tergeÈ?i în mod manual. "
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -234,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia nu a putut încÄ?rca traducerea în limba selectatÄ?."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Se contorizeazÄ? din:"
@@ -454,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia s-a conectat la un proces Tor,care necesitÄ? o parolÄ?. VÄ? rugÄ?m sÄ? "
-"introduceţi parola de control:"
+msgstr "Vidalia s-a conectat la un proces Tor,care necesitÄ? o parolÄ?. VÄ? rugÄ?m sÄ? introduceÅ£i parola de control:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1294,8 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Nu am putut sÄ? repornim automat Vidalia. Te rog reporneÅ?te Vidalia manual."
+msgstr "Nu am putut sÄ? repornim automat Vidalia. Te rog reporneÅ?te Vidalia manual."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1537,15 +1551,11 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia poate deschide legÄ?tura pe care aÅ£i ales-o cu navigatorul "
-"dumneavoastrÄ? web implicit. DacÄ? navigatorul dumneavoastrÄ? nu este "
-"configurat pentru a folosi Tor, atunci cererea nu va fi anonimÄ?."
+msgstr "Vidalia poate deschide legÄ?tura pe care aÅ£i ales-o cu navigatorul dumneavoastrÄ? web implicit. DacÄ? navigatorul dumneavoastrÄ? nu este configurat pentru a folosi Tor, atunci cererea nu va fi anonimÄ?."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-"DoriÅ£i ca Vidalia sÄ? deschidÄ? legÄ?tura cu navigatorul dumneavoastrÄ? web?"
+msgstr "DoriÅ£i ca Vidalia sÄ? deschidÄ? legÄ?tura cu navigatorul dumneavoastrÄ? web?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
@@ -1555,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia nu a putut deschide adresa aleasÄ?. PuteÅ£i copia Å?i apoi lipi adresa "
-"direct în navigatorul web."
+msgstr "Vidalia nu a putut deschide adresa aleasÄ?. PuteÅ£i copia Å?i apoi lipi adresa direct în navigatorul web."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1717,9 +1725,7 @@ msgstr "Eroare la pornirea clientului de mesagerie instantanee"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-"Vidalia nu a putut porni clientul de mesagerie instantanee specificat în "
-"setÄ?ri"
+msgstr "Vidalia nu a putut porni clientul de mesagerie instantanee specificat în setÄ?ri"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
@@ -1770,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Conectare efectuatÄ? cu succes!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Stare necunoscutÄ? la pornire"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "diverse"
 
@@ -1841,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia nu a putut porni Tor. VerificaÅ£i setÄ?rile pentru a vÄ? asigura cÄ? "
-"numele Å?i locaÅ£ia fiÅ?ierului executabil Tor sunt corect specificate."
+msgstr "Vidalia nu a putut porni Tor. VerificaÅ£i setÄ?rile pentru a vÄ? asigura cÄ? numele Å?i locaÅ£ia fiÅ?ierului executabil Tor sunt corect specificate."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1881,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor cere Vidalia transmiterea unui cookie de autentificare, dar Vidalia nu a"
-" putut gÄ?si unul."
+msgstr "Tor cere Vidalia transmiterea unui cookie de autentificare, dar Vidalia nu a putut gÄ?si unul."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1905,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia nu a putut înregistra anumite evenimente. O parte din "
-"caracteristicile Vidalia pot fi indisponibile."
+msgstr "Vidalia nu a putut înregistra anumite evenimente. O parte din caracteristicile Vidalia pot fi indisponibile."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1929,9 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Versiunea curentÄ? Tor este depÄ?Å?itÄ? Å?i nu mai este recomandatÄ?. VizitaÅ£i "
-"site-ul Tor pentru a descÄ?rca cea mai recentÄ? versiune."
+msgstr "Versiunea curentÄ? Tor este depÄ?Å?itÄ? Å?i nu mai este recomandatÄ?. VizitaÅ£i site-ul Tor pentru a descÄ?rca cea mai recentÄ? versiune."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2036,10 +2030,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia a încercat sÄ? reiniÅ£ializeze parola de control pentru Tor, dar nu a "
-"reuÅ?it sÄ? reporneascÄ? Tor. VÄ? rugÄ?m sÄ? verificaÅ£i Task Manager pentru a vÄ? "
-"asigura ca nu existÄ? alte procese Tor care ruleazÄ?."
+msgstr "Vidalia a încercat sÄ? reiniÅ£ializeze parola de control pentru Tor, dar nu a reuÅ?it sÄ? reporneascÄ? Tor. VÄ? rugÄ?m sÄ? verificaÅ£i Task Manager pentru a vÄ? asigura ca nu existÄ? alte procese Tor care ruleazÄ?."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2060,9 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor a închis automat conexiunea dumneavoastrÄ? pentru a vÄ? proteja "
-"anonimitatea."
+msgstr "Tor a închis automat conexiunea dumneavoastrÄ? pentru a vÄ? proteja anonimitatea."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2076,9 +2065,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Nu sunt disponibile noi pachete software Tor pentru calculatorul "
-"dumneavoastrÄ? în acest moment."
+msgstr "Nu sunt disponibile noi pachete software Tor pentru calculatorul dumneavoastrÄ? în acest moment."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2100,54 +2087,61 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Nu a reuÅ?it (%1)"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably Telnet)"
 msgstr ""
-"Releu dvs. se închide \\ n.Faceţi clic pe \"Stop\" din nou pentru a opri "
-"releu acum."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"Tu deja rulezi un releu.Oprirea releului va intrerupe orice conexiune intre clientii.\n"
-"\n"
-"DoriÅ£i sÄ? opriti si sa dati clientilor timp sa gaseasca alt releu?"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "Nu a reuÅ?it (%1)"
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Releu dvs. se închide \\ n.Faceţi clic pe \"Stop\" din nou pentru a opri releu acum."
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
-"Vidalia a detecetat cÄ? programul Tor s-a oprit neasteptat.\n"
-"\n"
-"Te rog verificÄ? mesajele pentru o avertizare sau o eroare."
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Tu deja rulezi un releu.Oprirea releului va intrerupe orice conexiune intre clientii.\n\nDoriÅ£i sÄ? opriti si sa dati clientilor timp sa gaseasca alt releu?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia a detecetat cÄ? programul Tor s-a oprit neasteptat.\n\nTe rog verificÄ? mesajele pentru o avertizare sau o eroare."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2171,9 +2165,7 @@ msgstr "Este necesar numele fiÅ?ierului jurnal"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Trebuie sÄ? introduceÅ£i un nume de fiÅ?ier pentru a putea salva mesajele din "
-"jurnal."
+msgstr "Trebuie sÄ? introduceÅ£i un nume de fiÅ?ier pentru a putea salva mesajele din jurnal."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2423,17 +2415,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Acele mesaje apar când ceva a mers prost în \n"
-" Å?i Tor nu poate continua."
+msgstr "Acele mesaje apar când ceva a mers prost în \n Å?i Tor nu poate continua."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Acele mesaje apar doar cand \n"
-" a mers prost cu Tor."
+msgstr "Acele mesaje apar doar cand \n a mers prost cu Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2441,37 +2429,26 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Mesajele care apar frecvent \n"
-"în timpul funcÅ£ionÄ?rii normale a lui Tor Å?i \n"
-"nu sunt considerate erori, dar s-ar putea \n"
-"sÄ? vÄ? pasÄ?."
+msgstr "Mesajele care apar frecvent \nîn timpul funcÅ£ionÄ?rii normale a lui Tor Å?i \nnu sunt considerate erori, dar s-ar putea \nsÄ? vÄ? pasÄ?."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"Mesajele care apar frecvent \n"
-"în timpul funcÅ£ionÄ?rii normale Tor."
+msgstr "Mesajele care apar frecvent \nîn timpul funcÅ£ionÄ?rii normale Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Mesaje Hyper-verbose în principal din \n"
-"prezintÄ? interes pentru dezvoltatorea Tor."
+msgstr "Mesaje Hyper-verbose în principal din \nprezintÄ? interes pentru dezvoltatorea Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Nu se poate scrie fiÅ?ierul %1\n"
-"\n"
-"%2."
+msgstr "Nu se poate scrie fiÅ?ierul %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2578,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge invalid"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Identificatorul specificat al bridge-ului nu este valid."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "CopiazÄ? (Ctrl+C)"
 
@@ -2593,17 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Pentru a folosi Tor ca proxy, prin care sÄ? accesaÅ£i internetul, este nevoie "
-"sÄ? specificaÅ£i atât o adresÄ? de IP, cât Å?i un port."
+msgstr "Pentru a folosi Tor ca proxy, prin care sÄ? accesaÅ£i internetul, este nevoie sÄ? specificaÅ£i atât o adresÄ? de IP, cât Å?i un port."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Trebuie sÄ? specificaÅ£i unul sau mai multe porturi la care firewall-ul "
-"dumneavoastrÄ? sÄ? vÄ? permitÄ? conectarea."
+msgstr "Trebuie sÄ? specificaÅ£i unul sau mai multe porturi la care firewall-ul dumneavoastrÄ? sÄ? vÄ? permitÄ? conectarea."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2611,9 +2576,7 @@ msgstr "'%1' nu este un numÄ?r valid de port."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"BifaÅ£i aici dacÄ? reÅ£eaua dumneavoastrÄ? localÄ? necesitÄ? un proxy pentru a "
-"accesa internetul"
+msgstr "BifaÅ£i aici dacÄ? reÅ£eaua dumneavoastrÄ? localÄ? necesitÄ? un proxy pentru a accesa internetul"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2637,9 +2600,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"BifaÅ£i aici pentru a folosi numai conexiuni cÄ?tre relay-uri ce folosesc "
-"porturi permise de firewall-ul dumneavoastrÄ?"
+msgstr "BifaÅ£i aici pentru a folosi numai conexiuni cÄ?tre relay-uri ce folosesc porturi permise de firewall-ul dumneavoastrÄ?"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2661,9 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"BifaÅ£i aici pentru a cripta cererile cÄ?tre director Å?i, opÅ£ional, pentru a "
-"folosi bridge relay-uri pentru a accesa reţeaua Tor."
+msgstr "BifaÅ£i aici pentru a cripta cererile cÄ?tre director Å?i, opÅ£ional, pentru a folosi bridge relay-uri pentru a accesa reÅ£eaua Tor."
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2701,14 +2660,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Nici un bridge nou nu este disponibil.Puteti astepta o perioada de timp, fie"
-" Å?i încercaÅ£i din nou, sau încercaÅ£i o altÄ? metodÄ? de a gÄ?si bridges noi."
+msgstr "Nici un bridge nou nu este disponibil.Puteti astepta o perioada de timp, fie Å?i încercaÅ£i din nou, sau încercaÅ£i o altÄ? metodÄ? de a gÄ?si bridges noi."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Apasa Help pentru a putea vedea celelalte metode de a gÄ?si bridges noi."
+msgstr "Apasa Help pentru a putea vedea celelalte metode de a gÄ?si bridges noi."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2731,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "acceptÄ?"
@@ -2894,10 +2850,7 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"AÅ£i configurat Tor sÄ? se comporte ca un bridge relay pentru utilizatorii "
-"cenzuraÅ£i, însÄ? versiunea dumneavoastrÄ? de Tor nu oferÄ? suport pentru astfel"
-" de relay-uri."
+msgstr "AÅ£i configurat Tor sÄ? se comporte ca un bridge relay pentru utilizatorii cenzuraÅ£i, însÄ? versiunea dumneavoastrÄ? de Tor nu oferÄ? suport pentru astfel de relay-uri."
 
 msgctxt "ServerPage"
 msgid ""
@@ -2911,18 +2864,13 @@ msgstr "Bridge relay-ul dumneavoastrÄ? este oprit."
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr ""
-"Este necesar sÄ? specificaÅ£i cel puÅ£in un pseudonim de relay Å?i un port."
+msgstr "Este necesar sÄ? specificaÅ£i cel puÅ£in un pseudonim de relay Å?i un port."
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr "RuleazÄ? doar ca Å?i client."
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Contribuie la reţeaua Tor acţionând ca un relay pentru trafic"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Portul relay-ului:"
 
@@ -2960,9 +2908,7 @@ msgstr "Numele relay-ului dumneavoastrÄ?"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Portul prin care utilizatorii Å?i alte relay-uri pot comunica cu relay-ul "
-"dumneavoastrÄ?"
+msgstr "Portul prin care utilizatorii Å?i alte relay-uri pot comunica cu relay-ul dumneavoastrÄ?"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2976,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"DacÄ? aveÅ£i o conexiune cu descÄ?rcare rapidÄ? dar încÄ?rcare lentÄ?, specificaÅ£i"
-" aici viteza de încÄ?rcare (upload)."
+msgstr "DacÄ? aveÅ£i o conexiune cu descÄ?rcare rapidÄ? dar încÄ?rcare lentÄ?, specificaÅ£i aici viteza de încÄ?rcare (upload)."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3036,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Rata maximÄ? a lÄ?Å£imii de bandÄ? trebuie sÄ? fie mai mare sau egalÄ? cu rata "
-"medie. Ambele valori trebuie sÄ? fie cel puÅ£in egale cu 20 KO/s."
+msgstr "Rata maximÄ? a lÄ?Å£imii de bandÄ? trebuie sÄ? fie mai mare sau egalÄ? cu rata medie. Ambele valori trebuie sÄ? fie cel puÅ£in egale cu 20 KO/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3105,9 +3047,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor va bloca anumite programe pentru email Å?i partajare a fiÅ?ierelor "
-"implicit, pentru a reduce spam-ul Å?i alte abuzuri."
+msgstr "Tor va bloca anumite programe pentru email Å?i partajare a fiÅ?ierelor implicit, pentru a reduce spam-ul Å?i alte abuzuri."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3115,16 +3055,12 @@ msgstr "Politici de ieÅ?ire"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Pentru ca alÅ£ii sÄ? acceseze bridge relay-ul dumneavoastrÄ?, au nevoie de "
-"textul de mai jos:"
+msgstr "Pentru ca alÅ£ii sÄ? acceseze bridge relay-ul dumneavoastrÄ?, au nevoie de textul de mai jos:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Aceasta este identitatea relay-ului dumneavoastrÄ? pe care o puteÅ£i folosi în"
-" comunicarea cu alţii"
+msgstr "Aceasta este identitatea relay-ului dumneavoastrÄ? pe care o puteÅ£i folosi în comunicarea cu alÅ£ii"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3142,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"LÄ?saÅ£i relay-ul pornit pentru ca alÅ£i clienÅ£i sÄ? aibe Å?anse mai bune în a-l "
-"gÄ?si Å?i folosi."
+msgstr "LÄ?saÅ£i relay-ul pornit pentru ca alÅ£i clienÅ£i sÄ? aibe Å?anse mai bune în a-l gÄ?si Å?i folosi."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3152,16 +3086,13 @@ msgstr "Istoric bridge"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
-"Vidalia nu a putut gÄ?si istoricul de folosire a bridge-ului dumneavoastrÄ?."
+msgstr "Vidalia nu a putut gÄ?si istoricul de folosire a bridge-ului dumneavoastrÄ?."
 
 msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor a returnat un rÄ?spuns formatat necorespunzÄ?tor când Vidalia a cerut "
-"istoricul de folosire a bridge-ului dumneavoastrÄ?."
+msgstr "Tor a returnat un rÄ?spuns formatat necorespunzÄ?tor când Vidalia a cerut istoricul de folosire a bridge-ului dumneavoastrÄ?."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3184,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuie automat adresa mea de bridge"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Reflecta Directorul cu Relay-ul"
 
@@ -3191,9 +3130,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Adresa de email la care aÅ£i putea fi contactat dacÄ? existÄ? o \n"
-"problema cu releu dumneavoastrÄ?. S-ar putea include, de asemenea amprentÄ? PGP sau GPG."
+msgstr "Adresa de email la care aÅ£i putea fi contactat dacÄ? existÄ? o \nproblema cu releu dumneavoastrÄ?. S-ar putea include, de asemenea amprentÄ? PGP sau GPG."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3203,9 +3140,7 @@ 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Å£i cel puÅ£in un director de serviciu Å?i un port virtual pentru "
-"fiecare serviciu pe care doriÅ£i sÄ?-l salvaÅ£i. EliminaÅ£i-le pe celelalte."
+msgstr "ConfiguraÅ£i cel puÅ£in un director de serviciu Å?i un port virtual pentru fiecare serviciu pe care doriÅ£i sÄ?-l salvaÅ£i. EliminaÅ£i-le pe celelalte."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3225,8 +3160,7 @@ msgstr "NumÄ?rul portului virtual trebuie sÄ? fie în intervalul [1 - 65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"DestinaÅ£ia poate conÅ£ine numai forme de tip adresÄ?:port, adresÄ? sau port."
+msgstr "DestinaÅ£ia poate conÅ£ine numai forme de tip adresÄ?:port, adresÄ? sau port."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
@@ -3274,9 +3208,7 @@ msgstr "CopiazÄ? în clipboard adresa onion a serviciului ales"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"RÄ?sfoieÅ?te sistemul local de fiÅ?iere Å?i alege directorul pentru serviciul "
-"ales"
+msgstr "RÄ?sfoieÅ?te sistemul local de fiÅ?iere Å?i alege directorul pentru serviciul ales"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3343,9 +3275,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Programul Tor a întalnit o problemÄ? internÄ?. Te rog raporteazÄ? urmÄ?torul "
-"mesaj de eroare cÄ?tre dezvoltatorii Tor la bugs.torproject.org:\"%1\"\n"
+msgstr "Programul Tor a întalnit o problemÄ? internÄ?. Te rog raporteazÄ? urmÄ?torul mesaj de eroare cÄ?tre dezvoltatorii Tor la bugs.torproject.org:\"%1\"\n"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3629,9 +3559,7 @@ msgstr "Eroare la conectarea la Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Câmpul de selecÅ£ie este gol. VÄ? rugÄ?m sÄ? selectaÅ£i un text, sau sÄ? "
-"confirmati \"Aplicare toate\""
+msgstr "Câmpul de selecÅ£ie este gol. VÄ? rugÄ?m sÄ? selectaÅ£i un text, sau sÄ? confirmati \"Aplicare toate\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3705,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia nu a fost în stare sÄ? verifice pentru actualizÄ?ri software "
-"disponibile, deoarece nu a putut gÄ?si '%1'."
+msgstr "Vidalia nu a fost în stare sÄ? verifice pentru actualizÄ?ri software disponibile, deoarece nu a putut gÄ?si '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia nu a putut verifica dacÄ? existÄ? actualizÄ?zi pentru software-ul "
-"actual deoarece procesul de actualizare Tor s-a inchis neaÅ?teptat."
+msgstr "Vidalia nu a putut verifica dacÄ? existÄ? actualizÄ?zi pentru software-ul actual deoarece procesul de actualizare Tor s-a inchis neaÅ?teptat."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3767,8 +3691,7 @@ msgstr "InstaleazÄ?"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"UrmÄ?toarele pachete software actualizate sunt disponibile pentru instalare:"
+msgstr "UrmÄ?toarele pachete software actualizate sunt disponibile pentru instalare:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3891,10 +3814,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Un alt proces Vidalia este, probabil, ca deja sÄ? ruleze.DacÄ? existÄ? într-adevÄ?r nu este un alt proces Vidalia care ruleazÄ?, puteÅ£i alege sÄ? continue oricum \n"
-".\n"
-"DoriÅ£i sÄ? continuaÅ£i deschiderea Vidalia?"
+msgstr "Un alt proces Vidalia este, probabil, ca deja sÄ? ruleze.DacÄ? existÄ? într-adevÄ?r nu este un alt proces Vidalia care ruleazÄ?, puteÅ£i alege sÄ? continue oricum \n.\nDoriÅ£i sÄ? continuaÅ£i deschiderea Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3927,5 +3847,3 @@ msgstr "%1 ore"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 minute"
-
-
diff --git a/src/vidalia/i18n/po/ru/qt_ru.po b/src/vidalia/i18n/po/ru/qt_ru.po
index 5f88dd6..489073d 100644
--- a/src/vidalia/i18n/po/ru/qt_ru.po
+++ b/src/vidalia/i18n/po/ru/qt_ru.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 # Ð?ндÑ?ей Ð?оÑ?Ñ?енко <andrey@xxxxxxxxxxxxx>, 2011.
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
 "PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -202,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?.\n"
-"Ð?амениÑ?Ñ??"
+msgstr "%1 Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?.\nÐ?амениÑ?Ñ??"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -212,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Файл не найден.\n"
-"Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е пÑ?авилÑ?ноÑ?Ñ?Ñ? имени и пÑ?Ñ?и."
+msgstr "%1\nФайл не найден.\nÐ?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е пÑ?авилÑ?ноÑ?Ñ?Ñ? имени и пÑ?Ñ?и."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -273,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Ð?иÑ?екÑ?оÑ?иÑ? не найдена.\n"
-" Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е пÑ?авилÑ?ноÑ?Ñ?Ñ? имени и пÑ?Ñ?и."
+msgstr "%1\nÐ?иÑ?екÑ?оÑ?иÑ? не найдена.\n Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е пÑ?авилÑ?ноÑ?Ñ?Ñ? имени и пÑ?Ñ?и."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' заÑ?иÑ?Ñ?н оÑ? запиÑ?и.\n"
-"Ð?Ñ?е Ñ?авно Ñ?далиÑ?Ñ??"
+msgstr "'%1' заÑ?иÑ?Ñ?н оÑ? запиÑ?и.\nÐ?Ñ?е Ñ?авно Ñ?далиÑ?Ñ??"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -382,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Ð?елÑ?зÑ? иÑ?полÑ?зоваÑ?Ñ? \"%1\" в каÑ?еÑ?Ñ?ве имени.</b><p>Ð?Ñ?беÑ?иÑ?е дÑ?Ñ?гое, без "
-"знаков пÑ?епинаниÑ? или Ñ? менÑ?Ñ?им Ñ?иÑ?лом Ñ?имволов."
+msgstr "<b>Ð?елÑ?зÑ? иÑ?полÑ?зоваÑ?Ñ? \"%1\" в каÑ?еÑ?Ñ?ве имени.</b><p>Ð?Ñ?беÑ?иÑ?е дÑ?Ñ?гое, без знаков пÑ?епинаниÑ? или Ñ? менÑ?Ñ?им Ñ?иÑ?лом Ñ?имволов."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -445,5 +433,3 @@ msgstr "%1 Ð?б"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 байÑ?"
-
-
diff --git a/src/vidalia/i18n/po/ru/vidalia_ru.po b/src/vidalia/i18n/po/ru/vidalia_ru.po
index 959f42a..8d267df 100644
--- a/src/vidalia/i18n/po/ru/vidalia_ru.po
+++ b/src/vidalia/i18n/po/ru/vidalia_ru.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-31 21:42+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-28 17:35+0000\n"
 "Last-Translator: liquixis <liquixis@xxxxxxxxx>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -137,9 +137,7 @@ msgstr "Ð¥Ñ?аниÑ?Ñ? даннÑ?е длÑ? пÑ?огÑ?аммного обеÑ?пе
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Ð?Ñ?беÑ?иÑ?е каÑ?алог, иÑ?полÑ?зÑ?емÑ?й длÑ? Ñ?Ñ?анениÑ? даннÑ?Ñ? длÑ? пÑ?огÑ?аммного "
-"обеÑ?пеÑ?ениÑ? Tor"
+msgstr "Ð?Ñ?беÑ?иÑ?е каÑ?алог, иÑ?полÑ?зÑ?емÑ?й длÑ? Ñ?Ñ?анениÑ? даннÑ?Ñ? длÑ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? Tor"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
@@ -173,17 +171,13 @@ msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Ð?Ñ?Ñ?Ñ? к заданномÑ? Ñ?айлÑ? конÑ?игÑ?Ñ?аÑ?ии Tor Ñ?одеÑ?жиÑ? Ñ?имволÑ? коÑ?оÑ?Ñ?е не могÑ?Ñ? "
-"бÑ?Ñ?Ñ? пÑ?едÑ?Ñ?авленÑ? в Ñ?екÑ?Ñ?ей 8-биÑ?ной кодиÑ?овке ваÑ?ей Ñ?иÑ?Ñ?емÑ?."
+msgstr "Ð?Ñ?Ñ?Ñ? к заданномÑ? Ñ?айлÑ? конÑ?игÑ?Ñ?аÑ?ии Tor Ñ?одеÑ?жиÑ? Ñ?имволÑ? коÑ?оÑ?Ñ?е не могÑ?Ñ? бÑ?Ñ?Ñ? пÑ?едÑ?Ñ?авленÑ? в Ñ?екÑ?Ñ?ей 8-биÑ?ной кодиÑ?овке ваÑ?ей Ñ?иÑ?Ñ?емÑ?."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
-"Ð?Ñ?Ñ?Ñ? к заданной папке даннÑ?Ñ? Tor Ñ?одеÑ?жиÑ? Ñ?имволÑ? коÑ?оÑ?Ñ?е не могÑ?Ñ? бÑ?Ñ?Ñ? "
-"пÑ?едÑ?Ñ?авленÑ? в Ñ?екÑ?Ñ?ей 8-биÑ?ной кодиÑ?овке ваÑ?ей Ñ?иÑ?Ñ?емÑ?."
+msgstr "Ð?Ñ?Ñ?Ñ? к заданной папке даннÑ?Ñ? Tor Ñ?одеÑ?жиÑ? Ñ?имволÑ? коÑ?оÑ?Ñ?е не могÑ?Ñ? бÑ?Ñ?Ñ? пÑ?едÑ?Ñ?авленÑ? в Ñ?екÑ?Ñ?ей 8-биÑ?ной кодиÑ?овке ваÑ?ей Ñ?иÑ?Ñ?емÑ?."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
@@ -207,12 +201,17 @@ msgstr "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? ControlPort авÑ?омаÑ?иÑ?еÑ?ки"
 
 msgctxt "AdvancedPage"
 msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
+msgstr "Ð?Ñ? вÑ?бÑ?али опÑ?иÑ? авÑ?омаÑ?иÑ?еÑ?кой конÑ?игÑ?Ñ?аÑ?ии ControlPort, но не задали Ð?иÑ?екÑ?оÑ?иÑ? Ð?аннÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, добавÑ?Ñ?е однÑ? или Ñ?нимиÑ?е опÑ?иÑ? \"Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? ControlPort авÑ?омаÑ?иÑ?еÑ?ки\"."
+
+msgctxt "AdvancedPage"
+msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
-"Vidalia не Ñ?могла Ñ?далиÑ?Ñ? Ñ?еÑ?виÑ? Tor. Ð?озможно, вам пÑ?идеÑ?Ñ?Ñ? Ñ?далиÑ?Ñ? его "
-"вÑ?Ñ?Ñ?нÑ?Ñ?."
+msgstr "Vidalia не Ñ?могла Ñ?далиÑ?Ñ? Ñ?еÑ?виÑ? Tor. Ð?озможно, вам пÑ?идеÑ?Ñ?Ñ? Ñ?далиÑ?Ñ? его вÑ?Ñ?Ñ?нÑ?Ñ?."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -234,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Hе Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? вÑ?бÑ?аннÑ?й Ñ?зÑ?к пеÑ?евода."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr "Ð?аÑ?Ñ?Ñ?ойки СиÑ?Ñ?емнÑ?Ñ? Ð?конок (длÑ? пÑ?инÑ?Ñ?иÑ? изменений пеÑ?езапÑ?Ñ?Ñ?иÑ?е Vidalia)"
+
+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,7 +404,7 @@ msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ð?оÑ?ок (Del)"
 
 msgctxt "ConfigDialog"
 msgid "General"
-msgstr "General"
+msgstr "Ð?бÑ?ие"
 
 msgctxt "ConfigDialog"
 msgid "Network"
@@ -454,9 +470,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia подклÑ?Ñ?илаÑ?Ñ? к Ñ?абоÑ?аÑ?Ñ?емÑ? пÑ?оÑ?еÑ?Ñ?Ñ? Tor, коÑ?оÑ?Ñ?й Ñ?Ñ?ебÑ?еÑ? паÑ?олÑ?. "
-"Ð?ожалÑ?йÑ?Ñ?а, введиÑ?е Ñ?вой паÑ?олÑ?:"
+msgstr "Vidalia подклÑ?Ñ?илаÑ?Ñ? к Ñ?абоÑ?аÑ?Ñ?емÑ? пÑ?оÑ?еÑ?Ñ?Ñ? Tor, коÑ?оÑ?Ñ?й Ñ?Ñ?ебÑ?еÑ? паÑ?олÑ?. Ð?ожалÑ?йÑ?Ñ?а, введиÑ?е Ñ?вой паÑ?олÑ?:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1294,9 +1308,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Ð?Ñ? не Ñ?могли авÑ?омаÑ?иÑ?еÑ?ки пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Vidalia. Ð?ожалÑ?йÑ?Ñ?а, пеÑ?езапÑ?Ñ?Ñ?иÑ?е "
-"Vidalia вÑ?Ñ?Ñ?нÑ?Ñ?."
+msgstr "Ð?Ñ? не Ñ?могли авÑ?омаÑ?иÑ?еÑ?ки пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Vidalia. Ð?ожалÑ?йÑ?Ñ?а, пеÑ?езапÑ?Ñ?Ñ?иÑ?е Vidalia вÑ?Ñ?Ñ?нÑ?Ñ?."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1306,28 +1318,20 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
-"Ð?Ñ?Ñ?еÑ? об аваÑ?ийном завеÑ?Ñ?ении бÑ?л Ñ?оздан и вÑ? можеÑ?е оÑ?пÑ?авиÑ?Ñ? его "
-"Ñ?азÑ?абоÑ?Ñ?икам Vidalia Ñ?Ñ?о бÑ? помоÑ?Ñ? им найÑ?и и Ñ?Ñ?Ñ?Ñ?аниÑ?Ñ? оÑ?ибкÑ?. "
-"Ð?Ñ?пÑ?авлÑ?емÑ?й оÑ?Ñ?еÑ? не Ñ?одеÑ?жиÑ? какой-либо пеÑ?Ñ?оналÑ?ной инÑ?оÑ?маÑ?ии."
+msgstr "Ð?Ñ?Ñ?еÑ? об аваÑ?ийном завеÑ?Ñ?ении бÑ?л Ñ?оздан и вÑ? можеÑ?е оÑ?пÑ?авиÑ?Ñ? его Ñ?азÑ?абоÑ?Ñ?икам Vidalia Ñ?Ñ?о бÑ? помоÑ?Ñ? им найÑ?и и Ñ?Ñ?Ñ?Ñ?аниÑ?Ñ? оÑ?ибкÑ?. Ð?Ñ?пÑ?авлÑ?емÑ?й оÑ?Ñ?еÑ? не Ñ?одеÑ?жиÑ? какой-либо пеÑ?Ñ?оналÑ?ной инÑ?оÑ?маÑ?ии."
 
 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 ""
-"Ñ? опиÑ?анием Ñ?ого, Ñ?Ñ?о вÑ? делали пеÑ?ед аваÑ?ийнÑ?м завеÑ?Ñ?ением Ñ?абоÑ?Ñ? "
-"пÑ?иложениÑ?, а Ñ?ак же Ñ?ледÑ?Ñ?Ñ?ие Ñ?айлÑ? Ñ?вÑ?заннÑ?е Ñ? оÑ?Ñ?еÑ?ом об аваÑ?ийном "
-"завеÑ?Ñ?ении Ñ?абоÑ?Ñ?:"
+msgstr "Ñ? опиÑ?анием Ñ?ого, Ñ?Ñ?о вÑ? делали пеÑ?ед аваÑ?ийнÑ?м завеÑ?Ñ?ением Ñ?абоÑ?Ñ? пÑ?иложениÑ?, а Ñ?ак же Ñ?ледÑ?Ñ?Ñ?ие Ñ?айлÑ? Ñ?вÑ?заннÑ?е Ñ? оÑ?Ñ?еÑ?ом об аваÑ?ийном завеÑ?Ñ?ении Ñ?абоÑ?Ñ?:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1546,9 +1550,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia можеÑ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?лкÑ? в ваÑ?ем бÑ?аÑ?зеÑ?е по Ñ?молÑ?аниÑ?. Ð?Ñ?ли ваÑ? бÑ?аÑ?зеÑ?"
-" не наÑ?Ñ?Ñ?оен длÑ? иÑ?полÑ?зованиÑ? Tor, Ñ?о запÑ?оÑ? не бÑ?деÑ? анонимнÑ?м."
+msgstr "Vidalia можеÑ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?лкÑ? в ваÑ?ем бÑ?аÑ?зеÑ?е по Ñ?молÑ?аниÑ?. Ð?Ñ?ли ваÑ? бÑ?аÑ?зеÑ? не наÑ?Ñ?Ñ?оен длÑ? иÑ?полÑ?зованиÑ? Tor, Ñ?о запÑ?оÑ? не бÑ?деÑ? анонимнÑ?м."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1562,9 +1564,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia не Ñ?могла оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?бÑ?аннÑ?Ñ? Ñ?Ñ?Ñ?лкÑ? на ваÑ? веб-бÑ?аÑ?зеÑ?. Ð?Ñ? вÑ?е еÑ?е "
-"можеÑ?е Ñ?копиÑ?оваÑ?Ñ? URL и вÑ?Ñ?авиÑ?Ñ? его в адÑ?еÑ?нÑ?Ñ? Ñ?Ñ?Ñ?окÑ? бÑ?аÑ?зеÑ?а."
+msgstr "Vidalia не Ñ?могла оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?бÑ?аннÑ?Ñ? Ñ?Ñ?Ñ?лкÑ? на ваÑ? веб-бÑ?аÑ?зеÑ?. Ð?Ñ? вÑ?е еÑ?е можеÑ?е Ñ?копиÑ?оваÑ?Ñ? URL и вÑ?Ñ?авиÑ?Ñ? его в адÑ?еÑ?нÑ?Ñ? Ñ?Ñ?Ñ?окÑ? бÑ?аÑ?зеÑ?а."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1775,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Ð?одклÑ?Ñ?ен к Ñ?еÑ?и Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Ð?еÑ?аÑ?познаннÑ?й Ñ?Ñ?аÑ?Ñ?Ñ? запÑ?Ñ?ка"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "pазное"
 
@@ -1846,9 +1842,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Tor. Ð?Ñ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки и Ñ?бедиÑ?еÑ?Ñ? Ñ?Ñ?о имÑ? и "
-"меÑ?Ñ?оположение иÑ?полнÑ?емого Ñ?айла Tor Ñ?казанo."
+msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Tor. Ð?Ñ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки и Ñ?бедиÑ?еÑ?Ñ? Ñ?Ñ?о имÑ? и меÑ?Ñ?оположение иÑ?полнÑ?емого Ñ?айла Tor Ñ?казанo."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1886,9 +1880,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Ð?Ñ?огÑ?аммное обеÑ?пеÑ?ение Tor Ñ?Ñ?ебÑ?еÑ? Vidalia оÑ?пÑ?авиÑ?Ñ? Ñ?одеÑ?жание "
-"аÑ?Ñ?енÑ?иÑ?икаÑ?ии кÑ?ки, но Vidalia не Ñ?могла найÑ?и ни одного."
+msgstr "Ð?Ñ?огÑ?аммное обеÑ?пеÑ?ение Tor Ñ?Ñ?ебÑ?еÑ? Vidalia оÑ?пÑ?авиÑ?Ñ? Ñ?одеÑ?жание аÑ?Ñ?енÑ?иÑ?икаÑ?ии кÑ?ки, но Vidalia не Ñ?могла найÑ?и ни одного."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1910,9 +1902,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia не Ñ?могла заÑ?егиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ?Ñ?Ñ? длÑ? некоÑ?оÑ?Ñ?Ñ? Ñ?обÑ?Ñ?ий. Ð?ногие из "
-"Ñ?Ñ?нкÑ?ий Vidalia могÑ?Ñ? бÑ?Ñ?Ñ? недоÑ?Ñ?Ñ?пнÑ?."
+msgstr "Vidalia не Ñ?могла заÑ?егиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ?Ñ?Ñ? длÑ? некоÑ?оÑ?Ñ?Ñ? Ñ?обÑ?Ñ?ий. Ð?ногие из Ñ?Ñ?нкÑ?ий Vidalia могÑ?Ñ? бÑ?Ñ?Ñ? недоÑ?Ñ?Ñ?пнÑ?."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1920,8 +1910,7 @@ msgstr "Ð?Ñ?ибка аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Vidalia не Ñ?могла подÑ?веÑ?диÑ?Ñ? подлинноÑ?Ñ?Ñ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? Tor. (%1)"
+msgstr "Vidalia не Ñ?могла подÑ?веÑ?диÑ?Ñ? подлинноÑ?Ñ?Ñ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
@@ -1935,9 +1924,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"УÑ?Ñ?ановленнаÑ? веÑ?Ñ?иÑ? Tor Ñ?Ñ?Ñ?аÑ?ела или не Ñ?екомендÑ?еÑ?Ñ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, поÑ?еÑ?иÑ?е"
-" веб-Ñ?айÑ? Tor длÑ? загÑ?Ñ?зки поÑ?ледней веÑ?Ñ?ии."
+msgstr "УÑ?Ñ?ановленнаÑ? веÑ?Ñ?иÑ? Tor Ñ?Ñ?Ñ?аÑ?ела или не Ñ?екомендÑ?еÑ?Ñ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, поÑ?еÑ?иÑ?е веб-Ñ?айÑ? Tor длÑ? загÑ?Ñ?зки поÑ?ледней веÑ?Ñ?ии."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1947,8 +1934,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Ð?Ñ?е поÑ?ледÑ?Ñ?Ñ?ие Ñ?оединениÑ? бÑ?дÑ?Ñ? оÑ?лиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? ваÑ?иÑ? пÑ?едÑ?дÑ?Ñ?иÑ? Ñ?оединений"
+msgstr "Ð?Ñ?е поÑ?ледÑ?Ñ?Ñ?ие Ñ?оединениÑ? бÑ?дÑ?Ñ? оÑ?лиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? ваÑ?иÑ? пÑ?едÑ?дÑ?Ñ?иÑ? Ñ?оединений"
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1976,11 +1962,11 @@ msgstr "ЯÑ?лÑ?ки Vidalia"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "Ð?аÑ?Ñ?Ñ?ойка Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?ии"
+msgstr "РеÑ?Ñ?анÑ?лÑ?Ñ?оÑ?"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
-msgstr "УÑ?Ñ?ановиÑ?е Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? и помогиÑ?е Ñ?оÑ?Ñ?Ñ? Ñ?еÑ?и"
+msgstr "Ð?аÑ?Ñ?Ñ?ойÑ?е Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? и помогиÑ?е Ñ?оÑ?Ñ?Ñ? Ñ?еÑ?и"
 
 msgctxt "MainWindow"
 msgid "View the Network"
@@ -1992,7 +1978,7 @@ msgstr "Ð?бзоÑ? каÑ?Ñ?Ñ? Ñ?еÑ?и Tor"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ð?овÑ?Ñ? Ð?иÑ?ноÑ?Ñ?Ñ?"
+msgstr "СмениÑ?Ñ? лиÑ?ноÑ?Ñ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
@@ -2043,10 +2029,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia пÑ?Ñ?алаÑ?Ñ? Ñ?бÑ?оÑ?иÑ?Ñ? паÑ?олÑ? Ñ?пÑ?авлениÑ? Tor, но бÑ?ла не в Ñ?оÑ?Ñ?оÑ?нии "
-"пеÑ?езагÑ?Ñ?зиÑ?Ñ? пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е диÑ?пеÑ?Ñ?еÑ? "
-"задаÑ?, Ñ?Ñ?обÑ? Ñ?бедиÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о неÑ? болÑ?Ñ?е никакиÑ? Ñ?абоÑ?аÑ?Ñ?иÑ? пÑ?оÑ?еÑ?Ñ?ов Tor."
+msgstr "Vidalia пÑ?Ñ?алаÑ?Ñ? Ñ?бÑ?оÑ?иÑ?Ñ? паÑ?олÑ? Ñ?пÑ?авлениÑ? Tor, но бÑ?ла не в Ñ?оÑ?Ñ?оÑ?нии пеÑ?езагÑ?Ñ?зиÑ?Ñ? пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е диÑ?пеÑ?Ñ?еÑ? задаÑ?, Ñ?Ñ?обÑ? Ñ?бедиÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о неÑ? болÑ?Ñ?е никакиÑ? Ñ?абоÑ?аÑ?Ñ?иÑ? пÑ?оÑ?еÑ?Ñ?ов Tor."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2067,9 +2050,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor авÑ?омаÑ?иÑ?еÑ?ки оÑ?Ñ?ановил ваÑ?е Ñ?оединение, Ñ?Ñ?обÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? ваÑ?Ñ? "
-"анонимноÑ?Ñ?Ñ?."
+msgstr "Tor авÑ?омаÑ?иÑ?еÑ?ки оÑ?Ñ?ановил ваÑ?е Ñ?оединение, Ñ?Ñ?обÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? ваÑ?Ñ? анонимноÑ?Ñ?Ñ?."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2083,9 +2064,7 @@ msgctxt "MainWindow"
 msgid ""
 "There are no new Tor software packages available for your computer at this "
 "time."
-msgstr ""
-"Ð?овое пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor длÑ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а в наÑ?Ñ?оÑ?Ñ?ий моменÑ? "
-"не доÑ?Ñ?Ñ?пно."
+msgstr "Ð?овое пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor длÑ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а в наÑ?Ñ?оÑ?Ñ?ий моменÑ? не доÑ?Ñ?Ñ?пно."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
@@ -2104,10 +2083,25 @@ 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."
-msgstr ""
-"Ð?Ñ?баÑ? инÑ?оÑ?маÑ?иÑ? оÑ?пÑ?авленнаÑ? Ñ?еÑ?ез Ñ?Ñ?о Ñ?Ñ?о Ñ?оединение можеÑ? бÑ?Ñ?Ñ? "
-"пÑ?оÑ?моÑ?Ñ?ена. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?ей пÑ?огÑ?аммÑ? и иÑ?полÑ?зÑ?йÑ?е "
-"Ñ?олÑ?ко Ñ?иÑ?Ñ?Ñ?Ñ?Ñ?ие пÑ?оÑ?околÑ?, Ñ?ипа SSL, еÑ?ли Ñ?Ñ?о возможно."
+msgstr "Ð?Ñ?баÑ? инÑ?оÑ?маÑ?иÑ? оÑ?пÑ?авленнаÑ? Ñ?еÑ?ез Ñ?Ñ?о Ñ?Ñ?о Ñ?оединение можеÑ? бÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?ена. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?ей пÑ?огÑ?аммÑ? и иÑ?полÑ?зÑ?йÑ?е Ñ?олÑ?ко Ñ?иÑ?Ñ?Ñ?Ñ?Ñ?ие пÑ?оÑ?околÑ?, Ñ?ипа SSL, еÑ?ли Ñ?Ñ?о возможно."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Ð?аÑ?алÑ?наÑ? загÑ?Ñ?зка Tor оÑ? %1 до %2"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(веÑ?оÑ?Ñ?но Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(веÑ?оÑ?Ñ?но email клиенÑ?)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Ð?оÑ?оже, Ñ?Ñ?о одно из ваÑ?иÑ? пÑ?иложений %1 Ñ?оздаеÑ? поÑ?енÑ?иалÑ?но не заÑ?иÑ?Ñ?ованное и небезопаÑ?ное Ñ?оединение на поÑ?Ñ? %2."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2117,49 +2111,36 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
-msgstr ""
-"Ð?аÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? вÑ?клÑ?Ñ?аеÑ?Ñ?Ñ?.\n"
-"Ð?ажмиÑ?е \"СÑ?оп\" длÑ? немедленной оÑ?Ñ?ановки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
+msgstr "Ð?аÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? вÑ?клÑ?Ñ?аеÑ?Ñ?Ñ?.\nÐ?ажмиÑ?е \"СÑ?оп\" длÑ? немедленной оÑ?Ñ?ановки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ð?аÑ?алÑ?наÑ? загÑ?Ñ?зка Tor оÑ? %1 до %2"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"\n"
+"Here's the last error message:\n"
+"%2"
+msgstr "Vidalia не можеÑ? найÑ?и Ñ?поÑ?об взаимодейÑ?Ñ?воваÑ?Ñ? Ñ? Tor, поÑ?омÑ? Ñ?Ñ?о не имееÑ? доÑ?Ñ?Ñ?п к Ñ?ледÑ?Ñ?Ñ?емÑ? Ñ?айлÑ?: %1\n\nÐ?оÑ?леднее Ñ?ообÑ?ение об оÑ?ибке:\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 "Ð?оÑ?оже Tor завеÑ?Ñ?ил Ñ?воÑ? Ñ?абоÑ?Ñ? поÑ?ле Ñ?ого, как его запÑ?Ñ?Ñ?ил Vidalia.\n\nÐ?ополниÑ?елÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? Ñ?моÑ?Ñ?иÑ?е в РаÑ?Ñ?иÑ?енном Ð?оге СообÑ?ений."
 
 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?"
-msgstr ""
-"У ваÑ? в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? Ñ?абоÑ?аеÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?. Ð?Ñ?клÑ?Ñ?ение ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а пÑ?еÑ?вÑ?Ñ? вÑ?е оÑ?кÑ?Ñ?Ñ?Ñ?е Ñ?оединениÑ? клиенÑ?ов.\n"
-"\n"
-"ХоÑ?ели бÑ? Ð?Ñ? вÑ?клÑ?Ñ?иÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? в Ñ?адÑ?Ñ?ем Ñ?ежиме и даÑ?Ñ? клиенÑ?ам вÑ?емÑ? найÑ?и новÑ?й Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ??"
+msgstr "У ваÑ? в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? Ñ?абоÑ?аеÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?. Ð?Ñ?клÑ?Ñ?ение ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а пÑ?еÑ?вÑ?Ñ? вÑ?е оÑ?кÑ?Ñ?Ñ?Ñ?е Ñ?оединениÑ? клиенÑ?ов.\n\nХоÑ?ели бÑ? Ð?Ñ? вÑ?клÑ?Ñ?иÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? в Ñ?адÑ?Ñ?ем Ñ?ежиме и даÑ?Ñ? клиенÑ?ам вÑ?емÑ? найÑ?и новÑ?й Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ??"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia обнаÑ?Ñ?жила, Ñ?Ñ?о пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor неожиданно завеÑ?Ñ?ило "
-"Ñ?абоÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е жÑ?Ñ?нал Ñ?ообÑ?ений на поÑ?ледние пÑ?едÑ?пÑ?еждениÑ? "
-"или Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ?."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(веÑ?оÑ?Ñ?но Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(веÑ?оÑ?Ñ?но email клиенÑ?)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Ð?оÑ?оже, Ñ?Ñ?о одно из ваÑ?иÑ? пÑ?иложений %1 Ñ?оздаеÑ? поÑ?енÑ?иалÑ?но не "
-"заÑ?иÑ?Ñ?ованное и небезопаÑ?ное Ñ?оединение на поÑ?Ñ? %2."
+msgstr "Vidalia обнаÑ?Ñ?жила, Ñ?Ñ?о пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor неожиданно завеÑ?Ñ?ило Ñ?абоÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е жÑ?Ñ?нал Ñ?ообÑ?ений на поÑ?ледние пÑ?едÑ?пÑ?еждениÑ? или Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ?."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2183,9 +2164,7 @@ msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? имÑ? Ñ?айла жÑ?Ñ?нала"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Ð?Ñ? должнÑ? ввеÑ?Ñ?и имÑ? Ñ?айла, Ñ?Ñ?обÑ? имеÑ?Ñ? возможноÑ?Ñ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? запиÑ?и жÑ?Ñ?нала"
-" в Ñ?айл."
+msgstr "Ð?Ñ? должнÑ? ввеÑ?Ñ?и имÑ? Ñ?айла, Ñ?Ñ?обÑ? имеÑ?Ñ? возможноÑ?Ñ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? запиÑ?и жÑ?Ñ?нала в Ñ?айл."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2435,9 +2414,7 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"СообÑ?ениÑ?, коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? когда Ñ?Ñ?о-Ñ?о поÑ?ло оÑ?енÑ? непÑ?авилÑ?но и Tor не "
-"можеÑ? пÑ?одолжиÑ?Ñ?."
+msgstr "СообÑ?ениÑ?, коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? когда Ñ?Ñ?о-Ñ?о поÑ?ло оÑ?енÑ? непÑ?авилÑ?но и Tor не можеÑ? пÑ?одолжиÑ?Ñ?."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2451,26 +2428,19 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"СообÑ?ениÑ? коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? Ñ?едко\n"
-"во вÑ?емÑ? ноÑ?малÑ?ной Ñ?абоÑ?Ñ? Tor\n"
-"и не Ñ?Ñ?иÑ?аÑ?Ñ?Ñ?Ñ? оÑ?ибками,\n"
-"но вÑ? можеÑ?е Ñ?делиÑ?Ñ? им внимание."
+msgstr "СообÑ?ениÑ? коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? Ñ?едко\nво вÑ?емÑ? ноÑ?малÑ?ной Ñ?абоÑ?Ñ? Tor\nи не Ñ?Ñ?иÑ?аÑ?Ñ?Ñ?Ñ? оÑ?ибками,\nно вÑ? можеÑ?е Ñ?делиÑ?Ñ? им внимание."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
-"СообÑ?ениÑ?, коÑ?оÑ?Ñ?е Ñ?аÑ?Ñ?о поÑ?влÑ?Ñ?Ñ?Ñ?Ñ?\n"
-"во вÑ?емÑ? ноÑ?малÑ?ной Ñ?абоÑ?Ñ? Tor."
+msgstr "СообÑ?ениÑ?, коÑ?оÑ?Ñ?е Ñ?аÑ?Ñ?о поÑ?влÑ?Ñ?Ñ?Ñ?Ñ?\nво вÑ?емÑ? ноÑ?малÑ?ной Ñ?абоÑ?Ñ? Tor."
 
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
-"Ð?ипеÑ?-Ñ?ообÑ?ениÑ? в пеÑ?вÑ?Ñ? оÑ?еÑ?едÑ? пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ? инÑ?еÑ?еÑ? длÑ? Ñ?азÑ?абоÑ?Ñ?иков Tor."
+msgstr "Ð?ипеÑ?-Ñ?ообÑ?ениÑ? в пеÑ?вÑ?Ñ? оÑ?еÑ?едÑ? пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ? инÑ?еÑ?еÑ? длÑ? Ñ?азÑ?абоÑ?Ñ?иков Tor."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2584,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ð?евеÑ?нÑ?й моÑ?Ñ?"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "УказаннÑ?й иденÑ?иÑ?икаÑ?оÑ? моÑ?Ñ?а не дейÑ?Ñ?виÑ?елен."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Ð?опиÑ?оваÑ?Ñ? (Ctrl+C)"
 
@@ -2599,17 +2561,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? IP-адÑ?еÑ? или имÑ? Ñ?оÑ?Ñ?а и поÑ?Ñ?, Ñ?Ñ?обÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? Tor и "
-"иÑ?полÑ?зоваÑ?Ñ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?."
+msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? IP-адÑ?еÑ? или имÑ? Ñ?оÑ?Ñ?а и поÑ?Ñ?, Ñ?Ñ?обÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? Tor и иÑ?полÑ?зоваÑ?Ñ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? один или неÑ?колÑ?ко поÑ?Ñ?ов, к коÑ?оÑ?Ñ?м ваÑ? Ñ?еÑ?евой Ñ?кÑ?ан "
-"Ñ?азÑ?еÑ?аеÑ? подклÑ?Ñ?ение."
+msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? один или неÑ?колÑ?ко поÑ?Ñ?ов, к коÑ?оÑ?Ñ?м ваÑ? Ñ?еÑ?евой Ñ?кÑ?ан Ñ?азÑ?еÑ?аеÑ? подклÑ?Ñ?ение."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2617,8 +2575,7 @@ msgstr "'%1' невеÑ?нÑ?й номеÑ? поÑ?Ñ?а."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Ð?Ñ?овеÑ?Ñ?Ñ?е, еÑ?ли ваÑ?a локалÑ?нaÑ? Ñ?еÑ?Ñ? Ñ?Ñ?ебÑ?еÑ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?"
+msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?е, еÑ?ли ваÑ?a локалÑ?нaÑ? Ñ?еÑ?Ñ? Ñ?Ñ?ебÑ?еÑ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2642,14 +2599,11 @@ msgstr "Ð?оÑ?Ñ?:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"УдоÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?обÑ? подклÑ?Ñ?ение к Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ам Tor Ñ?ло Ñ?олÑ?ко Ñ?еÑ?ез "
-"поÑ?Ñ?Ñ?, Ñ?азÑ?еÑ?еннÑ?е ваÑ?им Ñ?еÑ?евÑ?м Ñ?кÑ?аном."
+msgstr "УдоÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?обÑ? подклÑ?Ñ?ение к Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ам Tor Ñ?ло Ñ?олÑ?ко Ñ?еÑ?ез поÑ?Ñ?Ñ?, Ñ?азÑ?еÑ?еннÑ?е ваÑ?им Ñ?еÑ?евÑ?м Ñ?кÑ?аном."
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr ""
-"Ð?ой Ñ?еÑ?евой Ñ?кÑ?ан позволÑ?еÑ? мне подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? Ñ?олÑ?ко к опÑ?еделеннÑ?м поÑ?Ñ?ам"
+msgstr "Ð?ой Ñ?еÑ?евой Ñ?кÑ?ан позволÑ?еÑ? мне подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? Ñ?олÑ?ко к опÑ?еделеннÑ?м поÑ?Ñ?ам"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
@@ -2667,9 +2621,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"УдоÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о запÑ?оÑ?Ñ? каÑ?алогa Ñ?иÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? и, пÑ?и необÑ?одимоÑ?Ñ?и, "
-"иÑ?полÑ?зÑ?Ñ?Ñ?Ñ?Ñ? моÑ?Ñ?Ñ? длÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?и Tor"
+msgstr "УдоÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о запÑ?оÑ?Ñ? каÑ?алогa Ñ?иÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? и, пÑ?и необÑ?одимоÑ?Ñ?и, иÑ?полÑ?зÑ?Ñ?Ñ?Ñ?Ñ? моÑ?Ñ?Ñ? длÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?и Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2707,15 +2659,11 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Ð?еÑ? новÑ?Ñ? моÑ?Ñ?ов, коÑ?оÑ?Ñ?е в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? доÑ?Ñ?Ñ?пнÑ?. Ð?Ñ? можеÑ?е либо "
-"подождаÑ?Ñ? некоÑ?оÑ?ое вÑ?емÑ? и попÑ?обоваÑ?Ñ? еÑ?е Ñ?аз, или попÑ?обÑ?йÑ?е дÑ?Ñ?гой "
-"Ñ?поÑ?об наÑ?ождениÑ? новÑ?Ñ? моÑ?Ñ?ов."
+msgstr "Ð?еÑ? новÑ?Ñ? моÑ?Ñ?ов, коÑ?оÑ?Ñ?е в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? доÑ?Ñ?Ñ?пнÑ?. Ð?Ñ? можеÑ?е либо подождаÑ?Ñ? некоÑ?оÑ?ое вÑ?емÑ? и попÑ?обоваÑ?Ñ? еÑ?е Ñ?аз, или попÑ?обÑ?йÑ?е дÑ?Ñ?гой Ñ?поÑ?об наÑ?ождениÑ? новÑ?Ñ? моÑ?Ñ?ов."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Ð?ажмиÑ?е кнопкÑ? Ð?омоÑ?Ñ?, Ñ?Ñ?обÑ? Ñ?видеÑ?Ñ? дÑ?Ñ?гие меÑ?одÑ? поиÑ?ка новÑ?Ñ? моÑ?Ñ?ов."
+msgstr "Ð?ажмиÑ?е кнопкÑ? Ð?омоÑ?Ñ?, Ñ?Ñ?обÑ? Ñ?видеÑ?Ñ? дÑ?Ñ?гие меÑ?одÑ? поиÑ?ка новÑ?Ñ? моÑ?Ñ?ов."
 
 msgctxt "NetworkPage"
 msgid "Address:"
@@ -2738,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr "Ð?еобÑ?одимо задаÑ?Ñ? один или неÑ?колÑ?ко моÑ?Ñ?ов."
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "пÑ?инÑ?Ñ?Ñ?"
@@ -2901,16 +2849,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Ð?Ñ? наÑ?Ñ?Ñ?оили Tor в каÑ?еÑ?Ñ?ве моÑ?Ñ?а длÑ? заблокиÑ?ованнÑ?Ñ? полÑ?зоваÑ?елей, но ваÑ?а"
-" веÑ?Ñ?иÑ? Tor не поддеÑ?живаеÑ? моÑ?Ñ?ов."
+msgstr "Ð?Ñ? наÑ?Ñ?Ñ?оили Tor в каÑ?еÑ?Ñ?ве моÑ?Ñ?а длÑ? заблокиÑ?ованнÑ?Ñ? полÑ?зоваÑ?елей, но ваÑ?а веÑ?Ñ?иÑ? Tor не поддеÑ?живаеÑ? моÑ?Ñ?ов."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Ð?ожалÑ?йÑ?Ñ?а, обновиÑ?е Tor или наÑ?Ñ?Ñ?ойÑ?е его как обÑ?Ñ?нÑ?й Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Tor."
+msgstr "Ð?ожалÑ?йÑ?Ñ?а, обновиÑ?е Tor или наÑ?Ñ?Ñ?ойÑ?е его как обÑ?Ñ?нÑ?й Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Tor."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2925,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "РабоÑ?аÑ?Ñ? Ñ?олÑ?ко как клиенÑ?"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "ТÑ?аÑ?ик Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?еÑ?и Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Ð?оÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а:"
 
@@ -2966,9 +2907,7 @@ msgstr "Ð?азвание ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Ð?оÑ?Ñ?, Ñ?еÑ?ез коÑ?оÑ?Ñ?й полÑ?зоваÑ?ели и дÑ?Ñ?гие Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ?могÑ?Ñ? обÑ?аÑ?Ñ?Ñ?Ñ? Ñ? "
-"ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом"
+msgstr "Ð?оÑ?Ñ?, Ñ?еÑ?ез коÑ?оÑ?Ñ?й полÑ?зоваÑ?ели и дÑ?Ñ?гие Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ?могÑ?Ñ? обÑ?аÑ?Ñ?Ñ?Ñ? Ñ? ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2982,9 +2921,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Ð?лÑ? подклÑ?Ñ?ений к Ð?нÑ?еÑ?неÑ? Ñ? медленной вÑ?одÑ?Ñ?ей, но Ñ? вÑ?Ñ?окой иÑ?Ñ?одÑ?Ñ?ей "
-"Ñ?коÑ?оÑ?Ñ?Ñ?Ñ?, пожалÑ?йÑ?Ñ?а, Ñ?кажиÑ?е здеÑ?Ñ? Ñ?воÑ? вÑ?одÑ?Ñ?Ñ?Ñ? Ñ?коÑ?оÑ?Ñ?Ñ?."
+msgstr "Ð?лÑ? подклÑ?Ñ?ений к Ð?нÑ?еÑ?неÑ? Ñ? медленной вÑ?одÑ?Ñ?ей, но Ñ? вÑ?Ñ?окой иÑ?Ñ?одÑ?Ñ?ей Ñ?коÑ?оÑ?Ñ?Ñ?Ñ?, пожалÑ?йÑ?Ñ?а, Ñ?кажиÑ?е здеÑ?Ñ? Ñ?воÑ? вÑ?одÑ?Ñ?Ñ?Ñ? Ñ?коÑ?оÑ?Ñ?Ñ?."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -3042,9 +2979,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Ð?акÑ?ималÑ?наÑ? пÑ?опÑ?Ñ?кнаÑ? Ñ?поÑ?обноÑ?Ñ?Ñ? должна бÑ?Ñ?Ñ? болÑ?Ñ?е или Ñ?авна ваÑ?ей "
-"Ñ?Ñ?едней пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?и. Ð?ба знаÑ?ениÑ? должнÑ? бÑ?Ñ?Ñ? не менее 20 Ð?Ð?/Ñ?."
+msgstr "Ð?акÑ?ималÑ?наÑ? пÑ?опÑ?Ñ?кнаÑ? Ñ?поÑ?обноÑ?Ñ?Ñ? должна бÑ?Ñ?Ñ? болÑ?Ñ?е или Ñ?авна ваÑ?ей Ñ?Ñ?едней пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?и. Ð?ба знаÑ?ениÑ? должнÑ? бÑ?Ñ?Ñ? не менее 20 Ð?Ð?/Ñ?."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3105,18 +3040,13 @@ msgstr "Ð?оказаÑ?Ñ? помоÑ?Ñ? по пÑ?авилам Ñ?злов вÑ?Ñ?о
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Ð? каким Ñ?еÑ?Ñ?Ñ?Ñ?ам Ð?нÑ?еÑ?неÑ? полÑ?зоваÑ?ели Ñ?могÑ?Ñ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п Ñ?еÑ?ез ваÑ? "
-"Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ??"
+msgstr "Ð? каким Ñ?еÑ?Ñ?Ñ?Ñ?ам Ð?нÑ?еÑ?неÑ? полÑ?зоваÑ?ели Ñ?могÑ?Ñ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п Ñ?еÑ?ез ваÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ??"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor бÑ?дÑ?Ñ? пÑ?одолжаÑ?Ñ? по Ñ?молÑ?аниÑ? блокиÑ?оваÑ?Ñ? некоÑ?оÑ?Ñ?Ñ? иÑ?Ñ?одÑ?Ñ?Ñ?Ñ? поÑ?Ñ?Ñ? и "
-"пÑ?иложениÑ? обмена Ñ?айлами длÑ? Ñ?менÑ?Ñ?ениÑ? колиÑ?еÑ?Ñ?ва Ñ?пама и дÑ?Ñ?гиÑ? "
-"злоÑ?поÑ?Ñ?еблений."
+msgstr "Tor бÑ?дÑ?Ñ? пÑ?одолжаÑ?Ñ? по Ñ?молÑ?аниÑ? блокиÑ?оваÑ?Ñ? некоÑ?оÑ?Ñ?Ñ? иÑ?Ñ?одÑ?Ñ?Ñ?Ñ? поÑ?Ñ?Ñ? и пÑ?иложениÑ? обмена Ñ?айлами длÑ? Ñ?менÑ?Ñ?ениÑ? колиÑ?еÑ?Ñ?ва Ñ?пама и дÑ?Ñ?гиÑ? злоÑ?поÑ?Ñ?еблений."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3129,9 +3059,7 @@ msgstr "Ð?айÑ?е дÑ?Ñ?гим доÑ?Ñ?Ñ?п к ваÑ?емÑ? моÑ?Ñ?Ñ?, пÑ?е
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"ЭÑ?о иденÑ?иÑ?икаÑ?оÑ? ваÑ?его моÑ?Ñ?а, коÑ?оÑ?Ñ?м вÑ? можеÑ?е поделиÑ?Ñ?Ñ?Ñ? Ñ? дÑ?Ñ?гими "
-"лÑ?дÑ?ми"
+msgstr "ЭÑ?о иденÑ?иÑ?икаÑ?оÑ? ваÑ?его моÑ?Ñ?а, коÑ?оÑ?Ñ?м вÑ? можеÑ?е поделиÑ?Ñ?Ñ?Ñ? Ñ? дÑ?Ñ?гими лÑ?дÑ?ми"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3149,9 +3077,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Ð?Ñ?Ñ?авÑ?Ñ?е ваÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?абоÑ?аÑ?Ñ?им, Ñ?Ñ?обÑ? клиенÑ?Ñ? имели болÑ?Ñ?е Ñ?анÑ?ов "
-"найÑ?и и иÑ?полÑ?зоваÑ?Ñ? его."
+msgstr "Ð?Ñ?Ñ?авÑ?Ñ?е ваÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?абоÑ?аÑ?Ñ?им, Ñ?Ñ?обÑ? клиенÑ?Ñ? имели болÑ?Ñ?е Ñ?анÑ?ов найÑ?и и иÑ?полÑ?зоваÑ?Ñ? его."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3165,9 +3091,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor веÑ?нÑ?л непÑ?авилÑ?но оÑ?Ñ?оÑ?маÑ?иÑ?ованнÑ?й оÑ?клик, когда Vidalia запÑ?аÑ?ивала "
-"иÑ?Ñ?оÑ?иÑ? иÑ?полÑ?зованиÑ? ваÑ?его моÑ?Ñ?а."
+msgstr "Tor веÑ?нÑ?л непÑ?авилÑ?но оÑ?Ñ?оÑ?маÑ?иÑ?ованнÑ?й оÑ?клик, когда Vidalia запÑ?аÑ?ивала иÑ?Ñ?оÑ?иÑ? иÑ?полÑ?зованиÑ? ваÑ?его моÑ?Ñ?а."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3190,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?Ñ? адÑ?еÑ? моего моÑ?Ñ?а"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "РеÑ?Ñ?анÑ?лиÑ?оваÑ?Ñ? Ñ?Ñ?аÑ?ик Ñ?еÑ?и Tor (вÑ?Ñ?одной Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "РеÑ?Ñ?анÑ?лиÑ?оваÑ?Ñ? Ñ?Ñ?аÑ?ик внÑ?Ñ?Ñ?и Ñ?еÑ?и Tor (невÑ?Ñ?одной Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?)"
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Ð?еÑ?калиÑ?оваÑ?Ñ? каÑ?алог Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ов"
 
@@ -3197,9 +3129,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Ð?дÑ?еÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?, по коÑ?оÑ?омÑ? ваÑ? можно найÑ?и, еÑ?ли\n"
-"возникнеÑ? пÑ?облема Ñ? ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом. Ð?Ñ? Ñ?акже можеÑ?е Ñ?казаÑ?Ñ? ваÑ? PGP или GPG оÑ?пеÑ?аÑ?ок."
+msgstr "Ð?дÑ?еÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?, по коÑ?оÑ?омÑ? ваÑ? можно найÑ?и, еÑ?ли\nвозникнеÑ? пÑ?облема Ñ? ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом. Ð?Ñ? Ñ?акже можеÑ?е Ñ?казаÑ?Ñ? ваÑ? PGP или GPG оÑ?пеÑ?аÑ?ок."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3209,9 +3139,7 @@ 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 ""
-"Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е по кÑ?айней меÑ?е каÑ?алог Ñ?еÑ?виÑ?ов и виÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? длÑ?"
-" каждого Ñ?еÑ?виÑ?а, коÑ?оÑ?Ñ?й вÑ? Ñ?оÑ?иÑ?е  Ñ?оÑ?Ñ?аниÑ?Ñ?. УдалиÑ?е дÑ?Ñ?гие."
+msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е по кÑ?айней меÑ?е каÑ?алог Ñ?еÑ?виÑ?ов и виÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? длÑ? каждого Ñ?еÑ?виÑ?а, коÑ?оÑ?Ñ?й вÑ? Ñ?оÑ?иÑ?е  Ñ?оÑ?Ñ?аниÑ?Ñ?. УдалиÑ?е дÑ?Ñ?гие."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3227,8 +3155,7 @@ msgstr "Ð?Ñ?беÑ?иÑ?е каÑ?алог Ñ?еÑ?виÑ?ов"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? Ñ?олÑ?ко допÑ?Ñ?Ñ?имÑ?е номеÑ?а поÑ?Ñ?а [1..65535]."
+msgstr "Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? Ñ?олÑ?ко допÑ?Ñ?Ñ?имÑ?е номеÑ?а поÑ?Ñ?а [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
@@ -3280,9 +3207,7 @@ msgstr "Ð?опиÑ?оваÑ?Ñ? \"лÑ?ковÑ?й\" адÑ?еÑ? вÑ?бÑ?анного
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Ð?Ñ?оÑ?моÑ?Ñ? в локалÑ?ной Ñ?айловой Ñ?иÑ?Ñ?еме и вÑ?бÑ?аÑ?Ñ? каÑ?алог длÑ? вÑ?бÑ?анного "
-"Ñ?еÑ?виÑ?а"
+msgstr "Ð?Ñ?оÑ?моÑ?Ñ? в локалÑ?ной Ñ?айловой Ñ?иÑ?Ñ?еме и вÑ?бÑ?аÑ?Ñ? каÑ?алог длÑ? вÑ?бÑ?анного Ñ?еÑ?виÑ?а"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3309,10 +3234,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"Ð?ажмиÑ?е \"Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Tor\" в Ð?анели УпÑ?авлениÑ? Vidalia Ñ?Ñ?о бÑ? пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? "
-"Tor. Ð?Ñ?ли Tor бÑ?л неожиданно завеÑ?Ñ?ен, вÑ?беÑ?иÑ?е вÑ?Ñ?е вкладкÑ? \"РаÑ?Ñ?иÑ?еннÑ?е\""
-" длÑ? пÑ?оÑ?моÑ?Ñ?а инÑ?оÑ?маÑ?ии о пÑ?оизоÑ?едÑ?иÑ? оÑ?ибкаÑ?."
+msgstr "Ð?ажмиÑ?е \"Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Tor\" в Ð?анели УпÑ?авлениÑ? Vidalia Ñ?Ñ?о бÑ? пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor. Ð?Ñ?ли Tor бÑ?л неожиданно завеÑ?Ñ?ен, вÑ?беÑ?иÑ?е вÑ?Ñ?е вкладкÑ? \"РаÑ?Ñ?иÑ?еннÑ?е\" длÑ? пÑ?оÑ?моÑ?Ñ?а инÑ?оÑ?маÑ?ии о пÑ?оизоÑ?едÑ?иÑ? оÑ?ибкаÑ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3320,10 +3242,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
-"Ð?Ñ? иÑ?полÑ?зÑ?еÑ?е веÑ?Ñ?иÑ? Tor \"%1\", коÑ?оÑ?аÑ? более не Ñ?екомендÑ?еÑ?Ñ?Ñ? длÑ? "
-"иÑ?полÑ?зованиÑ?. Ð?ожалÑ?йÑ?Ñ?а, обновиÑ?еÑ?Ñ? до поÑ?ледней веÑ?Ñ?ии, коÑ?оÑ?аÑ? можеÑ? "
-"Ñ?одеÑ?жаÑ?Ñ? важнÑ?е иÑ?пÑ?авлениÑ? безопаÑ?ноÑ?Ñ?и, надежноÑ?Ñ?и и пÑ?оизводиÑ?елÑ?ноÑ?Ñ?и."
+msgstr "Ð?Ñ? иÑ?полÑ?зÑ?еÑ?е веÑ?Ñ?иÑ? Tor \"%1\", коÑ?оÑ?аÑ? более не Ñ?екомендÑ?еÑ?Ñ?Ñ? длÑ? иÑ?полÑ?зованиÑ?. Ð?ожалÑ?йÑ?Ñ?а, обновиÑ?еÑ?Ñ? до поÑ?ледней веÑ?Ñ?ии, коÑ?оÑ?аÑ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? важнÑ?е иÑ?пÑ?авлениÑ? безопаÑ?ноÑ?Ñ?и, надежноÑ?Ñ?и и пÑ?оизводиÑ?елÑ?ноÑ?Ñ?и."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3331,10 +3250,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"Ð?Ñ? иÑ?полÑ?зÑ?еÑ?е веÑ?Ñ?иÑ? Tor \"%1\", коÑ?оÑ?аÑ? можеÑ? более не Ñ?абоÑ?аÑ?Ñ? Ñ? Ñ?екÑ?Ñ?ей "
-"веÑ?Ñ?ией Ñ?еÑ?и Tor. Ð?ожалÑ?йÑ?Ñ?а, обновиÑ?еÑ?Ñ? до поÑ?ледней веÑ?Ñ?ии, коÑ?оÑ?аÑ? можеÑ? "
-"Ñ?одеÑ?жаÑ?Ñ? важнÑ?е иÑ?пÑ?авлениÑ? безопаÑ?ноÑ?Ñ?и, надежноÑ?Ñ?и и пÑ?оизводиÑ?елÑ?ноÑ?Ñ?и."
+msgstr "Ð?Ñ? иÑ?полÑ?зÑ?еÑ?е веÑ?Ñ?иÑ? Tor \"%1\", коÑ?оÑ?аÑ? можеÑ? более не Ñ?абоÑ?аÑ?Ñ? Ñ? Ñ?екÑ?Ñ?ей веÑ?Ñ?ией Ñ?еÑ?и Tor. Ð?ожалÑ?йÑ?Ñ?а, обновиÑ?еÑ?Ñ? до поÑ?ледней веÑ?Ñ?ии, коÑ?оÑ?аÑ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? важнÑ?е иÑ?пÑ?авлениÑ? безопаÑ?ноÑ?Ñ?и, надежноÑ?Ñ?и и пÑ?оизводиÑ?елÑ?ноÑ?Ñ?и."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3348,9 +3264,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Ð?Ñ? Ñ?могли Ñ?Ñ?пеÑ?но Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ? Ñ?еÑ?Ñ?Ñ? Tor. ТепеÑ?Ñ? вÑ? можеÑ?е "
-"наÑ?Ñ?Ñ?оиÑ?Ñ? ваÑ?и пÑ?иложениÑ? длÑ? анонимного иÑ?полÑ?зованиÑ? Ð?нÑ?еÑ?неÑ?."
+msgstr "Ð?Ñ? Ñ?могли Ñ?Ñ?пеÑ?но Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ? Ñ?еÑ?Ñ?Ñ? Tor. ТепеÑ?Ñ? вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? ваÑ?и пÑ?иложениÑ? длÑ? анонимного иÑ?полÑ?зованиÑ? Ð?нÑ?еÑ?неÑ?."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3360,9 +3274,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Ð?Ñ?оизоÑ?ла внÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка Tor. Ð?ожалÑ?йÑ?Ñ?а, Ñ?ообÑ?иÑ?е Ñ?ледÑ?Ñ?Ñ?ее Ñ?ообÑ?ение об"
-" оÑ?ибке Ñ?азÑ?абоÑ?Ñ?икам Tor на bugs.torproject.org: \"%1\""
+msgstr "Ð?Ñ?оизоÑ?ла внÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка Tor. Ð?ожалÑ?йÑ?Ñ?а, Ñ?ообÑ?иÑ?е Ñ?ледÑ?Ñ?Ñ?ее Ñ?ообÑ?ение об оÑ?ибке Ñ?азÑ?абоÑ?Ñ?икам Tor на bugs.torproject.org: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3370,10 +3282,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor обнаÑ?Ñ?жил, Ñ?Ñ?о Ñ?аÑ?Ñ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а возможно оÑ?Ñ?Ñ?аÑ?Ñ? на %1 Ñ?екÑ?нд по "
-"Ñ?Ñ?авнениÑ? Ñ? \"%2\". Ð?Ñ?ли ваÑ?и Ñ?аÑ?Ñ? не пÑ?авилÑ?нÑ?, Tor не Ñ?можеÑ? Ñ?абоÑ?аÑ?Ñ?. "
-"Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?Ñ?о ваÑ? компÑ?Ñ?Ñ?еÑ? показÑ?ваеÑ? пÑ?авилÑ?ное вÑ?емÑ?."
+msgstr "Tor обнаÑ?Ñ?жил, Ñ?Ñ?о Ñ?аÑ?Ñ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а возможно оÑ?Ñ?Ñ?аÑ?Ñ? на %1 Ñ?екÑ?нд по Ñ?Ñ?авнениÑ? Ñ? \"%2\". Ð?Ñ?ли ваÑ?и Ñ?аÑ?Ñ? не пÑ?авилÑ?нÑ?, Tor не Ñ?можеÑ? Ñ?абоÑ?аÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?Ñ?о ваÑ? компÑ?Ñ?Ñ?еÑ? показÑ?ваеÑ? пÑ?авилÑ?ное вÑ?емÑ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3381,10 +3290,7 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
-"Tor обнаÑ?Ñ?жил, Ñ?Ñ?о Ñ?аÑ?Ñ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а возможно Ñ?пеÑ?аÑ? на %1 Ñ?екÑ?нд по "
-"Ñ?Ñ?авнениÑ? Ñ? \"%2\". Ð?Ñ?ли ваÑ?и Ñ?аÑ?Ñ? не пÑ?авилÑ?нÑ?, Tor не Ñ?можеÑ? Ñ?абоÑ?аÑ?Ñ?. "
-"Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?Ñ?о ваÑ? компÑ?Ñ?Ñ?еÑ? показÑ?ваеÑ? пÑ?авилÑ?ное вÑ?емÑ?."
+msgstr "Tor обнаÑ?Ñ?жил, Ñ?Ñ?о Ñ?аÑ?Ñ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а возможно Ñ?пеÑ?аÑ? на %1 Ñ?екÑ?нд по Ñ?Ñ?авнениÑ? Ñ? \"%2\". Ð?Ñ?ли ваÑ?и Ñ?аÑ?Ñ? не пÑ?авилÑ?нÑ?, Tor не Ñ?можеÑ? Ñ?абоÑ?аÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?Ñ?о ваÑ? компÑ?Ñ?Ñ?еÑ? показÑ?ваеÑ? пÑ?авилÑ?ное вÑ?емÑ?."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3396,21 +3302,14 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
-"Ð?дно из пÑ?иложений на ваÑ?ем компÑ?Ñ?Ñ?еÑ?е возможно попÑ?Ñ?алоÑ?Ñ? Ñ?оздаÑ?Ñ? "
-"незаÑ?иÑ?Ñ?ованное Ñ?оединение Ñ?еÑ?ез Tor на поÑ?Ñ? %1. Ð?Ñ?пÑ?авлÑ?Ñ?Ñ? незаÑ?иÑ?Ñ?ованнÑ?Ñ? "
-"инÑ?оÑ?маÑ?иÑ? Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor опаÑ?но и не Ñ?екомендÑ?еÑ?Ñ?Ñ?. Ð?лÑ? ваÑ?ей безопаÑ?ноÑ?Ñ?и "
-"Tor авÑ?омаÑ?иÑ?еÑ?ки закÑ?Ñ?л Ñ?Ñ?о Ñ?оединение."
+msgstr "Ð?дно из пÑ?иложений на ваÑ?ем компÑ?Ñ?Ñ?еÑ?е возможно попÑ?Ñ?алоÑ?Ñ? Ñ?оздаÑ?Ñ? незаÑ?иÑ?Ñ?ованное Ñ?оединение Ñ?еÑ?ез Tor на поÑ?Ñ? %1. Ð?Ñ?пÑ?авлÑ?Ñ?Ñ? незаÑ?иÑ?Ñ?ованнÑ?Ñ? инÑ?оÑ?маÑ?иÑ? Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor опаÑ?но и не Ñ?екомендÑ?еÑ?Ñ?Ñ?. Ð?лÑ? ваÑ?ей безопаÑ?ноÑ?Ñ?и Tor авÑ?омаÑ?иÑ?еÑ?ки закÑ?Ñ?л Ñ?Ñ?о Ñ?оединение."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Ð?дно из пÑ?иложений на ваÑ?ем компÑ?Ñ?Ñ?еÑ?е возможно попÑ?Ñ?алоÑ?Ñ? Ñ?оздаÑ?Ñ? "
-"незаÑ?иÑ?Ñ?ованное Ñ?оединение Ñ?еÑ?ез Tor на поÑ?Ñ? %1. Ð?Ñ?пÑ?авлÑ?Ñ?Ñ? незаÑ?иÑ?Ñ?ованнÑ?Ñ? "
-"инÑ?оÑ?маÑ?иÑ? Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor опаÑ?но и не Ñ?екомендÑ?еÑ?Ñ?Ñ?."
+msgstr "Ð?дно из пÑ?иложений на ваÑ?ем компÑ?Ñ?Ñ?еÑ?е возможно попÑ?Ñ?алоÑ?Ñ? Ñ?оздаÑ?Ñ? незаÑ?иÑ?Ñ?ованное Ñ?оединение Ñ?еÑ?ез Tor на поÑ?Ñ? %1. Ð?Ñ?пÑ?авлÑ?Ñ?Ñ? незаÑ?иÑ?Ñ?ованнÑ?Ñ? инÑ?оÑ?маÑ?иÑ? Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor опаÑ?но и не Ñ?екомендÑ?еÑ?Ñ?Ñ?."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
@@ -3422,11 +3321,7 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
-"Ð?дно из ваÑ?иÑ? пÑ?иложений Ñ?Ñ?Ñ?ановило Ñ?оединение Ñ?еÑ?ез Tor на %1, иÑ?полÑ?зÑ?Ñ? "
-"пÑ?оÑ?окол, коÑ?оÑ?Ñ?й можеÑ? пÑ?ивеÑ?Ñ?и Ñ? Ñ?Ñ?еÑ?ке инÑ?оÑ?маÑ?ии о ваÑ?ем адÑ?еÑ?аÑ?е. "
-"Ð?ожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о вÑ? наÑ?Ñ?Ñ?оили ваÑ?и пÑ?иложениÑ? на "
-"иÑ?полÑ?зование Ñ?олÑ?ко SOCKS4a или SOCKS5 Ñ? Ñ?даленнÑ?м Ñ?азÑ?еÑ?ением имен Ñ?оÑ?Ñ?ов."
+msgstr "Ð?дно из ваÑ?иÑ? пÑ?иложений Ñ?Ñ?Ñ?ановило Ñ?оединение Ñ?еÑ?ез Tor на %1, иÑ?полÑ?зÑ?Ñ? пÑ?оÑ?окол, коÑ?оÑ?Ñ?й можеÑ? пÑ?ивеÑ?Ñ?и Ñ? Ñ?Ñ?еÑ?ке инÑ?оÑ?маÑ?ии о ваÑ?ем адÑ?еÑ?аÑ?е. Ð?ожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о вÑ? наÑ?Ñ?Ñ?оили ваÑ?и пÑ?иложениÑ? на иÑ?полÑ?зование Ñ?олÑ?ко SOCKS4a или SOCKS5 Ñ? Ñ?даленнÑ?м Ñ?азÑ?еÑ?ением имен Ñ?оÑ?Ñ?ов."
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
@@ -3437,11 +3332,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Ð?дно из ваÑ?иÑ? пÑ?иложений попÑ?Ñ?алоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ?еÑ?ез Tor "
-"иÑ?полÑ?зÑ?Ñ? пÑ?оÑ?окол неизвеÑ?Ñ?нÑ?й Tor. Ð?ожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о вÑ? "
-"наÑ?Ñ?Ñ?оили ваÑ?и пÑ?иложениÑ? на иÑ?полÑ?зование Ñ?олÑ?ко SOCKS4a или SOCKS5 Ñ? "
-"Ñ?даленнÑ?м Ñ?азÑ?еÑ?ением имен Ñ?оÑ?Ñ?ов."
+msgstr "Ð?дно из ваÑ?иÑ? пÑ?иложений попÑ?Ñ?алоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ?еÑ?ез Tor иÑ?полÑ?зÑ?Ñ? пÑ?оÑ?окол неизвеÑ?Ñ?нÑ?й Tor. Ð?ожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о вÑ? наÑ?Ñ?Ñ?оили ваÑ?и пÑ?иложениÑ? на иÑ?полÑ?зование Ñ?олÑ?ко SOCKS4a или SOCKS5 Ñ? Ñ?даленнÑ?м Ñ?азÑ?еÑ?ением имен Ñ?оÑ?Ñ?ов."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
@@ -3452,10 +3343,7 @@ msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
-"Ð?дно из ваÑ?иÑ? пÑ?иложений попÑ?Ñ?алоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ?еÑ?ез Tor к "
-"\"%1\", Ñ?Ñ?о не бÑ?ло Ñ?аÑ?познано Tor как дейÑ?Ñ?виÑ?елÑ?ное имÑ? Ñ?оÑ?Ñ?а. Ð?ожалÑ?йÑ?Ñ?а,"
-" пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?иÑ? пÑ?иложений."
+msgstr "Ð?дно из ваÑ?иÑ? пÑ?иложений попÑ?Ñ?алоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ?еÑ?ез Tor к \"%1\", Ñ?Ñ?о не бÑ?ло Ñ?аÑ?познано Tor как дейÑ?Ñ?виÑ?елÑ?ное имÑ? Ñ?оÑ?Ñ?а. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?иÑ? пÑ?иложений."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
@@ -3466,10 +3354,7 @@ msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
-"Tor опÑ?еделил, Ñ?Ñ?о пÑ?блиÑ?нÑ?й IP адÑ?еÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ейÑ?аÑ? - %1%2. "
-"Ð?Ñ?ли Ñ?Ñ?о невеÑ?но, пожалÑ?йÑ?Ñ?а, Ñ?аÑ?Ñ?моÑ?Ñ?иÑ?е возможноÑ?Ñ?Ñ? Ñ?Ñ?Ñ?ановки опÑ?ии "
-"'Ð?дÑ?еÑ?' в наÑ?Ñ?Ñ?ойкаÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
+msgstr "Tor опÑ?еделил, Ñ?Ñ?о пÑ?блиÑ?нÑ?й IP адÑ?еÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ейÑ?аÑ? - %1%2. Ð?Ñ?ли Ñ?Ñ?о невеÑ?но, пожалÑ?йÑ?Ñ?а, Ñ?аÑ?Ñ?моÑ?Ñ?иÑ?е возможноÑ?Ñ?Ñ? Ñ?Ñ?Ñ?ановки опÑ?ии 'Ð?дÑ?еÑ?' в наÑ?Ñ?Ñ?ойкаÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
@@ -3480,22 +3365,14 @@ msgid ""
 "Tor detected that your DNS provider is providing false responses for domains"
 " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
 "known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor обнаÑ?Ñ?жил, Ñ?Ñ?о ваÑ? пÑ?овайдеÑ? DNS пÑ?едоÑ?Ñ?авлÑ?еÑ? ложнÑ?е оÑ?веÑ?Ñ? длÑ? доменов"
-" коÑ?оÑ?Ñ?е не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?. Ð?екоÑ?оÑ?Ñ?е пÑ?овайдеÑ?Ñ? Ð?нÑ?еÑ?неÑ? и дÑ?Ñ?гие DNS "
-"пÑ?овайдеÑ?Ñ?, Ñ?ипа OpenDNS, извеÑ?Ñ?нÑ? Ñ?ем, Ñ?Ñ?о делаÑ?Ñ? Ñ?Ñ?о Ñ? Ñ?елÑ?Ñ? оÑ?обÑ?азиÑ?Ñ? иÑ?"
-" Ñ?обÑ?Ñ?веннÑ?е поиÑ?ковÑ?е или Ñ?екламнÑ?е Ñ?Ñ?Ñ?аниÑ?Ñ?."
+msgstr "Tor обнаÑ?Ñ?жил, Ñ?Ñ?о ваÑ? пÑ?овайдеÑ? DNS пÑ?едоÑ?Ñ?авлÑ?еÑ? ложнÑ?е оÑ?веÑ?Ñ? длÑ? доменов коÑ?оÑ?Ñ?е не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?. Ð?екоÑ?оÑ?Ñ?е пÑ?овайдеÑ?Ñ? Ð?нÑ?еÑ?неÑ? и дÑ?Ñ?гие DNS пÑ?овайдеÑ?Ñ?, Ñ?ипа OpenDNS, извеÑ?Ñ?нÑ? Ñ?ем, Ñ?Ñ?о делаÑ?Ñ? Ñ?Ñ?о Ñ? Ñ?елÑ?Ñ? оÑ?обÑ?азиÑ?Ñ? иÑ? Ñ?обÑ?Ñ?веннÑ?е поиÑ?ковÑ?е или Ñ?екламнÑ?е Ñ?Ñ?Ñ?аниÑ?Ñ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor detected that your DNS provider is providing false responses for well "
 "known domains. Since clients rely on Tor network relays to provide accurate "
 "DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor обнаÑ?Ñ?жил, Ñ?Ñ?о ваÑ? пÑ?овайдеÑ? DNS пÑ?едоÑ?Ñ?авлÑ?еÑ? ложнÑ?е оÑ?веÑ?Ñ? длÑ? "
-"извеÑ?Ñ?нÑ?Ñ? доменов. Ð?оÑ?колÑ?кÑ? клиенÑ?Ñ? полагаÑ?Ñ?Ñ?Ñ? на Ñ?о, Ñ?Ñ?о Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? "
-"Ñ?еÑ?и Tor пÑ?едоÑ?Ñ?авлÑ?Ñ?Ñ? веÑ?нÑ?е DNS оÑ?веÑ?Ñ?, ваÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? не бÑ?деÑ? наÑ?Ñ?Ñ?оен"
-" как вÑ?Ñ?одной Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?."
+msgstr "Tor обнаÑ?Ñ?жил, Ñ?Ñ?о ваÑ? пÑ?овайдеÑ? DNS пÑ?едоÑ?Ñ?авлÑ?еÑ? ложнÑ?е оÑ?веÑ?Ñ? длÑ? извеÑ?Ñ?нÑ?Ñ? доменов. Ð?оÑ?колÑ?кÑ? клиенÑ?Ñ? полагаÑ?Ñ?Ñ?Ñ? на Ñ?о, Ñ?Ñ?о Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ?еÑ?и Tor пÑ?едоÑ?Ñ?авлÑ?Ñ?Ñ? веÑ?нÑ?е DNS оÑ?веÑ?Ñ?, ваÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? не бÑ?деÑ? наÑ?Ñ?Ñ?оен как вÑ?Ñ?одной Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
@@ -3506,10 +3383,7 @@ msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
-"Tor пÑ?Ñ?аеÑ?Ñ?Ñ? опÑ?еделиÑ?Ñ? доÑ?Ñ?Ñ?пноÑ?Ñ?Ñ? поÑ?Ñ?а Ñ?еÑ?веÑ?а ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а из "
-"Ñ?еÑ?и Tor, Ñ?оединÑ?Ñ?Ñ?Ñ? Ñ? Ñ?амим Ñ?обой на %1:%2. ЭÑ?оÑ? Ñ?еÑ?Ñ? можеÑ? занÑ?Ñ?Ñ? "
-"неÑ?колÑ?ко минÑ?Ñ?."
+msgstr "Tor пÑ?Ñ?аеÑ?Ñ?Ñ? опÑ?еделиÑ?Ñ? доÑ?Ñ?Ñ?пноÑ?Ñ?Ñ? поÑ?Ñ?а Ñ?еÑ?веÑ?а ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а из Ñ?еÑ?и Tor, Ñ?оединÑ?Ñ?Ñ?Ñ? Ñ? Ñ?амим Ñ?обой на %1:%2. ЭÑ?оÑ? Ñ?еÑ?Ñ? можеÑ? занÑ?Ñ?Ñ? неÑ?колÑ?ко минÑ?Ñ?."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
@@ -3529,11 +3403,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and server port, "
 "please check your relay's configuration."
-msgstr ""
-"Ð?оÑ?Ñ? Ñ?еÑ?веÑ?а ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а недоÑ?Ñ?Ñ?пен дÑ?Ñ?гим клиенÑ?ам Tor. ЭÑ?о можеÑ? "
-"пÑ?оиÑ?Ñ?одиÑ?Ñ? еÑ?ли вÑ? наÑ?одиÑ?еÑ?Ñ? за Ñ?оÑ?Ñ?еÑ?ом или бÑ?андмаÑ?Ñ?Ñ?ом, Ñ?Ñ?о Ñ?Ñ?ебÑ?еÑ? оÑ? "
-"ваÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?обÑ?оÑ? поÑ?Ñ?ов. Ð?Ñ?ли %1:%2 не ваÑ?и пÑ?авилÑ?нÑ?е IP адÑ?еÑ? и поÑ?Ñ? "
-"Ñ?еÑ?веÑ?а, пожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
+msgstr "Ð?оÑ?Ñ? Ñ?еÑ?веÑ?а ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а недоÑ?Ñ?Ñ?пен дÑ?Ñ?гим клиенÑ?ам Tor. ЭÑ?о можеÑ? пÑ?оиÑ?Ñ?одиÑ?Ñ? еÑ?ли вÑ? наÑ?одиÑ?еÑ?Ñ? за Ñ?оÑ?Ñ?еÑ?ом или бÑ?андмаÑ?Ñ?Ñ?ом, Ñ?Ñ?о Ñ?Ñ?ебÑ?еÑ? оÑ? ваÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?обÑ?оÑ? поÑ?Ñ?ов. Ð?Ñ?ли %1:%2 не ваÑ?и пÑ?авилÑ?нÑ?е IP адÑ?еÑ? и поÑ?Ñ? Ñ?еÑ?веÑ?а, пожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
@@ -3544,10 +3414,7 @@ msgid ""
 "Tor is trying to determine if your relay's directory port is reachable from "
 "the Tor network by connecting to itself at %1:%2. This test could take "
 "several minutes."
-msgstr ""
-"Tor пÑ?Ñ?аеÑ?Ñ?Ñ? опÑ?еделиÑ?Ñ? доÑ?Ñ?Ñ?пен ли поÑ?Ñ? каÑ?алога ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а в "
-"Ñ?еÑ?и Tor, пÑ?Ñ?ем Ñ?оединениÑ? Ñ? Ñ?ами Ñ?обой на %1:%2. ЭÑ?оÑ? Ñ?еÑ?Ñ? можеÑ? занÑ?Ñ?Ñ? "
-"неÑ?колÑ?ко минÑ?Ñ?."
+msgstr "Tor пÑ?Ñ?аеÑ?Ñ?Ñ? опÑ?еделиÑ?Ñ? доÑ?Ñ?Ñ?пен ли поÑ?Ñ? каÑ?алога ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а в Ñ?еÑ?и Tor, пÑ?Ñ?ем Ñ?оединениÑ? Ñ? Ñ?ами Ñ?обой на %1:%2. ЭÑ?оÑ? Ñ?еÑ?Ñ? можеÑ? занÑ?Ñ?Ñ? неÑ?колÑ?ко минÑ?Ñ?."
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
@@ -3567,11 +3434,7 @@ msgid ""
 "happen if you are behind a router or firewall that requires you to set up "
 "port forwarding. If %1:%2 is not your correct IP address and directory port,"
 " please check your relay's configuration."
-msgstr ""
-"Ð?оÑ?Ñ? каÑ?алога ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а недоÑ?Ñ?Ñ?пен дÑ?Ñ?гим клиенÑ?ам Tor. ЭÑ?о можеÑ?"
-" пÑ?оиÑ?Ñ?одиÑ?Ñ? еÑ?ли вÑ? наÑ?одиÑ?еÑ?Ñ? за Ñ?оÑ?Ñ?еÑ?ом или бÑ?андмаÑ?Ñ?Ñ?ом, Ñ?Ñ?о Ñ?Ñ?ебÑ?еÑ? оÑ?"
-" ваÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?обÑ?оÑ? поÑ?Ñ?ов. Ð?Ñ?ли %1:%2 не ваÑ?и пÑ?авилÑ?нÑ?е IP адÑ?еÑ? и поÑ?Ñ?"
-" каÑ?алога, пожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
+msgstr "Ð?оÑ?Ñ? каÑ?алога ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а недоÑ?Ñ?Ñ?пен дÑ?Ñ?гим клиенÑ?ам Tor. ЭÑ?о можеÑ? пÑ?оиÑ?Ñ?одиÑ?Ñ? еÑ?ли вÑ? наÑ?одиÑ?еÑ?Ñ? за Ñ?оÑ?Ñ?еÑ?ом или бÑ?андмаÑ?Ñ?Ñ?ом, Ñ?Ñ?о Ñ?Ñ?ебÑ?еÑ? оÑ? ваÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?обÑ?оÑ? поÑ?Ñ?ов. Ð?Ñ?ли %1:%2 не ваÑ?и пÑ?авилÑ?нÑ?е IP адÑ?еÑ? и поÑ?Ñ? каÑ?алога, пожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а."
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
@@ -3581,10 +3444,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "Your relay's descriptor, which enables clients to connect to your relay, was"
 " rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Ð?еÑ?кÑ?ипÑ?оÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а, коÑ?оÑ?Ñ?й позволÑ?еÑ? клиенÑ?ам Ñ?оединÑ?Ñ?Ñ?Ñ?Ñ? Ñ? "
-"ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом, бÑ?л оÑ?клонен Ñ?еÑ?веÑ?ом каÑ?алога в %1:%2. Ð?о Ñ?ледÑ?Ñ?ей "
-"пÑ?иÑ?ине: %3"
+msgstr "Ð?еÑ?кÑ?ипÑ?оÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а, коÑ?оÑ?Ñ?й позволÑ?еÑ? клиенÑ?ам Ñ?оединÑ?Ñ?Ñ?Ñ?Ñ? Ñ? ваÑ?им Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом, бÑ?л оÑ?клонен Ñ?еÑ?веÑ?ом каÑ?алога в %1:%2. Ð?о Ñ?ледÑ?Ñ?ей пÑ?иÑ?ине: %3"
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
@@ -3596,12 +3456,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
-"Ð?аÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?епеÑ?Ñ? в Ñ?еÑ?и и доÑ?Ñ?Ñ?пен клиенÑ?ам Tor длÑ? иÑ?полÑ?зованиÑ?. Ð? "
-"Ñ?еÑ?ение ближайÑ?иÑ? Ñ?аÑ?ов вÑ? можеÑ?е замеÑ?иÑ?Ñ? Ñ?велиÑ?ение Ñ?еÑ?евого Ñ?Ñ?аÑ?ика, "
-"оÑ?обÑ?ажаемого на гÑ?аÑ?ике пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?и, по меÑ?е Ñ?ого, как новÑ?е "
-"клиенÑ?Ñ? бÑ?дÑ?Ñ? Ñ?знаваÑ?Ñ? о ваÑ?ем Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?е. СпаÑ?ибо вам за помоÑ?Ñ? Ñ?еÑ?и "
-"Tor!"
+msgstr "Ð?аÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?епеÑ?Ñ? в Ñ?еÑ?и и доÑ?Ñ?Ñ?пен клиенÑ?ам Tor длÑ? иÑ?полÑ?зованиÑ?. Ð? Ñ?еÑ?ение ближайÑ?иÑ? Ñ?аÑ?ов вÑ? можеÑ?е замеÑ?иÑ?Ñ? Ñ?велиÑ?ение Ñ?еÑ?евого Ñ?Ñ?аÑ?ика, оÑ?обÑ?ажаемого на гÑ?аÑ?ике пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?и, по меÑ?е Ñ?ого, как новÑ?е клиенÑ?Ñ? бÑ?дÑ?Ñ? Ñ?знаваÑ?Ñ? о ваÑ?ем Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?е. СпаÑ?ибо вам за помоÑ?Ñ? Ñ?еÑ?и Tor!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3663,9 +3518,7 @@ msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
-"СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки. Ð?Ñ?ли не вÑ?бÑ?ано, наÑ?Ñ?Ñ?ойки бÑ?дÑ?Ñ? пÑ?имененÑ? Ñ?олÑ?ко к "
-"Ñ?екÑ?Ñ?емÑ? запÑ?Ñ?кÑ? Tor."
+msgstr "СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки. Ð?Ñ?ли не вÑ?бÑ?ано, наÑ?Ñ?Ñ?ойки бÑ?дÑ?Ñ? пÑ?имененÑ? Ñ?олÑ?ко к Ñ?екÑ?Ñ?емÑ? запÑ?Ñ?кÑ? Tor."
 
 msgctxt "TorrcDialog"
 msgid "Cut"
@@ -3705,9 +3558,7 @@ msgstr "Ð?Ñ?ибка Ñ?оединениÑ? Ñ? Tor"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Ð?Ñ?бÑ?аннаÑ? облаÑ?Ñ?Ñ? пÑ?Ñ?Ñ?а. Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е необÑ?одимÑ?й Ñ?екÑ?Ñ?, или нажмиÑ?е"
-" \"Ð?Ñ?имениÑ?Ñ? вÑ?Ñ?\""
+msgstr "Ð?Ñ?бÑ?аннаÑ? облаÑ?Ñ?Ñ? пÑ?Ñ?Ñ?а. Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е необÑ?одимÑ?й Ñ?екÑ?Ñ?, или нажмиÑ?е \"Ð?Ñ?имениÑ?Ñ? вÑ?Ñ?\""
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
@@ -3781,17 +3632,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia не Ñ?могла пÑ?овеÑ?иÑ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?, "
-"поÑ?колÑ?кÑ? она не можеÑ? найÑ?и '%1'."
+msgstr "Vidalia не Ñ?могла пÑ?овеÑ?иÑ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?, поÑ?колÑ?кÑ? она не можеÑ? найÑ?и '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia не Ñ?могла пÑ?овеÑ?иÑ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?, "
-"поÑ?колÑ?кÑ? пÑ?оÑ?еÑ?Ñ? обновлениÑ? Tor неожиданно завеÑ?Ñ?ил Ñ?абоÑ?Ñ?."
+msgstr "Vidalia не Ñ?могла пÑ?овеÑ?иÑ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?, поÑ?колÑ?кÑ? пÑ?оÑ?еÑ?Ñ? обновлениÑ? Tor неожиданно завеÑ?Ñ?ил Ñ?абоÑ?Ñ?."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3811,9 +3658,7 @@ msgstr "УÑ?Ñ?ановка новейÑ?его пÑ?огÑ?аммного обеÑ?
 
 msgctxt "UpdateProgressDialog"
 msgid "Done! Your software is now up to date."
-msgstr ""
-"Ð?оÑ?ово! Ð?аÑ?е пÑ?огÑ?аммное обеÑ?пеÑ?ение в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? в акÑ?Ñ?алÑ?ном "
-"Ñ?оÑ?Ñ?оÑ?нии."
+msgstr "Ð?оÑ?ово! Ð?аÑ?е пÑ?огÑ?аммное обеÑ?пеÑ?ение в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? в акÑ?Ñ?алÑ?ном Ñ?оÑ?Ñ?оÑ?нии."
 
 msgctxt "UpdateProgressDialog"
 msgid "OK"
@@ -3845,8 +3690,7 @@ msgstr "УÑ?Ñ?ановиÑ?Ñ?"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"СледÑ?Ñ?Ñ?ие обновленнÑ?е пакеÑ?Ñ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? гоÑ?овÑ? длÑ? Ñ?Ñ?Ñ?ановки:"
+msgstr "СледÑ?Ñ?Ñ?ие обновленнÑ?е пакеÑ?Ñ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? гоÑ?овÑ? длÑ? Ñ?Ñ?Ñ?ановки:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
@@ -3946,9 +3790,7 @@ msgstr "Ð?нÑ?оÑ?маÑ?иÑ? по иÑ?полÑ?зованиÑ? Vidalia"
 
 msgctxt "Vidalia"
 msgid "Unable to open log file '%1': %2"
-msgstr ""
-"Ð?евозможно оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл жÑ?Ñ?нала \n"
-"%1': %2"
+msgstr "Ð?евозможно оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл жÑ?Ñ?нала \n%1': %2"
 
 msgctxt "Vidalia"
 msgid "Value required for parameter :"
@@ -3971,10 +3813,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Ð?Ñ?Ñ?гой пÑ?оÑ?еÑ?Ñ? Vidalia, возможно, Ñ?же запÑ?Ñ?ен. Ð?Ñ?ли дейÑ?Ñ?виÑ?елÑ?но неÑ? "
-"дÑ?Ñ?гого пÑ?оÑ?еÑ?Ñ?а Ñ?абоÑ?аÑ?Ñ?его Vidalia, вÑ? можеÑ?е пÑ?одолжиÑ?Ñ? в лÑ?бом Ñ?лÑ?Ñ?ае. "
-"ХоÑ?ели бÑ? вÑ? пÑ?одолжиÑ?Ñ? запÑ?Ñ?к Vidalia?"
+msgstr "Ð?Ñ?Ñ?гой пÑ?оÑ?еÑ?Ñ? Vidalia, возможно, Ñ?же запÑ?Ñ?ен. Ð?Ñ?ли дейÑ?Ñ?виÑ?елÑ?но неÑ? дÑ?Ñ?гого пÑ?оÑ?еÑ?Ñ?а Ñ?абоÑ?аÑ?Ñ?его Vidalia, вÑ? можеÑ?е пÑ?одолжиÑ?Ñ? в лÑ?бом Ñ?лÑ?Ñ?ае. ХоÑ?ели бÑ? вÑ? пÑ?одолжиÑ?Ñ? запÑ?Ñ?к Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -4007,5 +3846,3 @@ msgstr "%1 Ñ?аÑ?ов"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 мин"
-
-
diff --git a/src/vidalia/i18n/po/sco/qt_sco.po b/src/vidalia/i18n/po/sco/qt_sco.po
index 43c449a..605f52d 100644
--- a/src/vidalia/i18n/po/sco/qt_sco.po
+++ b/src/vidalia/i18n/po/sco/qt_sco.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/sco/vidalia_sco.po b/src/vidalia/i18n/po/sco/vidalia_sco.po
index 710c7e0..1918f2a 100644
--- a/src/vidalia/i18n/po/sco/vidalia_sco.po
+++ b/src/vidalia/i18n/po/sco/vidalia_sco.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:41+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/sk/qt_sk.po b/src/vidalia/i18n/po/sk/qt_sk.po
index e43686a..16c01e9 100644
--- a/src/vidalia/i18n/po/sk/qt_sk.po
+++ b/src/vidalia/i18n/po/sk/qt_sk.po
@@ -1,13 +1,14 @@
-# 
 # Translators:
+# Translators:
+#   <koloman375@xxxxxxxxx>, 2012.
 #   <martin.strucel@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-01 11:29+0000\n"
-"Last-Translator: martinstrucel <martin.strucel@xxxxxxxxx>\n"
+"PO-Revision-Date: 2012-03-01 18:33+0000\n"
+"Last-Translator: K0L0M4N <koloman375@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -201,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 už existuje.\n"
-"Chcete ho nahradiť?"
+msgstr "%1 už existuje.\nChcete ho nahradiť?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Súbor nebol nájdený.\n"
-"Overte Ä?i ste zadali správny názov súboru."
+msgstr "%1\nSúbor nebol nájdený.\nOverte Ä?i ste zadali správny názov súboru."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -224,7 +220,7 @@ msgstr "Tento poÄ?ítaÄ?"
 #: qfiledialog.cpp:462
 msgctxt "QFileDialog"
 msgid "&Rename"
-msgstr "P&remenovať"
+msgstr "&Premenovať"
 
 #: qfiledialog.cpp:463
 msgctxt "QFileDialog"
@@ -234,7 +230,7 @@ msgstr "&Zmazať"
 #: qfiledialog.cpp:464
 msgctxt "QFileDialog"
 msgid "Show &hidden files"
-msgstr "Zobraziť s&kryté súbory"
+msgstr "Zobraziť &skryté súbory"
 
 #: ui_qfiledialog.h:264
 msgctxt "QFileDialog"
@@ -272,29 +268,24 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"PrieÄ?inok nebol nájdený.\n"
-"Overte Ä?i ste zadali správny názov prieÄ?inku."
+msgstr "%1\nPrieÄ?inok nebol nájdený.\nOverte Ä?i ste zadali správny názov prieÄ?inku."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' je chránený proti zápisu.\n"
-"Chcete ho napriek tomu zmazať?"
+msgstr "'%1' je chránený proti zápisu.\nChcete ho aj napriek tomu odstrániť?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
 msgid "Are sure you want to delete '%1'?"
-msgstr "Chcete naozaj zmazať '%1'?"
+msgstr "Naozaj chcete odstrániť '%1'?"
 
 #: qfiledialog.cpp:2299
 msgctxt "QFileDialog"
 msgid "Could not delete directory."
-msgstr "Nemožno zmazať adresár."
+msgstr "PrieÄ?inok sa nedá odstrániÅ¥."
 
 #: qfiledialog_win.cpp:128
 msgctxt "QFileDialog"
@@ -344,7 +335,7 @@ msgstr "Nový prieÄ?inok"
 #: qfiledialog.cpp:465
 msgctxt "QFileDialog"
 msgid "&New Folder"
-msgstr "&Nový priÄ?inok"
+msgstr "&Nový prieÄ?inok"
 
 #: qfiledialog.cpp:917
 msgctxt "QFileDialog"
@@ -354,12 +345,12 @@ msgstr "&Zvoliť"
 #: qsidebar.cpp:388
 msgctxt "QFileDialog"
 msgid "Remove"
-msgstr "Odobrať"
+msgstr "Odstrániť"
 
 #: qfiledialog.cpp:886
 msgctxt "QFileDialog"
 msgid "File &name:"
-msgstr "Náz&ov súboru:"
+msgstr "Názov &súboru:"
 
 #: ui_qfiledialog.h:261
 msgctxt "QFileDialog"
@@ -381,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Meno \"%1\" nemôže byť použité.</b><p>Skúste použiť iný názov, s menej "
-"znakmi alebo žiadnou interpunkciou."
+msgstr "<b>Meno \"%1\" nemôže byť použité.</b><p>Skúste použiť meno s menej znakmi alebo bez interpunkcie."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -443,6 +432,4 @@ msgstr "%1 KB"
 #: qfilesystemmodel.cpp:684
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr "%1 bajt"
diff --git a/src/vidalia/i18n/po/sk/vidalia_sk.po b/src/vidalia/i18n/po/sk/vidalia_sk.po
index 4466296..e92f8c6 100644
--- a/src/vidalia/i18n/po/sk/vidalia_sk.po
+++ b/src/vidalia/i18n/po/sk/vidalia_sk.po
@@ -1,21 +1,27 @@
+# 
+# Translators:
+#   <eduard.zanony@xxxxxxxxx>, 2012.
+#   <koloman375@xxxxxxxxx>, 2012.
+#   <martin.strucel@xxxxxxxxx>, 2012.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: 2010-09-09 18:22+0200\n"
-"Last-Translator: Peter <peter_gasper@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: sk\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-21 12:37+0000\n"
+"Last-Translator: eduardzanony <eduard.zanony@xxxxxxxxx>\n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
 msgid "About Vidalia"
-msgstr "O projekte Vidalia"
+msgstr "O Vidalia"
 
 msgctxt "AboutDialog"
 msgid "License"
@@ -33,29 +39,14 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr "Qt 4.4.2"
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr "Qt"
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr "verzia"
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr "'%1' nie je správna IP adresa."
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
-msgstr "Zvolili ste autentifikáciu heslom, heslo ste však nezadali."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
+msgstr "Zvolili ste autentifikáciu 'Heslom', ale heslo ste nezadali."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -67,7 +58,7 @@ msgstr "Súbor sa nenašiel"
 
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 neexistuje. Prajete si vytvoriť?"
+msgstr "%1 neexistuje. Prajete si ho vytvoriť?"
 
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
@@ -79,7 +70,7 @@ msgstr "Nepodarilo sa vytvoriť %1 [%2]"
 
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
-msgstr "Zvolte zložku použitú pre Tor data"
+msgstr "Zvolte zložku pre dáta Tor"
 
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
@@ -94,10 +85,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr "Vidalia nemohla nainštalovať službu Tor"
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr "Kontrolný port"
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr "Autentifikácia:"
 
@@ -139,28 +126,93 @@ msgstr "Zvolte cestu pre váš konfiguraÄ?ný súbor"
 
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr "Prechádzať"
+msgstr "Hľadať"
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr "Zložka Data"
+msgstr "PrieÄ?inok s dátami"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr "Ukladať data pre Tor software v nasledujúcej zložke"
+msgstr "V nasledujúcom prieÄ?inku sa budú ukladaÅ¥ dáta pre softvér Tor"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
-msgstr "Zvolte zložku používanú pre Tor software"
+msgstr "Vyberte prieÄ?inok, do ktorého sa budú ukladaÅ¥ dáta pre softvér Tor"
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
+msgid "Tor Control"
+msgstr "Tor ovládanie"
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr "Použit pripojenie TCP (ControlPort)"
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr "Cesta:"
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr "Použiť soket Unixovej domény (ControlSocket)"
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr "Upraviť aktuálny torrc"
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr "Poznámka: toto upraví aktuálne naÄ?ítaný torrc"
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr "Cesta pre ControlSocket neexistuje."
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr "Å pecifikovaný konfiguraÄ?ný Tor súbor obsahuje znaky, ktoré sa nedajú vyjadriÅ¥ v súÄ?asnom systéme 8-bitového kódovania."
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr "Å pecifikovaný Tor adresár pre dáta obsahuje znaky, ktoré sa nedajú vyjadriÅ¥ v súÄ?astnom systéme 8-bitového kódovania."
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr "Varovanie"
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr "Zmenili ste cestu pre torrc, chcete reštartovať Tor?"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr "KonfiguraÄ?ný súbor (torrc);;VÅ¡etky súbory (*)"
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr "Vyberte súbor, ktorý sa použije pre Tor socket cestu"
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr "Nastaviť ControlPort automaticky"
+
+msgctxt "AdvancedPage"
+msgid ""
+"You've checked the autoconfiguration option for the ControlPort, but "
+"provided no Data Directory. Please add one, or uncheck the \"Configure "
+"ControlPort automatically\" option."
 msgstr ""
-"Vidalia nemohla vymazať službu Tor.\n"
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
-"Budete ju musieÅ¥ ruÄ?ne."
+"You may need to remove it manually."
+msgstr "Vidalia nemohla odstrániÅ¥ službu Tor.\n\nBudete ju musieÅ¥ odstrániÅ¥ ruÄ?ne."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -168,7 +220,7 @@ msgstr "Jazyk"
 
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
-msgstr "Zvolte jazyk používaný pre Vidalia"
+msgstr "Vyberte jazyk, ktorý sa použije vo Vidalia"
 
 msgctxt "AppearancePage"
 msgid "Style"
@@ -176,11 +228,28 @@ msgstr "Štýl"
 
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
-msgstr "Zvolte štýl pre Vidalia interface"
+msgstr "Vyberte vzhľad rozhrania Vidalia"
 
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia nemohla naÄ?ítaÅ¥ zvolený jazyk."
+msgstr "Vidalia nenaÄ?ítala zvolený jazyk."
+
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
 
 msgctxt "BandwidthGraph"
 msgid "Since:"
@@ -188,7 +257,7 @@ msgstr "Od:"
 
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
-msgstr "Skryté nastavenia"
+msgstr "Skryť nastavenia"
 
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
@@ -216,11 +285,11 @@ msgstr "Vždy na vrchu"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
-msgstr "Štýl"
+msgstr "Vzhľad"
 
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Zmeniť priehľadnosť grafu"
+msgstr "Zmeniť priehľadnosť grafu šírky pásma"
 
 msgctxt "BandwidthGraph"
 msgid "100"
@@ -228,7 +297,7 @@ msgstr "100"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
-msgstr "% Nepriehľadný"
+msgstr "% Nepriehľadnosť"
 
 msgctxt "BandwidthGraph"
 msgid "Save"
@@ -240,7 +309,7 @@ msgstr "UkonÄ?iÅ¥"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr "Posiela sa dotaz pre  HTTPS premostenie..."
+msgstr "Posiela sa žiadosť o  HTTPS premostenie..."
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
@@ -248,11 +317,11 @@ msgstr "Pripájanie na %1:%2..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr "Posiela sa HTTPS dotaz na premostenia..."
+msgstr "Posiela sa HTTPS žiadosť na premostenia..."
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
-msgstr "Sťahuje sa list premostení..."
+msgstr "Sťahuje sa zoznam premostení..."
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Downloading Bridges"
@@ -264,7 +333,7 @@ msgstr "Premostenia sa nepodarilo stiahnuť: %1"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Retrying bridge request..."
-msgstr "Opakujem dotaz na premostenie..."
+msgstr "Opakujem žiadosť o premostenie..."
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
@@ -272,11 +341,11 @@ msgstr "Krajina"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
-msgstr "# Klientov"
+msgstr "# Klienti"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klienti z týchto krajín využívajúci vaše relé  %1"
+msgstr "Klienti z nasledujúcich krajín využívali vaše relé od %1"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -320,7 +389,7 @@ msgstr "Spojenie"
 
 msgctxt "CircuitListWidget"
 msgid "Status"
-msgstr "Status"
+msgstr "Stav"
 
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
@@ -364,7 +433,7 @@ msgstr "Pomoc"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
-msgstr "Chyba pri ukladaní nastavení"
+msgstr "Nastala chyba pri ukladaní nastavení"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
@@ -372,7 +441,7 @@ msgstr "Vidalia nemôže uložiť vaše %1 nastavenia."
 
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
-msgstr "Chyba pri použití nastavení"
+msgstr "Nastala chyba pri použití nastavenia"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
@@ -399,1487 +468,1579 @@ msgid "Remember my password"
 msgstr "Zapamätať si moje heslo"
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
-msgstr ""
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
+msgstr "Vidalia je pripojený k prevádzke Tora, ale proces si vyžaduje heslo. Prosím, zadajte svoje heslo:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
-msgstr ""
+msgstr "Riadiaci soket nie je pripojený."
 
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
-msgstr ""
+msgstr "Nastala chyba pri odosielaní príkazu. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
+msgstr "Soket bol odpojený pri pokuse o naÄ?ítanie riadku dát."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
-msgstr ""
+msgstr "Neplatná riadiaca odpoveÄ?. [%1]"
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistan"
 
 msgctxt "CountryInfo"
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 msgctxt "CountryInfo"
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "Antigua a Barbuda"
 
 msgctxt "CountryInfo"
 msgid "Argentina"
-msgstr ""
+msgstr "Argentína"
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "Arménsko"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "Austrália"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajdžan"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamy"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladéš"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "Bielorusko"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "Belgicko"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolívia"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Bosna a Hercegovina"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "Brazília"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunej"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulharsko"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodža"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "Kapverdy"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "Stredoafrická republika"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "Ä?ad"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "Ä?ile"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "Ä?ína"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "Kolumbia"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "Komory"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Kongo, Demokratická Republika"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr ""
+msgstr "Kostarika"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "Pobrežie Slonoviny"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "Chorvátsko"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "Cyprus"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "Ä?eská Republika"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "Dánsko"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "Džibutsko"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikánska Republika"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekvádor"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "Egypt"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvador"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Rovníková Guinea"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "Estónsko"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "Francúzsko"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "Gruzínsko"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr ""
+msgstr "Nemecko"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 msgctxt "CountryInfo"
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 msgctxt "CountryInfo"
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 msgctxt "CountryInfo"
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 msgctxt "CountryInfo"
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr ""
+msgstr "Izrael"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr ""
+msgstr "Taliansko"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamajka"
 
 msgctxt "CountryInfo"
 msgid "Japan"
-msgstr ""
+msgstr "Japonsko"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr ""
+msgstr "Jordánsko"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazachstan"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr ""
+msgstr "KeÅ?a"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuvajt"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgizsko"
 
 msgctxt "CountryInfo"
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr ""
+msgstr "Lotyšsko"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr ""
+msgstr "Libéria"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Lichtenštajnsko"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr ""
+msgstr "Litva"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxembursko"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr ""
+msgstr "Macedónsko"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr ""
+msgstr "Malajzia"
 
 msgctxt "CountryInfo"
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 msgctxt "CountryInfo"
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Marshallove Ostrovy"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauretánia"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
-msgstr ""
+msgstr "Maurícius"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr ""
+msgstr "Mikronézia"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
-msgstr ""
+msgstr "Moldavsko"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolsko"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr ""
+msgstr "Ä?ierna Hora"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr ""
+msgstr "Maroko"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr ""
+msgstr "Namíbia"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 msgctxt "CountryInfo"
 msgid "Nepal"
-msgstr ""
+msgstr "Nepál"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr ""
+msgstr "Holandsko"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr ""
+msgstr "Nový Zéland"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragua"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigéria"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "Nórsko"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "Omán"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "Palestína"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nová Guinea"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguaj"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "Filipíny"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "Polsko"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "Portugalsko"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "Katar"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "Rumunsko"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "Rusko"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "Svätý Krištof a Nevis"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Svätá Lucia"
 
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "Svätý Vincent a Grenadíny "
 
 msgctxt "CountryInfo"
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 msgctxt "CountryInfo"
 msgid "San Marino"
-msgstr ""
+msgstr "San Maríno"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "Svätý Tomáš a Princov ostrov"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudská Arábia"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 msgctxt "CountryInfo"
 msgid "Serbia"
-msgstr ""
+msgstr "Srbsko"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychely"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovensko"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovinsko"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Šalamúnove ostrovy"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr ""
+msgstr "Somálsko"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr ""
+msgstr "Juhoafrická Republika"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr ""
+msgstr "Å panielsko"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Srí Lanka"
 
 msgctxt "CountryInfo"
 msgid "Sudan"
-msgstr ""
+msgstr "Sudán"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr ""
+msgstr "Surinam"
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr ""
+msgstr "Svazijsko"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr ""
+msgstr "Švédsko"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr ""
+msgstr "Å vajÄ?iarsko"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr ""
+msgstr "Sýria"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadžikistan"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr ""
+msgstr "Tanzánia"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr ""
+msgstr "Thajsko"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "Východný Timor"
 
 msgctxt "CountryInfo"
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 msgctxt "CountryInfo"
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "Trinidad a Tobago"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisko"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
-msgstr ""
+msgstr "Turecko"
 
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkménsko"
 
 msgctxt "CountryInfo"
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 msgctxt "CountryInfo"
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrajina"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Spojené Arabské Emiráty"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr ""
+msgstr "Spojené Kráľovstvo"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr ""
+msgstr "Spojené Štáty"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguaj"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr ""
+msgstr "Vatikán"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 msgctxt "CountryInfo"
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr ""
+msgstr "Západná Sahara"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr ""
+msgstr "Jemen"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr "Zair"
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr ""
+msgstr "Albánsko"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr ""
+msgstr "Alžírsko"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr ""
+msgstr "Rakúsko"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrajn"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiópia"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
-msgstr ""
+msgstr "Fidži"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr ""
+msgstr "Fínsko"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr ""
+msgstr "Grécko"
 
 msgctxt "CountryInfo"
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr ""
+msgstr "MaÄ?arsko"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr ""
+msgstr "India"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonézia"
 
 msgctxt "CountryInfo"
 msgid "Iran"
-msgstr ""
+msgstr "Irán"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr ""
+msgstr "Ã?rsko"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr ""
+msgstr "Kórea, Severná"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr ""
+msgstr "Kórea, Južná"
 
 msgctxt "CountryInfo"
 msgid "Libya"
-msgstr ""
+msgstr "Líbya"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr ""
+msgstr "Maldivy"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr ""
+msgstr "Mexiko"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr ""
+msgstr "Mjanmarsko"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr "Odoslať správu o zlyhaní"
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr "Vo Vidalia došlo k chybe a preto sa musí aplikácia zavrieť"
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr "Reštartovať Vidalia"
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr "Nereštartovať"
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr "Vidalia sa nedá reštartovať"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+msgstr "Nemohli sme automaticky reštartovať Vidaliu. Prosím, reštartujte Vidaliu manuálne."
+
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
+msgstr "VyplÅ?te prosím zoznam:"
+
+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 "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 "Hlásenie o zlyhaní bolo vytvorené a môžete ho poslaÅ¥ vývojárom do Vidalia, kde zistia a opravia problém. Predložená správa neobsahuje žiadne osobné ani identifikaÄ?né informácie."
+
+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 "s popisom toho, Ä?o ste robili pred zlyhaním aplikácie, spolu s nasledujúcimi súbormi zodpovedajúcimi správe o zlyhaní:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
-msgstr ""
+msgstr "Spustiteľné súbory (*.exe)"
 
 msgctxt "GeneralPage"
 msgid "Select Path to Tor"
-msgstr ""
+msgstr "Vyberte Cestu k Tor"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr ""
+msgstr "Zvolte spustiteľné Proxy"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
+msgstr "Musíte zadať názov spustiteľného Tora."
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
-msgstr ""
+msgstr "Spustiť Vidalia pri spustení systému"
 
 msgctxt "GeneralPage"
 msgid "Browse"
-msgstr ""
+msgstr "Hľadať"
 
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
-msgstr ""
+msgstr "SpustiÅ¥ Tora, keÄ? sa spustí Vidalia"
 
 msgctxt "GeneralPage"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr ""
+msgstr "Aplikácia Proxy (voliteľne)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr ""
+msgstr "SpustiÅ¥ aplikáciu proxy, keÄ? sa spustí Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr ""
+msgstr "Parametre aplikácie proxy:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr ""
+msgstr "Aktualizácia softvéru"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "Automaticky skontrolovať aktualizáciu softvéru"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "Skontrolovať"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "GraphFrame"
 msgid "%1 KB"
-msgstr ""
+msgstr "%1 KB"
 
 msgctxt "GraphFrame"
 msgid "%1 MB"
-msgstr ""
+msgstr "%1 MB"
 
 msgctxt "GraphFrame"
 msgid "%1 GB"
-msgstr ""
+msgstr "%1 GB"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr ""
+msgstr "Prijal:"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
-msgstr ""
+msgstr "Odos:"
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
+msgstr "Dodaný XML súbor nemá platný obsah."
 
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
-msgstr ""
+msgstr "Prehľadávanie prišlo na koniec dokumentu"
 
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
-msgstr ""
+msgstr "Prehľadávanie priÅ¡lo na zaÄ?iatok dokumentu"
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
-msgstr ""
+msgstr "Zadaný text sa v dokumente nenašiel"
 
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
-msgstr ""
+msgstr "Nájdených %1 výsledkov"
 
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Pomocník Vidalia"
 
 msgctxt "HelpBrowser"
 msgid "Back"
-msgstr ""
+msgstr "Späť"
 
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
-msgstr ""
+msgstr "Prejsť na predchádzajúcu stránku (Backspace)"
 
 msgctxt "HelpBrowser"
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 msgctxt "HelpBrowser"
 msgid "Forward"
-msgstr ""
+msgstr "Vpred"
 
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
-msgstr ""
+msgstr "PrejsÅ¥ na Ä?alÅ¡iu stránku (Shift+Backspace)"
 
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
-msgstr ""
+msgstr "Shift+Backspace"
 
 msgctxt "HelpBrowser"
 msgid "Home"
-msgstr ""
+msgstr "Domov"
 
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
+msgstr "Prejsť na Domovskú stránku (Ctrl+H)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
-msgstr ""
+msgstr "Ctrl+H"
 
 msgctxt "HelpBrowser"
 msgid "Find"
-msgstr ""
+msgstr "Hľadať"
 
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
+msgstr "Vyhľadať slová alebo frázy na aktuálnej stránke (Ctrl+F)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ctrl+F"
 
 msgctxt "HelpBrowser"
 msgid "Close"
-msgstr ""
+msgstr "Zavrieť"
 
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
-msgstr ""
+msgstr "Zatvoriť Pomocník Vidalia"
 
 msgctxt "HelpBrowser"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "HelpBrowser"
 msgid "Find:"
-msgstr ""
+msgstr "Hľadať:"
 
 msgctxt "HelpBrowser"
 msgid "Find Previous"
-msgstr ""
+msgstr "Nájsť predchádzajúce"
 
 msgctxt "HelpBrowser"
 msgid "Find Next"
-msgstr ""
+msgstr "NájsÅ¥ Ä?alÅ¡ie"
 
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
-msgstr ""
+msgstr "Rozlišovať malé a veľké písmená"
 
 msgctxt "HelpBrowser"
 msgid "Whole words only"
-msgstr ""
+msgstr "Iba celé slová"
 
 msgctxt "HelpBrowser"
 msgid "Help Topics"
-msgstr ""
+msgstr "Témy Pomocníka"
 
 msgctxt "HelpBrowser"
 msgid "Contents"
-msgstr ""
+msgstr "Obsah"
 
 msgctxt "HelpBrowser"
 msgid "Search"
-msgstr ""
+msgstr "Hľadať"
 
 msgctxt "HelpBrowser"
 msgid "Searching for:"
-msgstr ""
+msgstr "Vyhľadávanie:"
 
 msgctxt "HelpBrowser"
 msgid "Found Documents"
-msgstr ""
+msgstr "Nájdené dokumenty"
 
 msgctxt "HelpBrowser"
 msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "Nastala chyba v zavedení obsahu nápovedy:"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr ""
+msgstr "Otvoriť externý odkaz"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
-msgstr ""
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr "Vidalia môže otvoriÅ¥ zvolený odkaz vo VaÅ¡om predvolenom prehliadaÄ?i. Ak Váš prehliadaÄ? nie je nakonfigurovaný pre použitie Tor, potom požiadavka nebude anonymná."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
+msgstr "Má Vidalia otvoriÅ¥ odkaz vo vaÅ¡om webovom prehliadaÄ?i?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
-msgstr ""
+msgstr "Odkaz sa nedá otvoriť"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
-msgstr ""
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr "Vidalia nemohla otvoriÅ¥ vybraný odkaz vo VaÅ¡om webovom prehliadaÄ?i. Ale môžete sa pokúsiÅ¥ skopírovaÅ¥ URL a vložiÅ¥ ho do svojho prehliadaÄ?a."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
-msgstr ""
+msgstr "Nastala chyba pri otváraní súboru pomocníka:"
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr ""
+msgstr "Informácia o licencii"
 
 msgctxt "LicenseDialog"
 msgid "License"
-msgstr ""
+msgstr "Licencia"
 
 msgctxt "LicenseDialog"
 msgid "Credits"
-msgstr ""
+msgstr "PoÄ?akovanie"
 
 msgctxt "LogEvent"
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 msgctxt "LogEvent"
 msgid "Info"
-msgstr ""
+msgstr "Informácie"
 
 msgctxt "LogEvent"
 msgid "Notice"
-msgstr ""
+msgstr "Poznámky"
 
 msgctxt "LogEvent"
 msgid "Warning"
-msgstr ""
+msgstr "Varovanie"
 
 msgctxt "LogEvent"
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 msgctxt "LogEvent"
 msgid "Unknown"
-msgstr ""
+msgstr "Neznámy"
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr "Informácie"
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr "Oznam"
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr "Upozornenie"
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr "Chyba"
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr "Neznámy"
 
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr ""
+msgstr "Spustiť Tor"
 
 msgctxt "MainWindow"
 msgid "Exit"
-msgstr ""
+msgstr "UkonÄ?iÅ¥"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr ""
+msgstr "Prevádzkový graf"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr ""
+msgstr "Protokol správ"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr ""
+msgstr "Mapa siete"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr ""
+msgstr "Ovládací panel"
 
 msgctxt "MainWindow"
 msgid "Settings"
-msgstr ""
+msgstr "Nastavenia"
 
 msgctxt "MainWindow"
 msgid "About"
-msgstr ""
+msgstr "O aplikácií"
 
 msgctxt "MainWindow"
 msgid "Help"
-msgstr ""
+msgstr "Pomocník"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr ""
+msgstr "Nová identita"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ctrl+T"
 
 msgctxt "MainWindow"
 msgid "Ctrl+B"
-msgstr ""
+msgstr "Ctrl+B"
 
 msgctxt "MainWindow"
 msgid "Ctrl+L"
-msgstr ""
+msgstr "Ctrl+L"
 
 msgctxt "MainWindow"
 msgid "Ctrl+N"
-msgstr ""
+msgstr "Ctrl+N"
 
 msgctxt "MainWindow"
 msgid "Ctrl+?"
-msgstr ""
+msgstr "Ctrl+?"
 
 msgctxt "MainWindow"
 msgid "Ctrl+I"
-msgstr ""
+msgstr "Ctrl+I"
 
 msgctxt "MainWindow"
 msgid "Ctrl+P"
-msgstr ""
+msgstr "Ctrl+P"
 
 msgctxt "MainWindow"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 msgctxt "MainWindow"
 msgid "View"
-msgstr ""
+msgstr "Zobraziť"
 
 msgctxt "MainWindow"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Pomocník Vidalia"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr ""
+msgstr "Nastala chyba pri spúšťaní webového prehliadaÄ?a"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
+msgstr "Vidalia nemohla spustiÅ¥ nakonfigurovaný webový prehliadaÄ?"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr ""
+msgstr "Chyba pri spúšťaní IM klienta"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
+msgstr "Vidalia nemohla spustiť nakonfigurovaný IM klient"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
-msgstr ""
+msgstr "Chyba pri spúšťaní proxy servera"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
+msgstr "Vidalia nemohla spustiť nakonfigurovaný proxy server"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr ""
+msgstr "Connecting to a relay directory"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr ""
+msgstr "Establishing an encrypted directory connection"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
-msgstr ""
+msgstr "Retrieving network status"
 
 msgctxt "MainWindow"
 msgid "Loading network status"
-msgstr ""
+msgstr "NaÄ?ítanie stavu siete"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr ""
+msgstr "Nahrávanie autorizaÄ?ných certifikátov"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr ""
+msgstr "Požiadať o informácie o relay"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr ""
+msgstr "NaÄ?ítaÅ¥ informácie o relay"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr ""
+msgstr "Pripájanie do siete Tor"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
-msgstr ""
+msgstr "Nastavuje sa Tor okruh"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
+msgstr "Ste pripojený do siete Tor!"
 
 msgctxt "MainWindow"
 msgid "miscellaneous"
-msgstr ""
+msgstr "rôzne"
 
 msgctxt "MainWindow"
 msgid "identity mismatch"
-msgstr ""
+msgstr "nesprávna identita"
 
 msgctxt "MainWindow"
 msgid "done"
-msgstr ""
+msgstr "hotovo"
 
 msgctxt "MainWindow"
 msgid "connection refused"
-msgstr ""
+msgstr "pripojenie bolo odmietnuté"
 
 msgctxt "MainWindow"
 msgid "connection timeout"
-msgstr ""
+msgstr "Ä?asový limit pripojenia "
 
 msgctxt "MainWindow"
 msgid "read/write error"
-msgstr ""
+msgstr "chyba pri naÄ?ítaní/zápise"
 
 msgctxt "MainWindow"
 msgid "no route to host"
-msgstr ""
+msgstr "žiadna cesta k hostiteľovi"
 
 msgctxt "MainWindow"
 msgid "insufficient resources"
-msgstr ""
+msgstr "nedostatoÄ?né zdroje"
 
 msgctxt "MainWindow"
 msgid "unknown"
-msgstr ""
+msgstr "neznámy"
 
 msgctxt "MainWindow"
 msgid "Tor is not running"
-msgstr ""
+msgstr "Tor nie je spustený"
 
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
-msgstr ""
+msgstr "Tor sa vypína"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr ""
+msgstr "Okamžite zastav Tor"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr ""
+msgstr "Zastav Tor"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
-msgstr ""
+msgstr "Spúšťam softvér Tor"
 
 msgctxt "MainWindow"
 msgid "Starting Tor"
-msgstr ""
+msgstr "Spúšťam Tor"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
-msgstr ""
+msgstr "Chyba pri spúšťaní Tor"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
-msgstr ""
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
+msgstr "Vidalia nedokázala spustiÅ¥ Tor. Skontrolujte nastavenie pre zaistenie správnneho názvu a umiestnenia Tora v mieste kde je urÄ?ený."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
-msgstr ""
+msgstr "Pripájam Tor"
 
 msgctxt "MainWindow"
 msgid "Connection Error"
-msgstr ""
+msgstr "Pripojenie zlyhalo"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr ""
+msgstr "Relaying je Aktivované"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
-msgstr ""
+msgstr "Nastala chyba pri vypnutí"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
-msgstr ""
+msgstr "Vidalia nedokázala zastaviť softvér Tor."
 
 msgctxt "MainWindow"
 msgid "Unexpected Error"
-msgstr ""
+msgstr "Nastala neoÄ?akávaná chyba"
 
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
-msgstr ""
+msgstr "Overujem Tor"
 
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
-msgstr ""
+msgstr "Cookie vyžaduje overenie"
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
-msgstr ""
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
+msgstr "Softvér Tora musí poslať obsah cookie pre overenie, ale Vidalia ich nevie nájsť."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
+msgstr "Chcete vyhľadať súbor 'control_auth_cookie' sám?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
-msgstr ""
+msgstr "Adresár dát"
 
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
-msgstr ""
+msgstr "Kontrola Cookie (control_auth_cookie)"
 
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
-msgstr ""
+msgstr "Nastala chyba poÄ?as registrácie"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
-msgstr ""
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
+msgstr "Program nedokázal vykonať registráciu. Veľa funkcií Vidalia, nie je k dispozícii."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
-msgstr ""
+msgstr "Nastala chyba pri overovaní"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
+msgstr "Vidalia nevie overiť softvér Tora. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
+msgstr "Prosím, skontrolujte si nastavenia ovládania portu overovania."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
-msgstr ""
+msgstr "Dostupná je aktualizácia Tora"
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
-msgstr ""
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
+msgstr "Aktuálne nainÅ¡talované verzia Tora je zastaralá a už sa neodporúÄ?a používaÅ¥. Prosím, navÅ¡tívte naÅ¡e web stránky a stiahnite si najnovÅ¡iu verziu Tora."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
-msgstr ""
+msgstr "Webstránka TORA: %1"
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
-msgstr ""
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
+msgstr "Všetky následné pripojenia sa objavia iné, než staré pripojenie."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
-msgstr ""
+msgstr "Nepodarila sa vytvoriť nová identita"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
-msgstr ""
+msgstr "Odosielací port zlyhal"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
+msgstr "Vidalia nebol schopný nastaviť automatické presmerovanie portov."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
-msgstr ""
+msgstr "Ovládací panel Vidalia"
 
 msgctxt "MainWindow"
 msgid "Status"
-msgstr ""
+msgstr "Stav"
 
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
-msgstr ""
+msgstr "Skratky Vidalia"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr ""
+msgstr "Nastavenie výmeny"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
-msgstr ""
+msgstr "Nastavenie relé pomáha rastu siete"
 
 msgctxt "MainWindow"
 msgid "View the Network"
-msgstr ""
+msgstr "Zobrazím sieť"
 
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
-msgstr ""
+msgstr "Zobrazím mapu siete Tora"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr ""
+msgstr "Použijen novú identitu"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
-msgstr ""
+msgstr "HneÄ? ako sa objaví nové pripojenie"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr ""
+msgstr "Zobrazím poslednú šírku pásma"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr ""
+msgstr "Zobrazím históriu v protokole správ"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
-msgstr ""
+msgstr "Zobrazím nápovedu"
 
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
-msgstr ""
+msgstr "Prejdem do nastavenia Vidalia"
 
 msgctxt "MainWindow"
 msgid "View version and license information"
-msgstr ""
+msgstr "Zobrazím informáciu o verzii a licencii"
 
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
-msgstr ""
+msgstr "Skoním aplikáciu Vidalia"
 
 msgctxt "MainWindow"
 msgid "Show this window on startup"
-msgstr ""
+msgstr "Zobrazím toto okno pri spustení"
 
 msgctxt "MainWindow"
 msgid "Hide"
-msgstr ""
+msgstr "Skryť"
 
 msgctxt "MainWindow"
 msgid "Hide this window"
-msgstr ""
+msgstr "Skryjem toto okno"
 
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
-msgstr ""
+msgstr "Reset hesla zlyhalo"
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1887,11 +2048,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1903,68 +2062,85 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
-msgstr ""
+msgstr "Inštalácia zlyhala"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
+msgstr "Vidalia nemohla nainštalovať softvérové aktualizácie"
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
-msgstr ""
+msgstr "Vyskytla sa nasledujúca chyba:"
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
+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."
+msgstr "VÅ¡etko Ä?o poÅ¡lete týmto pripojením môže byÅ¥ monitorované. Skontrolujte nastavenie aplikácie, a ak sa dá, používajte Å¡ifrované protokoly, ako je napr. SSL."
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc od %1 do %2"
 
 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?"
-msgstr ""
+msgid "(probably Telnet)"
+msgstr "(pravdepodobne Telnet)"
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr ""
+msgid "(probably an email client)"
+msgstr "(pravdepodobne emailový klient)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ""
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Zdá sa, že jedna z VaÅ¡ich aplikácií %1 komunikuje neÅ¡ifrovane a nebezpeÄ?ne na porte %2."
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ""
+msgid "failed (%1)"
+msgstr "zlyhalo (%1)"
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+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 "Home"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -1993,207 +2169,207 @@ msgstr ""
 
 msgctxt "MessageLog"
 msgid "Select Log File"
-msgstr ""
+msgstr "Vybrat súbor protokolu"
 
 msgctxt "MessageLog"
 msgid "Save Log Messages"
-msgstr ""
+msgstr "Uložiť protokol"
 
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
-msgstr ""
+msgstr "Textové súbory (*.txt)"
 
 msgctxt "MessageLog"
 msgid "Vidalia"
-msgstr ""
+msgstr "Vidalia"
 
 msgctxt "MessageLog"
 msgid "Find in Message Log"
-msgstr ""
+msgstr "Vyhľadať v protokole správ"
 
 msgctxt "MessageLog"
 msgid "Find:"
-msgstr ""
+msgstr "Hľadať:"
 
 msgctxt "MessageLog"
 msgid "Not Found"
-msgstr ""
+msgstr "NiÄ? som nenaÅ¡iel"
 
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
-msgstr ""
+msgstr "NiÄ? som nenaÅ¡iel"
 
 msgctxt "MessageLog"
 msgid "Message Log"
-msgstr ""
+msgstr "Protokol správ"
 
 msgctxt "MessageLog"
 msgid "Message Filters..."
-msgstr ""
+msgstr "Filter správ..."
 
 msgctxt "MessageLog"
 msgid "Set message filters"
-msgstr ""
+msgstr "Nastaviť filter správ"
 
 msgctxt "MessageLog"
 msgid "History Size..."
-msgstr ""
+msgstr "Veľkosť histórie..."
 
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
-msgstr ""
+msgstr "Nastavenie maximálneho poÄ?tu zobrazených správ"
 
 msgctxt "MessageLog"
 msgid "Clear"
-msgstr ""
+msgstr "Vymazať"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
+msgstr "Vymazať všetky správy z protokolu správ (Ctrl+E)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
-msgstr ""
+msgstr "Ctrl+E"
 
 msgctxt "MessageLog"
 msgid "Copy"
-msgstr ""
+msgstr "Kopírovať"
 
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr ""
+msgstr "Kopírovať vybrané správy do schránky  (Ctrl+C)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+C"
-msgstr ""
+msgstr "Ctrl+C"
 
 msgctxt "MessageLog"
 msgid "Select All"
-msgstr ""
+msgstr "OznaÄ?iÅ¥ vÅ¡etko"
 
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
-msgstr ""
+msgstr "OznaÄ?iÅ¥ vÅ¡etky správy (Ctrl+A)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+A"
-msgstr ""
+msgstr "Ctrl+A"
 
 msgctxt "MessageLog"
 msgid "Save All"
-msgstr ""
+msgstr "Uložiť všetko"
 
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
-msgstr ""
+msgstr "Uložiť všetky správy do súboru"
 
 msgctxt "MessageLog"
 msgid "Save Selected"
-msgstr ""
+msgstr "UložiÅ¥ oznaÄ?ené"
 
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
-msgstr ""
+msgstr "Uložiť vybrané správy do súboru"
 
 msgctxt "MessageLog"
 msgid "Settings"
-msgstr ""
+msgstr "Nastavenia"
 
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
-msgstr ""
+msgstr "Otvorím nastavenia protokolu správ"
 
 msgctxt "MessageLog"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ctrl+T"
 
 msgctxt "MessageLog"
 msgid "Help"
-msgstr ""
+msgstr "Pomocník"
 
 msgctxt "MessageLog"
 msgid "Show the help browser"
-msgstr ""
+msgstr "Zobrazím pomoc"
 
 msgctxt "MessageLog"
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 msgctxt "MessageLog"
 msgid "Close"
-msgstr ""
+msgstr "Zavrieť"
 
 msgctxt "MessageLog"
 msgid "Close the Message Log"
-msgstr ""
+msgstr "Zavrieť protokol správ"
 
 msgctxt "MessageLog"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "MessageLog"
 msgid "Find"
-msgstr ""
+msgstr "Hľadať"
 
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
+msgstr "Vyhľadať všetky správy obsahujúce hľadaný text (Ctrl+F)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ctrl+F"
 
 msgctxt "MessageLog"
 msgid "Time"
-msgstr ""
+msgstr "Ä?as"
 
 msgctxt "MessageLog"
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgctxt "MessageLog"
 msgid "Message"
-msgstr ""
+msgstr "Správa"
 
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
-msgstr ""
+msgstr "Uložiť aktuálne nastavenie protokolu správ"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
-msgstr ""
+msgstr "Uložiť nastavenie"
 
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
-msgstr ""
+msgstr "Zrušiť zmeny vykonané v nastaveniach"
 
 msgctxt "MessageLog"
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 msgctxt "MessageLog"
 msgid "Message Filter"
-msgstr ""
+msgstr "Filter správ"
 
 msgctxt "MessageLog"
 msgid "Error"
-msgstr ""
+msgstr "Chyba"
 
 msgctxt "MessageLog"
 msgid "Warning"
-msgstr ""
+msgstr "Varovanie"
 
 msgctxt "MessageLog"
 msgid "Notice"
-msgstr ""
+msgstr "História protokolu správ"
 
 msgctxt "MessageLog"
 msgid "Info"
-msgstr ""
+msgstr "Informácie"
 
 msgctxt "MessageLog"
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 msgctxt "MessageLog"
 msgid "Message Log History"
@@ -2205,15 +2381,11 @@ msgstr ""
 
 msgctxt "MessageLog"
 msgid "messages"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
+msgstr "správy"
 
 msgctxt "MessageLog"
 msgid "Browse"
-msgstr ""
+msgstr "Hľadať"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
@@ -2224,160 +2396,178 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr "Jednoduché"
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr "Tor stav"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "PokroÄ?ilé"
+
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
+msgstr "Nemôžem zapísať súbor %1\n\n%2"
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
-msgstr ""
+msgstr "Mapa siete Tor"
 
 msgctxt "NetViewer"
 msgid "Refresh"
-msgstr ""
+msgstr "Obnoviť"
 
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
-msgstr ""
+msgstr "Obnoviť zoznam Tor relay a pripojení"
 
 msgctxt "NetViewer"
 msgid "Ctrl+R"
-msgstr ""
+msgstr "Ctrl+R"
 
 msgctxt "NetViewer"
 msgid "Help"
-msgstr ""
+msgstr "Pomocník"
 
 msgctxt "NetViewer"
 msgid "Show the network map help"
-msgstr ""
+msgstr "Zobrazím pomoc tejto mapy siete"
 
 msgctxt "NetViewer"
 msgid "Show network map help"
-msgstr ""
+msgstr "Zobrazím pomoc  mapy siete"
 
 msgctxt "NetViewer"
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 msgctxt "NetViewer"
 msgid "Close"
-msgstr ""
+msgstr "Zavrieť"
 
 msgctxt "NetViewer"
 msgid "Close the network map"
-msgstr ""
+msgstr "Zavrieť mapu siete"
 
 msgctxt "NetViewer"
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 msgctxt "NetViewer"
 msgid "Zoom In"
-msgstr ""
+msgstr "Priblížiť"
 
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
-msgstr ""
+msgstr "Priblížim mapu siete"
 
 msgctxt "NetViewer"
 msgid "+"
-msgstr ""
+msgstr "+"
 
 msgctxt "NetViewer"
 msgid "Zoom Out"
-msgstr ""
+msgstr "Oddialiť"
 
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
-msgstr ""
+msgstr "Oddialim mapu siete"
 
 msgctxt "NetViewer"
 msgid "-"
-msgstr ""
+msgstr "-"
 
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
-msgstr ""
+msgstr "Priblížiť v Okruhu"
 
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
+msgstr "Priblížim, aby sa zmestili všetky aktuálne zobrazené okruhy"
 
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
-msgstr ""
+msgstr "Ctrl+Z"
 
 msgctxt "NetViewer"
 msgid "Relay Not Found"
-msgstr ""
+msgstr "Prenos nebol nájdený"
 
 msgctxt "NetViewer"
 msgid "No details on the selected relay are available."
-msgstr ""
+msgstr "Podrobnosti pre daný prenos neboli nájdené."
 
 msgctxt "NetViewer"
 msgid "Unknown"
-msgstr ""
+msgstr "Neznáme"
 
 msgctxt "NetViewer"
 msgid "Full Screen"
-msgstr ""
+msgstr "Celá obrazovka"
 
 msgctxt "NetViewer"
 msgid "View the network map as a full screen window"
-msgstr ""
+msgstr "Zobraziť mapu siete v okne na celú obrazovku"
 
 msgctxt "NetViewer"
 msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
+msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
-msgstr ""
+msgstr "Kopírovať (Ctrl+C)"
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2394,50 +2584,44 @@ msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
+msgstr "Nastavenie proxy"
 
 msgctxt "NetworkPage"
 msgid "Username:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
+msgstr "Už.názov:"
 
 msgctxt "NetworkPage"
 msgid "Password:"
-msgstr ""
+msgstr "Heslo?"
 
 msgctxt "NetworkPage"
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
+msgstr "Skontrolujte si pripojenie prenosu použitých portov, ktoré ste povolili firewallu"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr ""
+msgstr "Môj firewall mi umožÅ?uje pripojenie len k niektorým portom"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
-msgstr ""
+msgstr "Nastavenie firewallu"
 
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
-msgstr ""
+msgstr "Povolené porty:"
 
 msgctxt "NetworkPage"
 msgid "80, 443"
-msgstr ""
+msgstr "80, 443"
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2446,19 +2630,11 @@ msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
+msgstr "Nastavenie premostenia"
 
 msgctxt "NetworkPage"
 msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
+msgstr "Pridať prem.:"
 
 msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
@@ -2481,192 +2657,222 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr "Adresa:"
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr "Typ:"
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr "Musíte zvoliť typ proxy."
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
-msgstr ""
+msgstr "akceptovať"
 
 msgctxt "Policy"
 msgid "reject"
-msgstr ""
+msgstr "zamietnúť"
 
 msgctxt "RouterDescriptor"
 msgid "Online"
-msgstr ""
+msgstr "Zapojený"
 
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
-msgstr ""
+msgstr "Hybernácia"
 
 msgctxt "RouterDescriptor"
 msgid "Offline"
-msgstr ""
+msgstr "Odpojený"
 
 msgctxt "RouterDescriptorView"
 msgid "Location:"
-msgstr ""
+msgstr "Umiestnenie:"
 
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
-msgstr ""
+msgstr "IP Adresa:"
 
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
-msgstr ""
+msgstr "Platforma:"
 
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Šírka pásma:"
 
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
-msgstr ""
+msgstr "Ä?as prevádzky:"
 
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
-msgstr ""
+msgstr "Naposledy aktualizované:"
 
 msgctxt "RouterDescriptorView"
 msgid "Copy"
-msgstr ""
+msgstr "Kopírovať"
 
 msgctxt "RouterInfoDialog"
 msgid "Hibernating"
-msgstr ""
+msgstr "Uspať"
 
 msgctxt "RouterInfoDialog"
 msgid "Online"
-msgstr ""
+msgstr "Pripojený"
 
 msgctxt "RouterInfoDialog"
 msgid "Offline"
-msgstr ""
+msgstr "Odpojený"
 
 msgctxt "RouterInfoDialog"
 msgid "Unknown"
-msgstr ""
+msgstr "Neznámy"
 
 msgctxt "RouterInfoDialog"
 msgid "Relay Details"
-msgstr ""
+msgstr "Podrobnosti o uzle"
 
 msgctxt "RouterInfoDialog"
 msgid "Summary"
-msgstr ""
+msgstr "Zhrnutie"
 
 msgctxt "RouterInfoDialog"
 msgid "Name:"
-msgstr ""
+msgstr "Meno:"
 
 msgctxt "RouterInfoDialog"
 msgid "Status:"
-msgstr ""
+msgstr "Stav:"
 
 msgctxt "RouterInfoDialog"
 msgid "Location:"
-msgstr ""
+msgstr "Umiestnenie:"
 
 msgctxt "RouterInfoDialog"
 msgid "IP Address:"
-msgstr ""
+msgstr "IP Adresa:"
 
 msgctxt "RouterInfoDialog"
 msgid "Platform:"
-msgstr ""
+msgstr "Platforma:"
 
 msgctxt "RouterInfoDialog"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Šírka pásma:"
 
 msgctxt "RouterInfoDialog"
 msgid "Uptime:"
-msgstr ""
+msgstr "Doba prevádzky:"
 
 msgctxt "RouterInfoDialog"
 msgid "Contact:"
-msgstr ""
+msgstr "Kontakt:"
 
 msgctxt "RouterInfoDialog"
 msgid "Last Updated:"
-msgstr ""
+msgstr "Naposledy aktualizované:"
 
 msgctxt "RouterInfoDialog"
 msgid "Descriptor"
-msgstr ""
+msgstr "Deskriptor"
 
 msgctxt "RouterListItem"
 msgid "Offline"
-msgstr ""
+msgstr "Odpojený"
 
 msgctxt "RouterListItem"
 msgid "Hibernating"
-msgstr ""
+msgstr "Uspať"
 
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "RouterListWidget"
 msgid "Relay"
-msgstr ""
+msgstr "Relay"
 
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
-msgstr ""
+msgstr "Priblížiť relay"
 
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
-msgstr ""
+msgstr "%1 pripojených relay"
 
 msgctxt "RouterListWidget"
 msgid "Copy"
-msgstr ""
+msgstr "Kopírovať"
 
 msgctxt "RouterListWidget"
 msgid "Nickname"
-msgstr ""
+msgstr "Prezývka"
 
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
-msgstr ""
+msgstr "OdtlaÄ?ok prsta"
 
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
-msgstr ""
+msgstr "Podpora mostov nie je dostupná"
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
-msgstr ""
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
+msgstr "Nakonfigurovali ste Tor tak, aby používal mostové relé pre cenzurovaných používateľov, ale Vaša verzia nepodporuje použitie mostov."
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
-msgstr ""
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
+msgstr "Prosím aktualizujte Váš softvér Tor alebo ho nastavte tak, aby sa choval ako normálne Tor relé."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
-msgstr ""
+msgstr "Vaše mostové relé nie je spustené."
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr ""
+msgstr "Musíte uviesÅ¥ aspoÅ? prezývku relé a port."
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
+msgstr "Pracovať iba ako klient"
 
 msgctxt "ServerPage"
 msgid "Relay Port:"
-msgstr ""
+msgstr "Port relé:"
 
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
@@ -2678,7 +2884,7 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
@@ -2706,39 +2912,41 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "Nickname:"
-msgstr ""
+msgstr "Prezývka:"
 
 msgctxt "ServerPage"
 msgid "Basic Settings"
-msgstr ""
+msgstr "Základné nastavenia"
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
-msgstr ""
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
+msgstr "Ak máte pripojenie s rýchlym downloadom, ale pomalým uploadom, tak tu vyberte zo zoznamu rýchlosť Vášho uploadu."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
-msgstr ""
+msgstr "Cable/DSL 256 Kbps"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
-msgstr ""
+msgstr "Cable/DSL 512 Kbps"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
-msgstr ""
+msgstr "Cable/DSL 768 Kbps"
 
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr ""
+msgstr "T1/Cable/DSL 1.5 Mbps"
 
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
-msgstr ""
+msgstr "> 1.5 Mbps"
 
 msgctxt "ServerPage"
 msgid "Custom"
-msgstr ""
+msgstr "Vlastné"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
@@ -2758,7 +2966,7 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "KB/s"
-msgstr ""
+msgstr "KB/s"
 
 msgctxt "ServerPage"
 msgid "Maximum Rate"
@@ -2769,7 +2977,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2778,19 +2988,19 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
+msgstr "Porty 6660 - 6669 a 6697"
 
 msgctxt "ServerPage"
 msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "Internet Relay Chat (IRC)"
 
 msgctxt "ServerPage"
 msgid "Ports 110, 143, 993 and 995"
-msgstr ""
+msgstr "Porty 110, 143, 993 a 995"
 
 msgctxt "ServerPage"
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "Príjem emailov (POP, IMAP)"
 
 msgctxt "ServerPage"
 msgid "Ports unspecified by other checkboxes"
@@ -2802,38 +3012,41 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 5223, 8300 a 8888"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "Instant Messaging (IM)"
 
 msgctxt "ServerPage"
 msgid "Port 443"
-msgstr ""
+msgstr "Port 443"
 
 msgctxt "ServerPage"
 msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "BezpeÄ?né webstránky (SSL)"
 
 msgctxt "ServerPage"
 msgid "Port 80"
-msgstr ""
+msgstr "Port 80"
 
 msgctxt "ServerPage"
 msgid "Websites"
-msgstr ""
+msgstr "Webstránky"
 
 msgctxt "ServerPage"
 msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2845,12 +3058,13 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
+msgstr "Toto je identita Vášho mostu, ktorú môžete poslať ostatným užívateľom"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
+msgstr "Skopírujte identitu Vášho mostu do schránky"
 
 msgctxt "ServerPage"
 msgid "No Recent Usage"
@@ -2858,34 +3072,54 @@ msgstr ""
 
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "V poslednej dobe nik nepoužil Vaše relé."
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
-msgstr ""
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
+msgstr "Ak necháte VaÅ¡e relé zapnuté, tak klienti budú maÅ¥ väÄ?Å¡iu Å¡ancu, že ho nájdu a použijú."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
-msgstr ""
+msgstr "História mostu"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
-msgstr ""
+msgstr "Vrátená odpoveÄ? bola: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
+msgstr "Pomôžte cenzurovaným užívateľom pripojiť sa na sieť Tor"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">Kto použil môj most?</a>"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr "<a href=\"#bridgeHelp\">Ä?o je to?</a>"
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr "Automaticky rozoslať adresu môjho mostu"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2893,25 +3127,28 @@ msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "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 ""
+msgstr "Chyba pri odhlásení všetkých služieb"
 
 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."
+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 ""
+msgstr "Chyba"
 
 msgctxt "ServicePage"
 msgid "Please select a Service."
-msgstr ""
+msgstr "Prosím vyberte službu"
 
 msgctxt "ServicePage"
 msgid "Select Service Directory"
@@ -2919,123 +3156,430 @@ msgstr ""
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
+msgstr "Virtuálny port môže obsahovaÅ¥ iba povole Ä?ísla portov [1..65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
+msgstr "Cieľ môže obsahovať iba adresu:port, adresu alebo port."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
-msgstr ""
+msgstr "Adresár už používa iná služba."
 
 msgctxt "ServicePage"
 msgid "Form"
-msgstr ""
+msgstr "Formulár"
 
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
-msgstr ""
+msgstr "Poskytované skryté služby"
 
 msgctxt "ServicePage"
 msgid "Onion Address"
-msgstr ""
+msgstr "Onion adresa"
 
 msgctxt "ServicePage"
 msgid "Virtual Port"
-msgstr ""
+msgstr "Virtuálny port"
 
 msgctxt "ServicePage"
 msgid "Target"
-msgstr ""
+msgstr "Cieľ"
 
 msgctxt "ServicePage"
 msgid "Directory Path"
-msgstr ""
+msgstr "Cesta k adresáru"
 
 msgctxt "ServicePage"
 msgid "Enabled"
-msgstr ""
+msgstr "Povolený"
 
 msgctxt "ServicePage"
 msgid "Add new service to list"
-msgstr ""
+msgstr "Pridať novú službu do zoznamu"
 
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
-msgstr ""
+msgstr "Odstrániť vybranú službu zo zoznamu"
 
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
-msgstr ""
+msgstr "Kopírovať onion adresu vybranej služby do schránky"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
+msgstr "Prehľadajte lokálny súborový systém a vyberte adresár pre vybratú službu"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
+msgstr "Vyrobil Tor"
+
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr "Kopírovať do schránky"
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr "Softvér Tor je spustený"
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr "Softvér Tor je vo verzií \"%1\""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr "Softvér Tor nie je spustený"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr "Softvér Tor reÅ¡tartujete, ak na ovládacom paneli Vidialie stlaÄ?íte \"SpustiÅ¥ Tor\". Ak Tor skonÄ?il neoÄ?akávane, tak záložke \"PokroÄ?ilé\" nájdete podrobnosti vÅ¡etkých zistených chybách."
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr "Práve používate verziu \"%1\" softvéru Tor, ktorá sa už neodporúÄ?a používaÅ¥. Aktualizujte Tor na najnovÅ¡iu verziu, ktorá môže obsahovaÅ¥ dôležité opravy, ktoré zlepÅ¡ujú bezpeÄ?nosÅ¥, stabilitu a výkon."
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr "Práve používate verziu \"%1\" softvéru Tor, ktorá nemusí pracovaÅ¥ so súÄ?asnou sieÅ¥ou Tor. Aktualizujte Tor na najnovÅ¡iu verziu, ktorá môže obsahovaÅ¥ dôležité opravy, ktoré zlepÅ¡ujú bezpeÄ?nosÅ¥, stabilitu a výkon."
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr "Softvér Tor je neaktuálny"
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr "Ste pripojený k sieti Tor"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr "�spešne sa podarilo pripojiť k sieti Tor. "
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr "Chyba softvéru Tor"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr "Potenciálne nebezpeÄ?né pripojenie!"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr "Neznámy SOCKS protokol"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr "Bola zmenená externá IP adresa"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr "Zistený DNS Hijacking"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr "Relay deskriptor bol odmietnutý"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr "Váš relay deskriptor, ktorý povoľuje klientom pripojenie k Vášmu relay, bol odmietnutý adresárovým serverom %1:%2. Dôvodom bolo: %3"
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr "Vaše relay je online"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr "VaÅ¡e relay je teraz online a k dispozícií na používanie Tor klientom. Behom nasledujúcich hodín by ste mali zaznamenaÅ¥ zvýšenú sieÅ¥ovú aktivitu v Prevádzkovom grafe. Ä?akujeme, že prispievate do siete Tor!"
+
 msgctxt "Stream"
 msgid "New"
-msgstr ""
+msgstr "Nový"
 
 msgctxt "Stream"
 msgid "Resolving"
-msgstr ""
+msgstr "Resolving"
 
 msgctxt "Stream"
 msgid "Connecting"
-msgstr ""
+msgstr "Pripojiť"
 
 msgctxt "Stream"
 msgid "Open"
-msgstr ""
+msgstr "Otvoriť"
 
 msgctxt "Stream"
 msgid "Failed"
-msgstr ""
+msgstr "Zlyhalo"
 
 msgctxt "Stream"
 msgid "Closed"
-msgstr ""
+msgstr "Zatvoriť"
 
 msgctxt "Stream"
 msgid "Retrying"
-msgstr ""
+msgstr "Opakovať"
 
 msgctxt "Stream"
 msgid "Remapped"
-msgstr ""
+msgstr "Remapped"
 
 msgctxt "Stream"
 msgid "Unknown"
-msgstr ""
+msgstr "Neznáme"
 
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
-msgstr ""
+msgstr "Proces %1 sa neukonÄ?il. [%2]"
 
 msgctxt "TorService"
 msgid "The Tor service is not installed."
-msgstr ""
+msgstr "Služba Tor nie je nainštalovaná."
 
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
-msgstr ""
+msgstr "Služba Tor sa nedá spustiť."
 
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
-msgstr ""
+msgstr "Nepodaril sa hash kontrolného hesla."
+
+msgctxt "TorrcDialog"
+msgid "Editing torrc"
+msgstr "Upraviť torrc"
+
+msgctxt "TorrcDialog"
+msgid ""
+"Save settings. If unchecked it will only apply settings to the current Tor "
+"instance."
+msgstr "UložiÅ¥ nastavenia. Ak to bude neoznaÄ?ené, tak sa to bude vzÅ¥ahovaÅ¥ iba na súÄ?asnú Tor inÅ¡tanciu."
+
+msgctxt "TorrcDialog"
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr "Kopírovať"
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr "Vložiť"
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr "Späť"
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr "Obnoviť"
+
+msgctxt "TorrcDialog"
+msgid "Select All"
+msgstr "OznaÄ?iÅ¥ vÅ¡etko"
+
+msgctxt "TorrcDialog"
+msgid "Apply all"
+msgstr "Použiť všetko"
+
+msgctxt "TorrcDialog"
+msgid "Apply selection only"
+msgstr "Použiť iba vybrané"
+
+msgctxt "TorrcDialog"
+msgid "Error connecting to Tor"
+msgstr "Pri pripojení na Tor nastala chyba"
+
+msgctxt "TorrcDialog"
+msgid "Selection is empty. Please select some text, or check \"Apply all\""
+msgstr "Výber je prázdny. Prosím oznaÄ?te nejaký text alebo zaÅ¡krtnite \"PoužiÅ¥ vÅ¡etko\""
+
+msgctxt "TorrcDialog"
+msgid "Error at line %1: \"%2\""
+msgstr "Chyba na riadku %1: \"%2\""
+
+msgctxt "TorrcDialog"
+msgid "Error"
+msgstr "Chyba"
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr "Pri otváraní torrc súboru nastala chyba"
 
 msgctxt "UPNPControl"
 msgid "Success"
-msgstr ""
+msgstr "Ã?spech"
 
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Nenašli sa žiadne UPnP zariadenia"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
@@ -3043,7 +3587,7 @@ msgstr ""
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
-msgstr ""
+msgstr "Zlyhal WSAStartup"
 
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
@@ -3059,7 +3603,7 @@ msgstr ""
 
 msgctxt "UPNPControl"
 msgid "Unknown error"
-msgstr ""
+msgstr "Neznáma chyba"
 
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
@@ -3086,11 +3630,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3099,119 +3647,119 @@ msgstr ""
 
 msgctxt "UpdateProgressDialog"
 msgid "Hide"
-msgstr ""
+msgstr "Skryť"
 
 msgctxt "UpdateProgressDialog"
 msgid "Downloading updates..."
-msgstr ""
+msgstr "Sťahovanie aktualizácií..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Installing updated software..."
-msgstr ""
+msgstr "Inštalácia aktualizácie softvéru..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "Hotovo! Váš softvér je aktuálny."
 
 msgctxt "UpdateProgressDialog"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "UpdateProgressDialog"
 msgid "Software Updates"
-msgstr ""
+msgstr "Softvérové aktualizácie"
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for updates..."
-msgstr ""
+msgstr "Vyhľadať aktualizácie..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Software Updates Available"
-msgstr ""
+msgstr "Sú dostupné softvérové aktualizácie"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Remind Me Later"
-msgstr ""
+msgstr "Pripomenúť neskôr"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Install"
-msgstr ""
+msgstr "Inštalovať"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
+msgstr "Nasledovné aktualizované softvérové balíky sú pripravené na inštaláciu:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
-msgstr ""
+msgstr "Balík"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Version"
-msgstr ""
+msgstr "Verzia"
 
 msgctxt "VMessageBox"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "VMessageBox"
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
 msgctxt "VMessageBox"
 msgid "Yes"
-msgstr ""
+msgstr "Ã?no"
 
 msgctxt "VMessageBox"
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 msgctxt "VMessageBox"
 msgid "Help"
-msgstr ""
+msgstr "Pomocník"
 
 msgctxt "VMessageBox"
 msgid "Retry"
-msgstr ""
+msgstr "Opakovať"
 
 msgctxt "VMessageBox"
 msgid "Show Log"
-msgstr ""
+msgstr "Zobraziť Log"
 
 msgctxt "VMessageBox"
 msgid "Show Settings"
-msgstr ""
+msgstr "Zobraziť Nastavenia"
 
 msgctxt "VMessageBox"
 msgid "Continue"
-msgstr ""
+msgstr "PokraÄ?ovaÅ¥"
 
 msgctxt "VMessageBox"
 msgid "Quit"
-msgstr ""
+msgstr "UkonÄ?iÅ¥"
 
 msgctxt "VMessageBox"
 msgid "Browse"
-msgstr ""
+msgstr "Prehliadať"
 
 msgctxt "Vidalia"
 msgid "Invalid Argument"
-msgstr ""
+msgstr "Neplatný Argument"
 
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
-msgstr ""
+msgstr "Vidalia už beží"
 
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
-msgstr ""
+msgstr "ZobraziÅ¥ túto správu a skonÄ?iÅ¥."
 
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
-msgstr ""
+msgstr "Resetovať VŠETKY uložené nastavenia Vidalia"
 
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
@@ -3219,7 +3767,7 @@ msgstr ""
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
+msgstr "Nastaviť názov a umiestnenie pre Vidalia pidfile."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
@@ -3227,70 +3775,75 @@ msgstr ""
 
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
+msgstr "Nastaví podrobnosť záznamov Vidalie"
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
-msgstr ""
+msgstr "Nastaví vzhľad Vidalie"
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
-msgstr ""
+msgstr "Nastaví jazyk Vidalie"
 
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
-msgstr ""
+msgstr "Informácie o používaní Vidalie"
 
 msgctxt "Vidalia"
 msgid "Unable to open log file '%1': %2"
-msgstr ""
+msgstr "Nepodarilo sa otvoriť log súbor '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr "Parameter vyžaduje hodnotu:"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Neplatný kód jazyka:"
 
 msgctxt "Vidalia"
 msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Neplatná špecifikácia štýlu grafického rozhrania:"
 
 msgctxt "Vidalia"
 msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Neplatná úroveÅ? logov:"
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
+msgstr "Pravdepodobne beží Ä?alší proces Vidalia. Pokiaľ Ä?alší proces Vidalia nebeží, tak môžete pokraÄ?ovaÅ¥ Ä?alej.\n\nPrajete si aj tak spustiÅ¥ Vidalia?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
-msgstr ""
+msgstr "%1 sekúnd"
 
 msgctxt "stringutil.h"
 msgid "%1 B/s"
-msgstr ""
+msgstr "%1 B/s"
 
 msgctxt "stringutil.h"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s"
 
 msgctxt "stringutil.h"
 msgid "%1 MB/s"
-msgstr ""
+msgstr "%1 MB/s"
 
 msgctxt "stringutil.h"
 msgid "%1 GB/s"
-msgstr ""
+msgstr "%1 GB/s"
 
 msgctxt "stringutil.h"
 msgid "%1 days"
-msgstr ""
+msgstr "%1 dní"
 
 msgctxt "stringutil.h"
 msgid "%1 hours"
-msgstr ""
+msgstr "%1 hodín"
 
 msgctxt "stringutil.h"
 msgid "%1 mins"
-msgstr ""
+msgstr "%1 minút"
diff --git a/src/vidalia/i18n/po/sl/qt_sl.po b/src/vidalia/i18n/po/sl/qt_sl.po
index 2d42daa..0a94162 100644
--- a/src/vidalia/i18n/po/sl/qt_sl.po
+++ b/src/vidalia/i18n/po/sl/qt_sl.po
@@ -1,10 +1,12 @@
-# 
+# Translators:
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
diff --git a/src/vidalia/i18n/po/sl/vidalia_sl.po b/src/vidalia/i18n/po/sl/vidalia_sl.po
index a464ed1..8262c73 100644
--- a/src/vidalia/i18n/po/sl/vidalia_sl.po
+++ b/src/vidalia/i18n/po/sl/vidalia_sl.po
@@ -1,174 +1,201 @@
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-04-10 22:39+0000\n"
-"PO-Revision-Date: 2008-08-03 21:59+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:28
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr ""
 
-#: aboutdialog.cpp:34
 msgctxt "AboutDialog"
 msgid "License"
 msgstr ""
 
-#: aboutdialog.ui:63
 msgctxt "AboutDialog"
 msgid "Vidalia 0.2.0"
 msgstr ""
 
-#: aboutdialog.ui:73
 msgctxt "AboutDialog"
 msgid "Tor 0.2.0.32"
 msgstr ""
 
-#: aboutdialog.ui:88
 msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
-#: advancedpage.cpp:120
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr ""
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr ""
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr ""
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr ""
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr ""
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr ""
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr ""
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr ""
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
 msgstr ""
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr ""
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr ""
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
 msgstr ""
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ""
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr ""
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
 msgstr ""
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
 msgstr ""
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
 msgstr ""
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
 msgstr ""
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
 msgstr ""
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
-#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
 msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
@@ -176,1559 +203,1321 @@ msgid ""
 "You may need to remove it manually."
 msgstr ""
 
-#: appearancepage.ui:22
 msgctxt "AppearancePage"
 msgid "Language"
 msgstr ""
 
-#: appearancepage.ui:37
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
 msgstr ""
 
-#: appearancepage.ui:75
 msgctxt "AppearancePage"
 msgid "Style"
 msgstr ""
 
-#: appearancepage.ui:103
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
 msgstr ""
 
-#: appearancepage.cpp:67
 msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
-#: bwgraph.cpp:166
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr ""
 
-#: bwgraph.cpp:232
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
 msgstr ""
 
-#: bwgraph.ui:40
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
 msgstr ""
 
-#: bwgraph.ui:16
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
 msgstr ""
 
-#: bwgraph.ui:63
 msgctxt "BandwidthGraph"
 msgid "Reset"
 msgstr ""
 
-#: bwgraph.ui:151
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
 msgstr ""
 
-#: bwgraph.ui:170
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
 msgstr ""
 
-#: bwgraph.ui:183
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
 msgstr ""
 
-#: bwgraph.ui:234
 msgctxt "BandwidthGraph"
 msgid "Style"
 msgstr ""
 
-#: bwgraph.ui:284
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
 msgstr ""
 
-#: bwgraph.ui:368
 msgctxt "BandwidthGraph"
 msgid "100"
 msgstr ""
 
-#: bwgraph.ui:383
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
 msgstr ""
 
-#: bwgraph.ui:443
 msgctxt "BandwidthGraph"
 msgid "Save"
 msgstr ""
 
-#: bwgraph.ui:450
 msgctxt "BandwidthGraph"
 msgid "Cancel"
 msgstr ""
 
-#: bridgeusagedialog.ui:50
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
 msgctxt "BridgeUsageDialog"
 msgid "Country"
 msgstr ""
 
-#: bridgeusagedialog.ui:55
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
 msgstr ""
 
-#: bridgeusagedialog.cpp:58
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
 msgstr ""
 
-#: bridgeusagedialog.ui:13
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
 msgstr ""
 
-#: bridgeusagedialog.ui:19
 msgctxt "BridgeUsageDialog"
 msgid "Client Summary"
 msgstr ""
 
-#: circuit.cpp:112
 msgctxt "Circuit"
 msgid "New"
 msgstr ""
 
-#: circuit.cpp:113
 msgctxt "Circuit"
 msgid "Open"
 msgstr ""
 
-#: circuit.cpp:114
 msgctxt "Circuit"
 msgid "Building"
 msgstr ""
 
-#: circuit.cpp:115
 msgctxt "Circuit"
 msgid "Failed"
 msgstr ""
 
-#: circuit.cpp:116
 msgctxt "Circuit"
 msgid "Closed"
 msgstr ""
 
-#: circuit.cpp:117
 msgctxt "Circuit"
 msgid "Unknown"
 msgstr ""
 
-#: circuititem.cpp:39
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
 msgstr ""
 
-#: circuitlistwidget.cpp:56
 msgctxt "CircuitListWidget"
 msgid "Connection"
 msgstr ""
 
-#: circuitlistwidget.cpp:56
 msgctxt "CircuitListWidget"
 msgid "Status"
 msgstr ""
 
-#: circuitlistwidget.cpp:88
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
 msgstr ""
 
-#: circuitlistwidget.cpp:90
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
 msgstr ""
 
-#: circuitlistwidget.cpp:113
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
 msgstr ""
 
-#: configdialog.cpp:78
 msgctxt "ConfigDialog"
 msgid "General"
 msgstr ""
 
-#: configdialog.cpp:84
 msgctxt "ConfigDialog"
 msgid "Network"
 msgstr ""
 
-#: configdialog.cpp:88
 msgctxt "ConfigDialog"
 msgid "Sharing"
 msgstr ""
 
-#: configdialog.cpp:92
 msgctxt "ConfigDialog"
 msgid "Services"
 msgstr ""
 
-#: configdialog.cpp:96
 msgctxt "ConfigDialog"
 msgid "Appearance"
 msgstr ""
 
-#: configdialog.cpp:100
 msgctxt "ConfigDialog"
 msgid "Advanced"
 msgstr ""
 
-#: configdialog.cpp:114
 msgctxt "ConfigDialog"
 msgid "Help"
 msgstr ""
 
-#: configdialog.cpp:199
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
 msgstr ""
 
-#: configdialog.cpp:201
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
 msgstr ""
 
-#: configdialog.cpp:228
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
 msgstr ""
 
-#: configdialog.cpp:230
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
 msgstr ""
 
-#: configdialog.ui:16
 msgctxt "ConfigDialog"
 msgid "Settings"
 msgstr ""
 
-#: controlconnection.cpp:134
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
 msgstr ""
 
-#: controlconnection.cpp:331
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
 msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Remember my password"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
 msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
-#: controlsocket.cpp:70
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
 msgstr ""
 
-#: controlsocket.cpp:80
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
 msgstr ""
 
-#: controlsocket.cpp:117
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
 msgstr ""
 
-#: controlsocket.cpp:156
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
 msgstr ""
 
-#: countryinfo.cpp:33
 msgctxt "CountryInfo"
 msgid "Afghanistan"
 msgstr ""
 
-#: countryinfo.cpp:34
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
-
-#: countryinfo.cpp:35
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
-
-#: countryinfo.cpp:36
 msgctxt "CountryInfo"
 msgid "Andorra"
 msgstr ""
 
-#: countryinfo.cpp:37
 msgctxt "CountryInfo"
 msgid "Angola"
 msgstr ""
 
-#: countryinfo.cpp:38
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
 msgstr ""
 
-#: countryinfo.cpp:39
 msgctxt "CountryInfo"
 msgid "Argentina"
 msgstr ""
 
-#: countryinfo.cpp:40
 msgctxt "CountryInfo"
 msgid "Armenia"
 msgstr ""
 
-#: countryinfo.cpp:41
 msgctxt "CountryInfo"
 msgid "Australia"
 msgstr ""
 
-#: countryinfo.cpp:42
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
-
-#: countryinfo.cpp:43
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
 msgstr ""
 
-#: countryinfo.cpp:44
 msgctxt "CountryInfo"
 msgid "Bahamas"
 msgstr ""
 
-#: countryinfo.cpp:45
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr ""
-
-#: countryinfo.cpp:46
 msgctxt "CountryInfo"
 msgid "Bangladesh"
 msgstr ""
 
-#: countryinfo.cpp:47
 msgctxt "CountryInfo"
 msgid "Barbados"
 msgstr ""
 
-#: countryinfo.cpp:48
 msgctxt "CountryInfo"
 msgid "Belarus"
 msgstr ""
 
-#: countryinfo.cpp:49
 msgctxt "CountryInfo"
 msgid "Belgium"
 msgstr ""
 
-#: countryinfo.cpp:50
 msgctxt "CountryInfo"
 msgid "Belize"
 msgstr ""
 
-#: countryinfo.cpp:51
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr ""
-
-#: countryinfo.cpp:52
 msgctxt "CountryInfo"
 msgid "Bhutan"
 msgstr ""
 
-#: countryinfo.cpp:53
 msgctxt "CountryInfo"
 msgid "Bolivia"
 msgstr ""
 
-#: countryinfo.cpp:54
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
 msgstr ""
 
-#: countryinfo.cpp:55
 msgctxt "CountryInfo"
 msgid "Botswana"
 msgstr ""
 
-#: countryinfo.cpp:56
 msgctxt "CountryInfo"
 msgid "Brazil"
 msgstr ""
 
-#: countryinfo.cpp:57
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: countryinfo.cpp:58
 msgctxt "CountryInfo"
 msgid "Bulgaria"
 msgstr ""
 
-#: countryinfo.cpp:59
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
 msgstr ""
 
-#: countryinfo.cpp:60
 msgctxt "CountryInfo"
 msgid "Burundi"
 msgstr ""
 
-#: countryinfo.cpp:61
 msgctxt "CountryInfo"
 msgid "Cambodia"
 msgstr ""
 
-#: countryinfo.cpp:62
 msgctxt "CountryInfo"
 msgid "Cameroon"
 msgstr ""
 
-#: countryinfo.cpp:63
 msgctxt "CountryInfo"
 msgid "Canada"
 msgstr ""
 
-#: countryinfo.cpp:64
 msgctxt "CountryInfo"
 msgid "Cape Verde"
 msgstr ""
 
-#: countryinfo.cpp:65
 msgctxt "CountryInfo"
 msgid "Central African Republic"
 msgstr ""
 
-#: countryinfo.cpp:66
 msgctxt "CountryInfo"
 msgid "Chad"
 msgstr ""
 
-#: countryinfo.cpp:67
 msgctxt "CountryInfo"
 msgid "Chile"
 msgstr ""
 
-#: countryinfo.cpp:68
 msgctxt "CountryInfo"
 msgid "China"
 msgstr ""
 
-#: countryinfo.cpp:69
 msgctxt "CountryInfo"
 msgid "Colombia"
 msgstr ""
 
-#: countryinfo.cpp:70
 msgctxt "CountryInfo"
 msgid "Comoros"
 msgstr ""
 
-#: countryinfo.cpp:71
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
-#: countryinfo.cpp:72
 msgctxt "CountryInfo"
 msgid "Congo"
 msgstr ""
 
-#: countryinfo.cpp:73
 msgctxt "CountryInfo"
 msgid "Costa Rica"
 msgstr ""
 
-#: countryinfo.cpp:74
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
 msgstr ""
 
-#: countryinfo.cpp:75
 msgctxt "CountryInfo"
 msgid "Croatia"
 msgstr ""
 
-#: countryinfo.cpp:76
 msgctxt "CountryInfo"
 msgid "Cuba"
 msgstr ""
 
-#: countryinfo.cpp:77
 msgctxt "CountryInfo"
 msgid "Cyprus"
 msgstr ""
 
-#: countryinfo.cpp:78
 msgctxt "CountryInfo"
 msgid "Czech Republic"
 msgstr ""
 
-#: countryinfo.cpp:79
 msgctxt "CountryInfo"
 msgid "Denmark"
 msgstr ""
 
-#: countryinfo.cpp:80
 msgctxt "CountryInfo"
 msgid "Djibouti"
 msgstr ""
 
-#: countryinfo.cpp:81
 msgctxt "CountryInfo"
 msgid "Dominica"
 msgstr ""
 
-#: countryinfo.cpp:82
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
 msgstr ""
 
-#: countryinfo.cpp:83
 msgctxt "CountryInfo"
 msgid "Ecuador"
 msgstr ""
 
-#: countryinfo.cpp:84
 msgctxt "CountryInfo"
 msgid "Egypt"
 msgstr ""
 
-#: countryinfo.cpp:85
 msgctxt "CountryInfo"
 msgid "El Salvador"
 msgstr ""
 
-#: countryinfo.cpp:86
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: countryinfo.cpp:87
 msgctxt "CountryInfo"
 msgid "Eritrea"
 msgstr ""
 
-#: countryinfo.cpp:88
 msgctxt "CountryInfo"
 msgid "Estonia"
 msgstr ""
 
-#: countryinfo.cpp:89
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr ""
-
-#: countryinfo.cpp:90
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr ""
-
-#: countryinfo.cpp:91
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr ""
-
-#: countryinfo.cpp:92
 msgctxt "CountryInfo"
 msgid "France"
 msgstr ""
 
-#: countryinfo.cpp:93
 msgctxt "CountryInfo"
 msgid "Gabon"
 msgstr ""
 
-#: countryinfo.cpp:94
 msgctxt "CountryInfo"
 msgid "Gambia"
 msgstr ""
 
-#: countryinfo.cpp:95
 msgctxt "CountryInfo"
 msgid "Georgia"
 msgstr ""
 
-#: countryinfo.cpp:96
 msgctxt "CountryInfo"
 msgid "Germany"
 msgstr ""
 
-#: countryinfo.cpp:97
 msgctxt "CountryInfo"
 msgid "Ghana"
 msgstr ""
 
-#: countryinfo.cpp:98
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr ""
-
-#: countryinfo.cpp:99
 msgctxt "CountryInfo"
 msgid "Grenada"
 msgstr ""
 
-#: countryinfo.cpp:100
 msgctxt "CountryInfo"
 msgid "Guatemala"
 msgstr ""
 
-#: countryinfo.cpp:101
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr ""
-
-#: countryinfo.cpp:102
 msgctxt "CountryInfo"
 msgid "Guinea"
 msgstr ""
 
-#: countryinfo.cpp:103
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
 msgstr ""
 
-#: countryinfo.cpp:104
 msgctxt "CountryInfo"
 msgid "Guyana"
 msgstr ""
 
-#: countryinfo.cpp:105
 msgctxt "CountryInfo"
 msgid "Hong Kong"
 msgstr ""
 
-#: countryinfo.cpp:106
 msgctxt "CountryInfo"
 msgid "Haiti"
 msgstr ""
 
-#: countryinfo.cpp:107
 msgctxt "CountryInfo"
 msgid "Honduras"
 msgstr ""
 
-#: countryinfo.cpp:108
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr ""
-
-#: countryinfo.cpp:109
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr ""
-
-#: countryinfo.cpp:110
-msgctxt "CountryInfo"
-msgid "India"
-msgstr ""
-
-#: countryinfo.cpp:111
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr ""
-
-#: countryinfo.cpp:112
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
-
-#: countryinfo.cpp:113
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr ""
-
-#: countryinfo.cpp:114
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr ""
-
-#: countryinfo.cpp:115
 msgctxt "CountryInfo"
 msgid "Israel"
 msgstr ""
 
-#: countryinfo.cpp:116
 msgctxt "CountryInfo"
 msgid "Italy"
 msgstr ""
 
-#: countryinfo.cpp:117
 msgctxt "CountryInfo"
 msgid "Jamaica"
 msgstr ""
 
-#: countryinfo.cpp:118
 msgctxt "CountryInfo"
 msgid "Japan"
 msgstr ""
 
-#: countryinfo.cpp:119
 msgctxt "CountryInfo"
 msgid "Jordan"
 msgstr ""
 
-#: countryinfo.cpp:120
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
 msgstr ""
 
-#: countryinfo.cpp:121
 msgctxt "CountryInfo"
 msgid "Kenya"
 msgstr ""
 
-#: countryinfo.cpp:122
 msgctxt "CountryInfo"
 msgid "Kiribati"
 msgstr ""
 
-#: countryinfo.cpp:123
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr ""
-
-#: countryinfo.cpp:124
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr ""
-
-#: countryinfo.cpp:125
 msgctxt "CountryInfo"
 msgid "Kuwait"
 msgstr ""
 
-#: countryinfo.cpp:126
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: countryinfo.cpp:127
 msgctxt "CountryInfo"
 msgid "Laos"
 msgstr ""
 
-#: countryinfo.cpp:128
 msgctxt "CountryInfo"
 msgid "Latvia"
 msgstr ""
 
-#: countryinfo.cpp:129
 msgctxt "CountryInfo"
 msgid "Lebanon"
 msgstr ""
 
-#: countryinfo.cpp:130
 msgctxt "CountryInfo"
 msgid "Lesotho"
 msgstr ""
 
-#: countryinfo.cpp:131
 msgctxt "CountryInfo"
 msgid "Liberia"
 msgstr ""
 
-#: countryinfo.cpp:132
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr ""
-
-#: countryinfo.cpp:133
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
 msgstr ""
 
-#: countryinfo.cpp:134
 msgctxt "CountryInfo"
 msgid "Lithuania"
 msgstr ""
 
-#: countryinfo.cpp:135
 msgctxt "CountryInfo"
 msgid "Luxembourg"
 msgstr ""
 
-#: countryinfo.cpp:136
 msgctxt "CountryInfo"
 msgid "Macedonia"
 msgstr ""
 
-#: countryinfo.cpp:137
 msgctxt "CountryInfo"
 msgid "Madagascar"
 msgstr ""
 
-#: countryinfo.cpp:138
 msgctxt "CountryInfo"
 msgid "Malawi"
 msgstr ""
 
-#: countryinfo.cpp:139
 msgctxt "CountryInfo"
 msgid "Malaysia"
 msgstr ""
 
-#: countryinfo.cpp:140
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-#: countryinfo.cpp:141
 msgctxt "CountryInfo"
 msgid "Mali"
 msgstr ""
 
-#: countryinfo.cpp:142
 msgctxt "CountryInfo"
 msgid "Malta"
 msgstr ""
 
-#: countryinfo.cpp:143
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
 msgstr ""
 
-#: countryinfo.cpp:144
 msgctxt "CountryInfo"
 msgid "Mauritania"
 msgstr ""
 
-#: countryinfo.cpp:145
 msgctxt "CountryInfo"
 msgid "Mauritius"
 msgstr ""
 
-#: countryinfo.cpp:146
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-#: countryinfo.cpp:147
 msgctxt "CountryInfo"
 msgid "Micronesia"
 msgstr ""
 
-#: countryinfo.cpp:148
 msgctxt "CountryInfo"
 msgid "Moldova"
 msgstr ""
 
-#: countryinfo.cpp:149
 msgctxt "CountryInfo"
 msgid "Monaco"
 msgstr ""
 
-#: countryinfo.cpp:150
 msgctxt "CountryInfo"
 msgid "Mongolia"
 msgstr ""
 
-#: countryinfo.cpp:151
 msgctxt "CountryInfo"
 msgid "Montenegro"
 msgstr ""
 
-#: countryinfo.cpp:152
 msgctxt "CountryInfo"
 msgid "Morocco"
 msgstr ""
 
-#: countryinfo.cpp:153
 msgctxt "CountryInfo"
 msgid "Mozambique"
 msgstr ""
 
-#: countryinfo.cpp:154
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-#: countryinfo.cpp:155
 msgctxt "CountryInfo"
 msgid "Namibia"
 msgstr ""
 
-#: countryinfo.cpp:156
 msgctxt "CountryInfo"
 msgid "Nauru"
 msgstr ""
 
-#: countryinfo.cpp:157
 msgctxt "CountryInfo"
 msgid "Nepal"
 msgstr ""
 
-#: countryinfo.cpp:158
 msgctxt "CountryInfo"
 msgid "Netherlands"
 msgstr ""
 
-#: countryinfo.cpp:159
 msgctxt "CountryInfo"
 msgid "New Zealand"
 msgstr ""
 
-#: countryinfo.cpp:160
 msgctxt "CountryInfo"
 msgid "Nicaragua"
 msgstr ""
 
-#: countryinfo.cpp:161
 msgctxt "CountryInfo"
 msgid "Niger"
 msgstr ""
 
-#: countryinfo.cpp:162
 msgctxt "CountryInfo"
 msgid "Nigeria"
 msgstr ""
 
-#: countryinfo.cpp:163
 msgctxt "CountryInfo"
 msgid "Norway"
 msgstr ""
 
-#: countryinfo.cpp:164
 msgctxt "CountryInfo"
 msgid "Oman"
 msgstr ""
 
-#: countryinfo.cpp:165
 msgctxt "CountryInfo"
 msgid "Pakistan"
 msgstr ""
 
-#: countryinfo.cpp:166
 msgctxt "CountryInfo"
 msgid "Palau"
 msgstr ""
 
-#: countryinfo.cpp:167
 msgctxt "CountryInfo"
 msgid "Palestine"
 msgstr ""
 
-#: countryinfo.cpp:168
 msgctxt "CountryInfo"
 msgid "Panama"
 msgstr ""
 
-#: countryinfo.cpp:169
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
 msgstr ""
 
-#: countryinfo.cpp:170
 msgctxt "CountryInfo"
 msgid "Paraguay"
 msgstr ""
 
-#: countryinfo.cpp:171
 msgctxt "CountryInfo"
 msgid "Peru"
 msgstr ""
 
-#: countryinfo.cpp:172
 msgctxt "CountryInfo"
 msgid "Philippines"
 msgstr ""
 
-#: countryinfo.cpp:173
 msgctxt "CountryInfo"
 msgid "Poland"
 msgstr ""
 
-#: countryinfo.cpp:174
 msgctxt "CountryInfo"
 msgid "Portugal"
 msgstr ""
 
-#: countryinfo.cpp:175
 msgctxt "CountryInfo"
 msgid "Qatar"
 msgstr ""
 
-#: countryinfo.cpp:176
 msgctxt "CountryInfo"
 msgid "Romania"
 msgstr ""
 
-#: countryinfo.cpp:177
 msgctxt "CountryInfo"
 msgid "Russia"
 msgstr ""
 
-#: countryinfo.cpp:178
 msgctxt "CountryInfo"
 msgid "Rwanda"
 msgstr ""
 
-#: countryinfo.cpp:179
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
 msgstr ""
 
-#: countryinfo.cpp:180
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
 msgstr ""
 
-#: countryinfo.cpp:181
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
 msgstr ""
 
-#: countryinfo.cpp:182
 msgctxt "CountryInfo"
 msgid "Samoa"
 msgstr ""
 
-#: countryinfo.cpp:183
 msgctxt "CountryInfo"
 msgid "San Marino"
 msgstr ""
 
-#: countryinfo.cpp:184
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
 msgstr ""
 
-#: countryinfo.cpp:185
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
 msgstr ""
 
-#: countryinfo.cpp:186
 msgctxt "CountryInfo"
 msgid "Senegal"
 msgstr ""
 
-#: countryinfo.cpp:187
 msgctxt "CountryInfo"
 msgid "Serbia"
 msgstr ""
 
-#: countryinfo.cpp:188
 msgctxt "CountryInfo"
 msgid "Seychelles"
 msgstr ""
 
-#: countryinfo.cpp:189
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
 msgstr ""
 
-#: countryinfo.cpp:190
 msgctxt "CountryInfo"
 msgid "Singapore"
 msgstr ""
 
-#: countryinfo.cpp:191
 msgctxt "CountryInfo"
 msgid "Slovakia"
 msgstr ""
 
-#: countryinfo.cpp:192
 msgctxt "CountryInfo"
 msgid "Slovenia"
 msgstr ""
 
-#: countryinfo.cpp:193
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
 msgstr ""
 
-#: countryinfo.cpp:194
 msgctxt "CountryInfo"
 msgid "Somalia"
 msgstr ""
 
-#: countryinfo.cpp:195
 msgctxt "CountryInfo"
 msgid "South Africa"
 msgstr ""
 
-#: countryinfo.cpp:196
 msgctxt "CountryInfo"
 msgid "Spain"
 msgstr ""
 
-#: countryinfo.cpp:197
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
 msgstr ""
 
-#: countryinfo.cpp:198
 msgctxt "CountryInfo"
 msgid "Sudan"
 msgstr ""
 
-#: countryinfo.cpp:199
 msgctxt "CountryInfo"
 msgid "Suriname"
 msgstr ""
 
-#: countryinfo.cpp:200
 msgctxt "CountryInfo"
 msgid "Swaziland"
 msgstr ""
 
-#: countryinfo.cpp:201
 msgctxt "CountryInfo"
 msgid "Sweden"
 msgstr ""
 
-#: countryinfo.cpp:202
 msgctxt "CountryInfo"
 msgid "Switzerland"
 msgstr ""
 
-#: countryinfo.cpp:203
 msgctxt "CountryInfo"
 msgid "Syria"
 msgstr ""
 
-#: countryinfo.cpp:204
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-#: countryinfo.cpp:205
 msgctxt "CountryInfo"
 msgid "Tajikistan"
 msgstr ""
 
-#: countryinfo.cpp:206
 msgctxt "CountryInfo"
 msgid "Tanzania"
 msgstr ""
 
-#: countryinfo.cpp:207
 msgctxt "CountryInfo"
 msgid "Thailand"
 msgstr ""
 
-#: countryinfo.cpp:208
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
 msgstr ""
 
-#: countryinfo.cpp:209
 msgctxt "CountryInfo"
 msgid "Togo"
 msgstr ""
 
-#: countryinfo.cpp:210
 msgctxt "CountryInfo"
 msgid "Tonga"
 msgstr ""
 
-#: countryinfo.cpp:211
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
 msgstr ""
 
-#: countryinfo.cpp:212
 msgctxt "CountryInfo"
 msgid "Tunisia"
 msgstr ""
 
-#: countryinfo.cpp:213
 msgctxt "CountryInfo"
 msgid "Turkey"
 msgstr ""
 
-#: countryinfo.cpp:214
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
 msgstr ""
 
-#: countryinfo.cpp:215
 msgctxt "CountryInfo"
 msgid "Tuvalu"
 msgstr ""
 
-#: countryinfo.cpp:216
 msgctxt "CountryInfo"
 msgid "Uganda"
 msgstr ""
 
-#: countryinfo.cpp:217
 msgctxt "CountryInfo"
 msgid "Ukraine"
 msgstr ""
 
-#: countryinfo.cpp:218
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
 msgstr ""
 
-#: countryinfo.cpp:219
 msgctxt "CountryInfo"
 msgid "United Kingdom"
 msgstr ""
 
-#: countryinfo.cpp:220
 msgctxt "CountryInfo"
 msgid "United States"
 msgstr ""
 
-#: countryinfo.cpp:221
 msgctxt "CountryInfo"
 msgid "Uruguay"
 msgstr ""
 
-#: countryinfo.cpp:222
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
 msgstr ""
 
-#: countryinfo.cpp:223
 msgctxt "CountryInfo"
 msgid "Vanuatu"
 msgstr ""
 
-#: countryinfo.cpp:224
 msgctxt "CountryInfo"
 msgid "Vatican"
 msgstr ""
 
-#: countryinfo.cpp:225
 msgctxt "CountryInfo"
 msgid "Venezuela"
 msgstr ""
 
-#: countryinfo.cpp:226
 msgctxt "CountryInfo"
 msgid "Vietnam"
 msgstr ""
 
-#: countryinfo.cpp:227
 msgctxt "CountryInfo"
 msgid "Western Sahara"
 msgstr ""
 
-#: countryinfo.cpp:228
 msgctxt "CountryInfo"
 msgid "Yemen"
 msgstr ""
 
-#: countryinfo.cpp:229
 msgctxt "CountryInfo"
 msgid "Zambia"
 msgstr ""
 
-#: countryinfo.cpp:230
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
 msgstr ""
 
-#: generalpage.cpp:73
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
+msgctxt "CountryInfo"
+msgid "Zaire"
 msgstr ""
 
-#: generalpage.cpp:86
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
+msgctxt "CountryInfo"
+msgid "Albania"
 msgstr ""
 
-#: generalpage.cpp:96
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
+msgctxt "CountryInfo"
+msgid "Algeria"
 msgstr ""
 
-#: generalpage.cpp:109
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
+msgctxt "CountryInfo"
+msgid "Austria"
 msgstr ""
 
-#: generalpage.cpp:117
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
+msgctxt "CountryInfo"
+msgid "Bahrain"
 msgstr ""
 
-#: generalpage.ui:28
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
+msgctxt "CountryInfo"
+msgid "Benin"
 msgstr ""
 
-#: generalpage.ui:121
-msgctxt "GeneralPage"
-msgid "Browse"
+msgctxt "CountryInfo"
+msgid "Ethiopia"
 msgstr ""
 
-#: generalpage.ui:57
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
+msgctxt "CountryInfo"
+msgid "Fiji"
 msgstr ""
 
-#: generalpage.ui:51
-msgctxt "GeneralPage"
-msgid "Tor"
+msgctxt "CountryInfo"
+msgid "Finland"
 msgstr ""
 
-#: generalpage.ui:93
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
+msgctxt "CountryInfo"
+msgid "Greece"
 msgstr ""
 
-#: generalpage.ui:99
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
+msgctxt "CountryInfo"
+msgid "Guam"
 msgstr ""
 
-#: generalpage.ui:135
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
+msgctxt "CountryInfo"
+msgid "Hungary"
 msgstr ""
 
-#: generalpage.ui:154
-msgctxt "GeneralPage"
-msgid "Software Updates"
+msgctxt "CountryInfo"
+msgid "Iceland"
 msgstr ""
 
-#: generalpage.ui:160
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
+msgctxt "CountryInfo"
+msgid "India"
 msgstr ""
 
-#: generalpage.ui:193
-msgctxt "GeneralPage"
-msgid "Check Now"
+msgctxt "CountryInfo"
+msgid "Indonesia"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv:"
+msgctxt "CountryInfo"
+msgid "Iran"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "CountryInfo"
+msgid "Iraq"
 msgstr ""
 
-#: graphframe.cpp:247
-msgctxt "GraphFrame"
-msgid "Sent:"
+msgctxt "CountryInfo"
+msgid "Ireland"
 msgstr ""
 
-#: graphframe.cpp:259
-msgctxt "GraphFrame"
-msgid "%1 KB"
+msgctxt "CountryInfo"
+msgid "Korea, North"
 msgstr ""
 
-#: graphframe.cpp:262
-msgctxt "GraphFrame"
-msgid "%1 MB"
+msgctxt "CountryInfo"
+msgid "Korea, South"
 msgstr ""
 
-#: graphframe.cpp:265
-msgctxt "GraphFrame"
-msgid "%1 GB"
+msgctxt "CountryInfo"
+msgid "Libya"
 msgstr ""
 
-#: helpbrowser.cpp:134
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
+msgctxt "CountryInfo"
+msgid "Maldives"
 msgstr ""
 
-#: helpbrowser.cpp:146
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+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 ""
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr ""
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
 
-#: helpbrowser.cpp:395
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
 msgstr ""
 
-#: helpbrowser.cpp:397
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
 msgstr ""
 
-#: helpbrowser.cpp:399
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
 msgstr ""
 
-#: helpbrowser.cpp:444
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
 msgstr ""
 
-#: helpbrowser.ui:33
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
 msgstr ""
 
-#: helpbrowser.ui:484
 msgctxt "HelpBrowser"
 msgid "Back"
 msgstr ""
 
-#: helpbrowser.ui:487
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
 msgstr ""
 
-#: helpbrowser.ui:490
 msgctxt "HelpBrowser"
 msgid "Backspace"
 msgstr ""
 
-#: helpbrowser.ui:498
 msgctxt "HelpBrowser"
 msgid "Forward"
 msgstr ""
 
-#: helpbrowser.ui:501
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
 msgstr ""
 
-#: helpbrowser.ui:504
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
 msgstr ""
 
-#: helpbrowser.ui:512
 msgctxt "HelpBrowser"
 msgid "Home"
 msgstr ""
 
-#: helpbrowser.ui:515
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
 msgstr ""
 
-#: helpbrowser.ui:518
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
 msgstr ""
 
-#: helpbrowser.ui:535
 msgctxt "HelpBrowser"
 msgid "Find"
 msgstr ""
 
-#: helpbrowser.ui:538
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
 msgstr ""
 
-#: helpbrowser.ui:541
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
 msgstr ""
 
-#: helpbrowser.ui:549
 msgctxt "HelpBrowser"
 msgid "Close"
 msgstr ""
 
-#: helpbrowser.ui:552
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
 msgstr ""
 
-#: helpbrowser.ui:555
 msgctxt "HelpBrowser"
 msgid "Esc"
 msgstr ""
 
-#: helpbrowser.ui:152
 msgctxt "HelpBrowser"
 msgid "Find:"
 msgstr ""
 
-#: helpbrowser.ui:174
 msgctxt "HelpBrowser"
 msgid "Find Previous"
 msgstr ""
 
-#: helpbrowser.ui:187
 msgctxt "HelpBrowser"
 msgid "Find Next"
 msgstr ""
 
-#: helpbrowser.ui:221
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
 msgstr ""
 
-#: helpbrowser.ui:231
 msgctxt "HelpBrowser"
 msgid "Whole words only"
 msgstr ""
 
-#: helpbrowser.ui:305
 msgctxt "HelpBrowser"
 msgid "Help Topics"
 msgstr ""
 
-#: helpbrowser.ui:260
 msgctxt "HelpBrowser"
 msgid "Contents"
 msgstr ""
 
-#: helpbrowser.ui:350
 msgctxt "HelpBrowser"
 msgid "Search"
 msgstr ""
 
-#: helpbrowser.ui:362
 msgctxt "HelpBrowser"
 msgid "Searching for:"
 msgstr ""
 
-#: helpbrowser.ui:405
 msgctxt "HelpBrowser"
 msgid "Found Documents"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
 msgstr ""
 
-#: helptextbrowser.cpp:72
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
 msgstr ""
 
-#: helptextbrowser.cpp:76
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
@@ -1736,569 +1525,482 @@ msgid ""
 "anonymous."
 msgstr ""
 
-#: helptextbrowser.cpp:78
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
 msgstr ""
 
-#: helptextbrowser.cpp:88
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
 msgstr ""
 
-#: helptextbrowser.cpp:90
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
 msgstr ""
 
-#: licensedialog.ui:13
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
 msgctxt "LicenseDialog"
 msgid "License Information"
 msgstr ""
 
-#: licensedialog.ui:43
 msgctxt "LicenseDialog"
 msgid "License"
 msgstr ""
 
-#: licensedialog.ui:76
 msgctxt "LicenseDialog"
 msgid "Credits"
 msgstr ""
 
-#: logevent.cpp:57
 msgctxt "LogEvent"
 msgid "Debug"
 msgstr ""
 
-#: logevent.cpp:58
 msgctxt "LogEvent"
 msgid "Info"
 msgstr ""
 
-#: logevent.cpp:59
 msgctxt "LogEvent"
 msgid "Notice"
 msgstr ""
 
-#: logevent.cpp:60
 msgctxt "LogEvent"
 msgid "Warning"
 msgstr ""
 
-#: logevent.cpp:61
 msgctxt "LogEvent"
 msgid "Error"
 msgstr ""
 
-#: logevent.cpp:62
 msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
-#: mainwindow.ui:233
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
 
-#: mainwindow.ui:443
 msgctxt "MainWindow"
 msgid "Exit"
 msgstr ""
 
-#: mainwindow.ui:304
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
 msgstr ""
 
-#: mainwindow.ui:317
 msgctxt "MainWindow"
 msgid "Message Log"
 msgstr ""
 
-#: mainwindow.cpp:453
 msgctxt "MainWindow"
 msgid "Network Map"
 msgstr ""
 
-#: mainwindow.cpp:459
 msgctxt "MainWindow"
 msgid "Control Panel"
 msgstr ""
 
-#: mainwindow.ui:380
 msgctxt "MainWindow"
 msgid "Settings"
 msgstr ""
 
-#: mainwindow.ui:430
 msgctxt "MainWindow"
 msgid "About"
 msgstr ""
 
-#: mainwindow.ui:367
 msgctxt "MainWindow"
 msgid "Help"
 msgstr ""
 
-#: mainwindow.cpp:1687
 msgctxt "MainWindow"
 msgid "New Identity"
 msgstr ""
 
-#: mainwindow.cpp:542
 msgctxt "MainWindow"
 msgid "Ctrl+T"
 msgstr ""
 
-#: mainwindow.cpp:543
 msgctxt "MainWindow"
 msgid "Ctrl+B"
 msgstr ""
 
-#: mainwindow.cpp:544
 msgctxt "MainWindow"
 msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:545
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:546
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:547
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:548
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:568
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr ""
 
-#: mainwindow.cpp:573
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:581
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:736
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:737
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:749
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:750
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:771
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:772
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:788
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:792
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:795
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:798
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:801
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:804
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:807
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1343
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:814
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1508
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:821
 msgctxt "MainWindow"
 msgid "Unrecognized startup status"
 msgstr ""
 
-#: mainwindow.cpp:828
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:831
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:834
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:837
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:840
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:843
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:846
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:849
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:852
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:854
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:897
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:902
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:904
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:920
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:1070
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:1073
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:1107
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1117
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:1149
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:1176
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:1177
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:1208
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1266
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1286
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1289
 msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1291
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1298
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1300
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1352
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1354
 msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1433
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1435
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1437
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1560
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1556
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1556
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1690
 msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
 msgstr ""
 
-#: mainwindow.cpp:1705
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1754
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1755
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
 msgid "View log message history"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
 msgid "View help documentation"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
 msgid "View version and license information"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
 msgid "Show this window on startup"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
 msgid "Hide"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
 msgid "Hide this window"
 msgstr ""
 
-#: mainwindow.cpp:1421
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
 msgstr ""
 
-#: mainwindow.cpp:1424
 msgctxt "MainWindow"
 msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
@@ -2306,442 +2008,382 @@ msgid ""
 "other Tor processes running."
 msgstr ""
 
-#: mainwindow.cpp:895
 msgctxt "MainWindow"
 msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
-#: mainwindow.cpp:1154
 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?"
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
-#: mainwindow.cpp:1212
 msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "Potentially Unsafe Connection"
 msgstr ""
 
-#: mainwindow.cpp:1562
 msgctxt "MainWindow"
 msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.cpp:1564
 msgctxt "MainWindow"
 msgid ""
-"Would you like to check if a newer package is available for installation?"
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.cpp:1583
 msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.cpp:1588
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.cpp:1594
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.cpp:1606
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and "
-"unsafe connection to port %2. Anything sent over this connection could be "
-"monitored. Please check your application's configuration and use only "
-"encrypted protocols, such as SSL, if possible."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1609
 msgctxt "MainWindow"
 msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1817
 msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
-#: mainwindow.cpp:1843
 msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
-#: mainwindow.cpp:1845
 msgctxt "MainWindow"
 msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: mainwindow.cpp:1888
 msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "(probably Telnet)"
 msgstr ""
 
-#: mainwindow.cpp:1889
 msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "(probably an email client)"
 msgstr ""
 
-#: mainwindow.cpp:1890
 msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr ""
 
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-#: messagelog.ui:371
 msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
 msgstr ""
 
-#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
-#: messagelog.cpp:128
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.cpp:132
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear infrequently \n"
@@ -2750,21 +2392,18 @@ msgid ""
 "care about."
 msgstr ""
 
-#: messagelog.cpp:134
 msgctxt "MessageLog"
 msgid ""
 "Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
-#: messagelog.cpp:136
 msgctxt "MessageLog"
 msgid ""
 "Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
-#: messagelog.cpp:310
 msgctxt "MessageLog"
 msgid ""
 "Cannot write file %1\n"
@@ -2772,1292 +2411,1406 @@ msgid ""
 "%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: netviewer.cpp:507
 msgctxt "NetViewer"
 msgid "Relay Not Found"
 msgstr ""
 
-#: netviewer.cpp:508
 msgctxt "NetViewer"
 msgid "No details on the selected relay are available."
 msgstr ""
 
-#: netviewer.cpp:523
 msgctxt "NetViewer"
 msgid "Unknown"
 msgstr ""
 
-#: networkpage.cpp:193
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid "Invalid Bridge"
 msgstr ""
 
-#: networkpage.cpp:194
 msgctxt "NetworkPage"
 msgid "The specified bridge identifier is not valid."
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
 msgctxt "NetworkPage"
 msgid ""
-"The Tor software you are currently running does not support bridges. "
-"<br>Directory connections will still be encrypted."
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Address:"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Type:"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:101
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:105
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:110
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:112
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:118
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:49
 msgctxt "RouterDescriptorView"
 msgid "Copy"
 msgstr ""
 
-#: routerinfodialog.cpp:54
 msgctxt "RouterInfoDialog"
 msgid "Hibernating"
 msgstr ""
 
-#: routerinfodialog.cpp:57
 msgctxt "RouterInfoDialog"
 msgid "Online"
 msgstr ""
 
-#: routerinfodialog.cpp:59
 msgctxt "RouterInfoDialog"
 msgid "Offline"
 msgstr ""
 
-#: routerinfodialog.cpp:61
 msgctxt "RouterInfoDialog"
 msgid "Unknown"
 msgstr ""
 
-#: routerinfodialog.ui:13
 msgctxt "RouterInfoDialog"
 msgid "Relay Details"
 msgstr ""
 
-#: routerinfodialog.ui:29
 msgctxt "RouterInfoDialog"
 msgid "Summary"
 msgstr ""
 
-#: routerinfodialog.ui:47
 msgctxt "RouterInfoDialog"
 msgid "Name:"
 msgstr ""
 
-#: routerinfodialog.ui:82
 msgctxt "RouterInfoDialog"
 msgid "Status:"
 msgstr ""
 
-#: routerinfodialog.ui:117
 msgctxt "RouterInfoDialog"
 msgid "Location:"
 msgstr ""
 
-#: routerinfodialog.ui:152
 msgctxt "RouterInfoDialog"
 msgid "IP Address:"
 msgstr ""
 
-#: routerinfodialog.ui:187
 msgctxt "RouterInfoDialog"
 msgid "Platform:"
 msgstr ""
 
-#: routerinfodialog.ui:231
 msgctxt "RouterInfoDialog"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerinfodialog.ui:266
 msgctxt "RouterInfoDialog"
 msgid "Uptime:"
 msgstr ""
 
-#: routerinfodialog.ui:301
 msgctxt "RouterInfoDialog"
 msgid "Contact:"
 msgstr ""
 
-#: routerinfodialog.ui:352
 msgctxt "RouterInfoDialog"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerinfodialog.ui:376
 msgctxt "RouterInfoDialog"
 msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:148
 msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:150
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
 msgstr ""
 
-#: serverpage.cpp:204
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:269
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:19
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:26
 msgctxt "ServerPage"
 msgid "Relay traffic for the Tor network"
 msgstr ""
 
-#: serverpage.ui:74
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:93
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:96
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
-msgstr ""
-
-#: serverpage.ui:122
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:134
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:144
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:207
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:238
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:250
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:308
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:339
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:349
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:65
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:396
 msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:421
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:426
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:431
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:436
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:441
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:446
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:411
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
 msgstr ""
 
-#: serverpage.ui:457
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
 msgstr ""
 
-#: serverpage.ui:527
 msgctxt "ServerPage"
 msgid "Average Rate"
 msgstr ""
 
-#: serverpage.ui:548
 msgctxt "ServerPage"
 msgid "Long-term average bandwidth limit"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
 msgid "KB/s"
 msgstr ""
 
-#: serverpage.ui:586
 msgctxt "ServerPage"
 msgid "Maximum Rate"
 msgstr ""
 
-#: serverpage.ui:607
 msgctxt "ServerPage"
 msgid "Peak bandwidth rate limit"
 msgstr ""
 
-#: serverpage.ui:649
 msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
-#: serverpage.ui:369
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
 msgstr ""
 
-#: serverpage.ui:696
 msgctxt "ServerPage"
 msgid "Ports 6660 - 6669 and 6697"
 msgstr ""
 
-#: serverpage.ui:699
 msgctxt "ServerPage"
 msgid "Internet Relay Chat (IRC)"
 msgstr ""
 
-#: serverpage.ui:709
 msgctxt "ServerPage"
 msgid "Ports 110, 143, 993 and 995"
 msgstr ""
 
-#: serverpage.ui:712
 msgctxt "ServerPage"
 msgid "Retrieve Mail (POP, IMAP)"
 msgstr ""
 
-#: serverpage.ui:722
 msgctxt "ServerPage"
 msgid "Ports unspecified by other checkboxes"
 msgstr ""
 
-#: serverpage.ui:725
 msgctxt "ServerPage"
 msgid "Misc Other Services"
 msgstr ""
 
-#: serverpage.ui:735
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:738
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:748
 msgctxt "ServerPage"
 msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:751
 msgctxt "ServerPage"
 msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:761
 msgctxt "ServerPage"
 msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
 msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:784
 msgctxt "ServerPage"
 msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:856
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:866
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:676
 msgctxt "ServerPage"
 msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:902
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:920
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:942
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.cpp:555
 msgctxt "ServerPage"
 msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.cpp:556
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.cpp:559
 msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
 msgstr ""
 
-#: serverpage.cpp:594
 msgctxt "ServerPage"
 msgid "Bridge History"
 msgstr ""
 
-#: serverpage.cpp:596
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.cpp:599
 msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
 msgstr ""
 
-#: serverpage.cpp:600
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:33
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:185
 msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:958
 msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:112
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:119
 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 ""
 
-#: servicepage.cpp:596
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:451
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:457
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:546
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:577
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:383
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr ""
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:144
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:162
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:108
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: updateprocess.cpp:195
 msgctxt "UpdateProcess"
 msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"handy pocket creature died. Sorry."
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
-#: updateprocess.cpp:211
 msgctxt "UpdateProcess"
 msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
-#: updateprogressdialog.cpp:30
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
 msgstr ""
 
-#: updateprogressdialog.ui:87
 msgctxt "UpdateProgressDialog"
 msgid "Hide"
 msgstr ""
 
-#: updateprogressdialog.cpp:41
 msgctxt "UpdateProgressDialog"
 msgid "Downloading updates..."
 msgstr ""
 
-#: updateprogressdialog.cpp:45
 msgctxt "UpdateProgressDialog"
 msgid "Installing updated software..."
 msgstr ""
 
-#: updateprogressdialog.cpp:54
 msgctxt "UpdateProgressDialog"
 msgid "Done! Your software is now up to date."
 msgstr ""
 
-#: updateprogressdialog.cpp:60
 msgctxt "UpdateProgressDialog"
 msgid "OK"
 msgstr ""
 
-#: updateprogressdialog.ui:13
 msgctxt "UpdateProgressDialog"
 msgid "Software Updates"
 msgstr ""
 
-#: updateprogressdialog.ui:36
 msgctxt "UpdateProgressDialog"
 msgid "Checking for updates..."
 msgstr ""
 
-#: updateprogressdialog.ui:80
 msgctxt "UpdateProgressDialog"
 msgid "Cancel"
 msgstr ""
 
-#: updatesavailabledialog.ui:13
 msgctxt "UpdatesAvailableDialog"
 msgid "Software Updates Available"
 msgstr ""
 
-#: updatesavailabledialog.ui:38
 msgctxt "UpdatesAvailableDialog"
 msgid "Remind Me Later"
 msgstr ""
 
-#: updatesavailabledialog.ui:45
 msgctxt "UpdatesAvailableDialog"
 msgid "Install"
 msgstr ""
 
-#: updatesavailabledialog.ui:57
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
 msgstr ""
 
-#: updatesavailabledialog.ui:78
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
 msgstr ""
 
-#: updatesavailabledialog.ui:83
 msgctxt "UpdatesAvailableDialog"
 msgid "Version"
 msgstr ""
 
-#: vmessagebox.cpp:77
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr ""
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:80
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:94
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: vidalia.cpp:191
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:193
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:195
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:197
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:199
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:202
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:205
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:208
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:212
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:260
 msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:267
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:273
 msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:279
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
 msgstr ""
 
-#: main.cpp:100
 msgctxt "Vidalia"
 msgid ""
-"Another Vidalia process is possibly already running. If there really is not "
-"another Vidalia process running, you can choose to continue anyway.\n"
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
 
-#: stringutil.cpp:323
 msgctxt "stringutil.h"
-msgid "%1 days"
+msgid "%1 secs"
 msgstr ""
 
-#: stringutil.cpp:325
 msgctxt "stringutil.h"
-msgid "%1 hours"
+msgid "%1 B/s"
 msgstr ""
 
-#: stringutil.cpp:327
 msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "%1 KB/s"
 msgstr ""
 
-#: stringutil.cpp:329
 msgctxt "stringutil.h"
-msgid "%1 secs"
+msgid "%1 MB/s"
 msgstr ""
 
-#: stringutil.cpp:348
 msgctxt "stringutil.h"
-msgid "%1 B/s"
+msgid "%1 GB/s"
 msgstr ""
 
-#: stringutil.cpp:350
 msgctxt "stringutil.h"
-msgid "%1 KB/s"
+msgid "%1 days"
 msgstr ""
 
-#: stringutil.cpp:352
 msgctxt "stringutil.h"
-msgid "%1 MB/s"
+msgid "%1 hours"
 msgstr ""
 
-#: stringutil.cpp:354
 msgctxt "stringutil.h"
-msgid "%1 GB/s"
+msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/so/qt_so.po b/src/vidalia/i18n/po/so/qt_so.po
index 0797d11..2544f49 100644
--- a/src/vidalia/i18n/po/so/qt_so.po
+++ b/src/vidalia/i18n/po/so/qt_so.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/so/vidalia_so.po b/src/vidalia/i18n/po/so/vidalia_so.po
index 22b0f4e..9c0e0be 100644
--- a/src/vidalia/i18n/po/so/vidalia_so.po
+++ b/src/vidalia/i18n/po/so/vidalia_so.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/son/qt_son.po b/src/vidalia/i18n/po/son/qt_son.po
index ca0cf6d..894527b 100644
--- a/src/vidalia/i18n/po/son/qt_son.po
+++ b/src/vidalia/i18n/po/son/qt_son.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/son/vidalia_son.po b/src/vidalia/i18n/po/son/vidalia_son.po
index c5fde3f..0298fe2 100644
--- a/src/vidalia/i18n/po/son/vidalia_son.po
+++ b/src/vidalia/i18n/po/son/vidalia_son.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/sq/qt_sq.po b/src/vidalia/i18n/po/sq/qt_sq.po
index 42e8a0f..a816e4f 100644
--- a/src/vidalia/i18n/po/sq/qt_sq.po
+++ b/src/vidalia/i18n/po/sq/qt_sq.po
@@ -1,10 +1,12 @@
-# 
+# Translators:
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
diff --git a/src/vidalia/i18n/po/sq/vidalia_sq.po b/src/vidalia/i18n/po/sq/vidalia_sq.po
index 8e0dfa5..f23f9a6 100644
--- a/src/vidalia/i18n/po/sq/vidalia_sq.po
+++ b/src/vidalia/i18n/po/sq/vidalia_sq.po
@@ -1,15 +1,19 @@
+# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +36,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr "4.4.2"
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr "'%1' nuk është adres IP e vlefshme."
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr "Ju zgjodhët autentikim me password, por nuk zgjodhët asnjë password."
 
 msgctxt "AdvancedPage"
@@ -93,10 +82,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr "Vidalia nuk mundi të instalojë shërbimin Tor."
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr "Porta e kontrollit"
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr "Autentikimi:"
 
@@ -153,7 +138,75 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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 ""
@@ -178,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr ""
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Që Nga:"
@@ -395,7 +465,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1183,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1282,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr "File exe (*.exe)"
@@ -1223,10 +1348,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1544,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1559,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1604,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr "E Panjohur"
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1623,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
@@ -1691,7 +1837,9 @@ msgid "Error Starting Tor"
 msgstr "Gabim gjatë nisjes së Tor"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr "Vidalia nuk mundi të nisi Torin. Kontrolloni zgjedhjet për tu siguruar që keni vënë emrin dhe vendndodhjen e duhur të binarit të Torit."
 
 msgctxt "MainWindow"
@@ -1727,7 +1875,9 @@ msgid "Cookie Authentication Required"
 msgstr "Autentikim me Cookie i Nevojshëm"
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1897,9 @@ msgid "Error Registering for Events"
 msgstr "Gabim gjat regjistrimit për Events"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1919,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1929,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr "Gjithë lidhjet e reja do duken të ndryshme nga ato të vjetrat."
 
 msgctxt "MainWindow"
@@ -1804,7 +1960,7 @@ msgstr "Kombinimet e tastjerës së Vidalias"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "Konfiguro Urat"
+msgstr "Konfiguro Urat\n"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
@@ -1867,15 +2023,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2045,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2059,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2077,67 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Bootstrapping torrc from %1 to %2"
 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?"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr "Vidalia"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
-msgstr "Informacione mbi Vidalian"
+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 "Home"
-msgstr "Shpi"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2381,6 @@ msgid "messages"
 msgstr "mesazhet"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Shpëtoji Gjithmonë Mesazhet e Reja"
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr "Lundro"
 
@@ -2220,34 +2393,56 @@ msgid "Automatically save new log messages to a file"
 msgstr "Shpëtoji automatikisht gjithë mesazhet në fajl"
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Shpëtoji Gjithmonë Mesazhet e Reja"
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2357,23 +2552,19 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Urë e gabuar"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Emri i urës që u dha nuk është i vlefshëm."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopjo (Ctrl+C)"
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr "Ju duhet të përcaktoni si adresën IP ose emrin e serverit edhe numrin e portës për të konfiguruar Torin të përdori një proxy për tu lidhur në Internet."
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr "Ju duhet të përcaktoni një ose më tepër porta tek të cilat fairuolli juaj lejon lidhjen."
 
 msgctxt "NetworkPage"
@@ -2393,18 +2584,10 @@ msgid "Proxy Settings"
 msgstr "Konfigurimi i Proxy"
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr "Proxy HTTP:"
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr "Përdoruesi:"
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr "Përdor ktë proxy edhe për HTTPS"
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr "Password:"
 
@@ -2433,7 +2616,9 @@ msgid "80, 443"
 msgstr "80, 443"
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2630,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr "Shto një Urë:"
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr "Fshiji urat e zgjedhura nga lista"
 
@@ -2477,13 +2654,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "Prano"
@@ -2637,11 +2844,15 @@ msgid "Bridge Support Unavailable"
 msgstr "Pa funksionalitetin e Urave"
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr "Ju keni konfiguruar Torin të funksionojë edhe si urë për përdoruesit e çensuruar por versioni juaj i Torit nuk e përman funksionalitetin e urave."
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr "Ju lutem instaloni një version më të ri të Tor ose  konfiguroni Torin të funksionojë si një Tor relay normal."
 
 msgctxt "ServerPage"
@@ -2657,10 +2868,6 @@ msgid "Run as a client only"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Kanalizo flukset për rrjetin Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Porta për Relay:"
 
@@ -2709,7 +2916,9 @@ msgid "Basic Settings"
 msgstr "Konfigurimet kryesore"
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr "Për lidhjet e internetit me shpejtësi të lartë në hyrje por të ulët në dalje ju lutemi vini shpejtësinë në dalje këtu."
 
 msgctxt "ServerPage"
@@ -2765,7 +2974,9 @@ msgid "Peak bandwidth rate limit"
 msgstr "Limiti maksimal i nivelit të bandës"
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr "Banda juaj maksimale duhet të jetë më e madhe ose e barabartë me bandën tuaj mesatare. Të dyja vlerat duhet të jenë të paktën 20 KB/s."
 
 msgctxt "ServerPage"
@@ -2825,11 +3036,14 @@ msgid "Show help topic on exit policies"
 msgstr "Shfaq titujt e dokumentacionit që kanë të bëjnë me politikat e daljes"
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3055,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr "Lejoini të tjerët të lidhen me urën tuaj duke u dhënë tyre ktë rrjesht:"
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr "Ky është identiteti i urës suaj që mund ti jepni personave të tjerë"
 
 msgctxt "ServerPage"
@@ -2857,7 +3072,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3086,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr "Vidalia nuk mundi të shpëtojë zgjedhjet tuaja %1."
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3104,28 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3134,9 @@ 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."
+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"
@@ -2973,6 +3211,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr "E re"
@@ -3025,6 +3508,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3627,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3791,10 @@ msgid "Unable to open log file '%1': %2"
 msgstr "E pamundur të hap fajlin e logut '%1': %2"
 
 msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr ""
+
+msgctxt "Vidalia"
 msgid "Invalid language code specified:"
 msgstr ""
 
@@ -3254,7 +3807,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,4 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
diff --git a/src/vidalia/i18n/po/sr/qt_sr.po b/src/vidalia/i18n/po/sr/qt_sr.po
index 717e9f1..3bcb96d 100644
--- a/src/vidalia/i18n/po/sr/qt_sr.po
+++ b/src/vidalia/i18n/po/sr/qt_sr.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
@@ -201,9 +201,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 веÑ? поÑ?Ñ?оÑ?и.\n"
-"Ð?а ли желиÑ?е да га замениÑ?е?"
+msgstr "%1 веÑ? поÑ?Ñ?оÑ?и.\nÐ?а ли желиÑ?е да га замениÑ?е?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +209,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Ð?аÑ?оÑ?ека ниÑ?е пÑ?онаÑ?ена.\n"
-"Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е даÑ? иÑ?пÑ?аван назив даÑ?оÑ?еке."
+msgstr "%1\nÐ?аÑ?оÑ?ека ниÑ?е пÑ?онаÑ?ена.\nÐ?Ñ?овеÑ?иÑ?е да ли Ñ?е даÑ? иÑ?пÑ?аван назив даÑ?оÑ?еке."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +267,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м ниÑ?е пÑ?онаÑ?ен.\n"
-"Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е даÑ? иÑ?пÑ?аван назив диÑ?екÑ?оÑ?иÑ?Ñ?ма."
+msgstr "%1\nÐ?иÑ?екÑ?оÑ?иÑ?Ñ?м ниÑ?е пÑ?онаÑ?ен.\nÐ?Ñ?овеÑ?иÑ?е да ли Ñ?е даÑ? иÑ?пÑ?аван назив диÑ?екÑ?оÑ?иÑ?Ñ?ма."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"â??%1â?? Ñ?е заÑ?Ñ?иÑ?ен од пиÑ?аÑ?а.\n"
-"Ð?а ли желиÑ?е да га избÑ?иÑ?еÑ?е?"
+msgstr "â??%1â?? Ñ?е заÑ?Ñ?иÑ?ен од пиÑ?аÑ?а.\nÐ?а ли желиÑ?е да га избÑ?иÑ?еÑ?е?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -381,9 +371,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>â??%1â?? назив Ñ?е не може коÑ?иÑ?Ñ?иÑ?и.</b><p>Ð?Ñ?обаÑ?Ñ?е дÑ?Ñ?го име Ñ? маÑ?е знакова "
-"или без инÑ?еÑ?пÑ?нкÑ?иÑ?Ñ?киÑ? знакова."
+msgstr "<b>â??%1â?? назив Ñ?е не може коÑ?иÑ?Ñ?иÑ?и.</b><p>Ð?Ñ?обаÑ?Ñ?е дÑ?Ñ?го име Ñ? маÑ?е знакова или без инÑ?еÑ?пÑ?нкÑ?иÑ?Ñ?киÑ? знакова."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +432,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 баÑ?Ñ?ова"
-
-
diff --git a/src/vidalia/i18n/po/sr/vidalia_sr.po b/src/vidalia/i18n/po/sr/vidalia_sr.po
index 8b28d4d..189b983 100644
--- a/src/vidalia/i18n/po/sr/vidalia_sr.po
+++ b/src/vidalia/i18n/po/sr/vidalia_sr.po
@@ -1,15 +1,25 @@
+# 
+# Translators:
+#   <branislavhorvat@xxxxxxxxx>, 2012.
+#   <mahavidyas@xxxxxxxxx>, 2012.
+#   <portalscg@xxxxxxxxx>, 2012.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <sdpuls@xxxxxxxxx>, 2011.
+# Vanja  <medjutim@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: 2010-06-20 16:50-0600\n"
-"Last-Translator: George Bush <theranchcowboy@xxxxxxxxxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: portalscg <portalscg@xxxxxxxxx>\n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
 msgid "About Vidalia"
@@ -31,3261 +41,3811 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr "Qt 4.4.2"
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr "Qt"
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr "издаÑ?е"
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr "â??%1â?? ниÑ?е иÑ?пÑ?авна IP адÑ?еÑ?а."
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
+msgstr "Ð?забÑ?али Ñ?Ñ?е пÑ?овеÑ?Ñ? 'Ð?озинком', али ниÑ?Ñ?е изабÑ?али лозинкÑ?."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
-msgstr ""
+msgstr "Ð?забеÑ?иÑ?е ТоÑ? Ð?онÑ?игÑ?Ñ?аÑ?ионÑ? даÑ?оÑ?екÑ?"
 
 msgctxt "AdvancedPage"
 msgid "File Not Found"
-msgstr ""
+msgstr "Ð?аÑ?оÑ?ека ниÑ?е пÑ?онаÑ?ена"
 
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
-msgstr ""
+msgstr "%1 не поÑ?Ñ?оÑ?и. Ð?а ли желиÑ?е да кÑ?еиÑ?аÑ?е."
 
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
-msgstr ""
+msgstr "Ð?иÑ?е Ñ?Ñ?пео да кÑ?еиÑ?а даÑ?оÑ?екÑ?"
 
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
-msgstr ""
+msgstr "Ð?иÑ?е могÑ?Ñ?е кÑ?еиÑ?аÑ?и %1 [%2]"
 
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
-msgstr ""
+msgstr "Ð?забеÑ?и диÑ?екÑ?оÑ?иÑ?Ñ?м коÑ?и Ñ?еÑ?е коÑ?иÑ?Ñ?иÑ?и за ТоÑ? подаÑ?ке"
 
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
-msgstr ""
+msgstr "Ð?емогÑ?Ñ?е Ñ?е Ñ?клониÑ?и ТоÑ? Ñ?еÑ?виÑ?"
 
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
-msgstr ""
+msgstr "Ð?иÑ?е могÑ?Ñ?е инÑ?Ñ?алиÑ?аÑ?и Tor Ñ?еÑ?виÑ? "
 
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
+msgstr "Ð?Ñ?огÑ?ам Vidalia ниÑ?е био Ñ? могÑ?Ñ?ноÑ?Ñ?и да инÑ?Ñ?алиÑ?а ТоÑ? Ñ?еÑ?виÑ?. "
 
 msgctxt "AdvancedPage"
 msgid "Authentication:"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?а:"
 
 msgctxt "AdvancedPage"
 msgid "Address:"
-msgstr ""
+msgstr "Ð?дÑ?еÑ?а:"
 
 msgctxt "AdvancedPage"
 msgid "None"
-msgstr ""
+msgstr "Ð?иÑ?едан"
 
 msgctxt "AdvancedPage"
 msgid "Cookie"
-msgstr ""
+msgstr "Ð?олаÑ?иÑ?"
 
 msgctxt "AdvancedPage"
 msgid "Password"
-msgstr ""
+msgstr "Ð?озинка"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?миÑ?но Ð?енеÑ?иÑ?и"
 
 msgctxt "AdvancedPage"
 msgid ":"
-msgstr ""
+msgstr ": "
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
-msgstr ""
+msgstr "ТоÑ? конÑ?игÑ?Ñ?аÑ?иона даÑ?оÑ?ека"
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
+msgstr "Ð?окÑ?ени ТоÑ? Ñ?а наведеним конÑ?игÑ?Ñ?аÑ?ионим Ñ?аÑ?лом (torrc)"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
-msgstr ""
+msgstr "Ð?забеÑ?и пÑ?Ñ?аÑ?Ñ? конÑ?игÑ?Ñ?аÑ?ионог Ñ?аÑ?ла"
 
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?Ñ?ажиÑ?и"
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr ""
+msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м Ñ?а подаÑ?има"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr ""
+msgstr "УÑ?кладиÑ?Ñ?и подаÑ?ке за Tor пÑ?огÑ?ам Ñ? Ñ?ледеÑ?ем диÑ?екÑ?оÑ?иÑ?Ñ?мÑ?"
 
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
+msgstr "Ð?забеÑ?иÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м коÑ?и Ñ?е коÑ?иÑ?Ñ?и за Ñ?кладиÑ?Ñ?еÑ?е подаÑ?ака за ТоÑ?"
+
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr "Tor Kontrola"
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr "Koristi TCP vezu(Kontrolni Port)"
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr "Staza:"
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr "Koristi Unix domain utiÄ?nicu (KontrolnaUtiÄ?nica)"
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr "Edituj trenutni torrc"
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr "NAPOMENA:ovo Ä?e uneti izmene u trenutno pokrenuti torrc"
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr "Staza kontrolne utiÄ?nice ne postoji"
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr "Zadata lokacija Tor  konfiguracionog fajla sadrži karaktere koji nemogu biti predstavljeni u vašem 8-bitnom enkoding sistemu."
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr "Zadata lokacija Tor  direktorijuma podaaka sadrži karaktere koji nemogu biti predstavljeni u vašem 8-bitnom enkoding sistemu."
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr "Upozorenje"
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr "Promenili ste stazu torrca, dali bi ste želeli da restartujete Tor?"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr "Tor Konfiguracioni Fajl (torrc);;Svi Fajlovi (*)"
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr "Izaberi fajl koji Ä?ete koristiti kao Tor stazu za utiÄ?nicu"
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
-msgstr ""
+msgstr "Vidalia ниÑ?е био Ñ? могÑ?Ñ?ноÑ?Ñ?и да Ñ?клони Tor Ñ?еÑ?виÑ?. Ð?ожда Ñ?еÑ?е моÑ?аÑ?и да га Ñ?клониÑ?е Ñ?Ñ?Ñ?но."
 
 msgctxt "AppearancePage"
 msgid "Language"
-msgstr ""
+msgstr "Ð?език"
 
 msgctxt "AppearancePage"
 msgid "Choose the language used in Vidalia"
-msgstr ""
+msgstr "Ð?забеÑ?иÑ?е Ñ?език коÑ?и Ñ?е коÑ?иÑ?Ñ?и Ñ? пÑ?огÑ?амÑ? Vidalia"
 
 msgctxt "AppearancePage"
 msgid "Style"
-msgstr ""
+msgstr "СÑ?ил"
 
 msgctxt "AppearancePage"
 msgid "Choose Vidalia's interface style"
-msgstr ""
+msgstr "Ð?забеÑ?и Ð?идалиа окÑ?Ñ?жеÑ?е инÑ?еÑ?Ñ?еÑ?Ñ?а"
 
 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 ""
+msgstr "Ð?д:"
 
 msgctxt "BandwidthGraph"
 msgid "Hide Settings"
-msgstr ""
+msgstr "СакÑ?иÑ? Ð?одеÑ?аваÑ?а"
 
 msgctxt "BandwidthGraph"
 msgid "Show Settings"
-msgstr ""
+msgstr "Ð?Ñ?икажи Ð?одеÑ?аваÑ?а"
 
 msgctxt "BandwidthGraph"
 msgid "Tor Bandwidth Usage"
-msgstr ""
+msgstr "ТоÑ? пÑ?опÑ?Ñ?ни опÑ?ег"
 
 msgctxt "BandwidthGraph"
 msgid "Reset"
-msgstr ""
+msgstr "РеÑ?еÑ?оваÑ?е"
 
 msgctxt "BandwidthGraph"
 msgid "Receive Rate"
-msgstr ""
+msgstr "Ð?Ñ?ими Ð?Ñ?енÑ?"
 
 msgctxt "BandwidthGraph"
 msgid "Send Rate"
-msgstr ""
+msgstr "Ð?оÑ?аÑ?и Ð?Ñ?енÑ?"
 
 msgctxt "BandwidthGraph"
 msgid "Always on Top"
-msgstr ""
+msgstr "Увек на вÑ?Ñ?Ñ?"
 
 msgctxt "BandwidthGraph"
 msgid "Style"
-msgstr ""
+msgstr "СÑ?ил"
 
 msgctxt "BandwidthGraph"
 msgid "Changes the transparency of the Bandwidth Graph"
-msgstr ""
+msgstr "Ð?Ñ?омене Ñ?Ñ?анÑ?паÑ?енÑ?ноÑ?Ñ? гÑ?аÑ?ике пÑ?оÑ?ока"
 
 msgctxt "BandwidthGraph"
 msgid "100"
-msgstr ""
+msgstr "100"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
-msgstr ""
+msgstr "% Ð?епÑ?озиÑ?ан"
 
 msgctxt "BandwidthGraph"
 msgid "Save"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ?"
 
 msgctxt "BandwidthGraph"
 msgid "Cancel"
-msgstr ""
+msgstr "Ð?Ñ?казаÑ?и"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr ""
+msgstr "Ð?окÑ?еÑ?аÑ?е HTTPS заÑ?Ñ?ева за моÑ?Ñ? ..."
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "Ð?овезиваÑ?е на %1:%2..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr ""
+msgstr "СлаÑ?е заÑ?Ñ?ева за HTTPS моÑ?Ñ?ове ..."
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зимаÑ?е Ñ?пиÑ?ка моÑ?Ñ?ова ..."
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Downloading Bridges"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зимаÑ?е Ð?оÑ?Ñ?ова"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Unable to download bridges: %1"
-msgstr ""
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еÑ?зеÑ?и моÑ?Ñ?ове:%1"
 
 msgctxt "BridgeDownloaderProgressDialog"
 msgid "Retrying bridge request..."
-msgstr ""
+msgstr "Ð?оновни покÑ?Ñ?аÑ? заÑ?Ñ?ева за моÑ?Ñ? ..."
 
 msgctxt "BridgeUsageDialog"
 msgid "Country"
-msgstr ""
+msgstr "Ð?емÑ?а"
 
 msgctxt "BridgeUsageDialog"
 msgid "# Clients"
-msgstr ""
+msgstr "# Ð?лиÑ?енÑ?и"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
+msgstr "Ð?лиÑ?енÑ?и из Ñ?ледеÑ?иÑ? земаÑ?а Ñ?Ñ? коÑ?иÑ?Ñ?или Ñ?елеÑ? од%1"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
-msgstr ""
+msgstr "Ð?Ñ?еглед Ñ?поÑ?Ñ?ебе Ð?оÑ?Ñ?а"
 
 msgctxt "BridgeUsageDialog"
 msgid "Client Summary"
-msgstr ""
+msgstr "Ð?Ñ?еглед Ð?лиÑ?енаÑ?а"
 
 msgctxt "Circuit"
 msgid "New"
-msgstr ""
+msgstr "Ð?ови"
 
 msgctxt "Circuit"
 msgid "Open"
-msgstr ""
+msgstr "Ð?Ñ?воÑ?ено"
 
 msgctxt "Circuit"
 msgid "Building"
-msgstr ""
+msgstr "Ð?згÑ?ади"
 
 msgctxt "Circuit"
 msgid "Failed"
-msgstr ""
+msgstr "Ð?иÑ?е Ñ?Ñ?пело"
 
 msgctxt "Circuit"
 msgid "Closed"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?ен"
 
 msgctxt "Circuit"
 msgid "Unknown"
-msgstr ""
+msgstr "Ð?епознаÑ?"
 
 msgctxt "CircuitItem"
 msgid "<Path Empty>"
-msgstr ""
+msgstr "<Path Empty>"
 
 msgctxt "CircuitListWidget"
 msgid "Connection"
-msgstr ""
+msgstr "Ð?еза"
 
 msgctxt "CircuitListWidget"
 msgid "Status"
-msgstr ""
+msgstr "СÑ?аÑ?Ñ?Ñ?"
 
 msgctxt "CircuitListWidget"
 msgid "Zoom to Circuit"
-msgstr ""
+msgstr "Ð?Ñ?миÑ?аÑ?е Ñ? кÑ?Ñ?гÑ?"
 
 msgctxt "CircuitListWidget"
 msgid "Close Circuit (Del)"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и кÑ?Ñ?г (Ð?Ð?Ð?)"
 
 msgctxt "CircuitListWidget"
 msgid "Close Stream (Del)"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и Ñ?ок (Ð?Ð?Ð?)"
 
 msgctxt "ConfigDialog"
 msgid "General"
-msgstr ""
+msgstr "Ð?пÑ?Ñ?е"
 
 msgctxt "ConfigDialog"
 msgid "Network"
-msgstr ""
+msgstr "Ð?Ñ?ежа"
 
 msgctxt "ConfigDialog"
 msgid "Sharing"
-msgstr ""
+msgstr "Ð?еÑ?еÑ?е"
 
 msgctxt "ConfigDialog"
 msgid "Services"
-msgstr ""
+msgstr "УÑ?лÑ?ге"
 
 msgctxt "ConfigDialog"
 msgid "Appearance"
-msgstr ""
+msgstr "Ð?зглед"
 
 msgctxt "ConfigDialog"
 msgid "Advanced"
-msgstr ""
+msgstr "Ð?апÑ?едан"
 
 msgctxt "ConfigDialog"
 msgid "Help"
-msgstr ""
+msgstr "Ð?омоÑ?"
 
 msgctxt "ConfigDialog"
 msgid "Error Saving Settings"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка Ñ?Ñ?ваÑ?а подеÑ?аваÑ?а"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to save your %1 settings."
-msgstr ""
+msgstr "Ð?идалиа ниÑ?е био Ñ? могÑ?Ñ?ноÑ?Ñ?и да Ñ?аÑ?Ñ?ва%1 поÑ?Ñ?авке."
 
 msgctxt "ConfigDialog"
 msgid "Error Applying Settings"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка Ð?Ñ?имене подеÑ?аваÑ?а"
 
 msgctxt "ConfigDialog"
 msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr ""
+msgstr "Ð?идалиа ниÑ?е био Ñ? могÑ?Ñ?ноÑ?Ñ?и да пÑ?имени%1 подеÑ?аваÑ?е на ТоÑ?."
 
 msgctxt "ConfigDialog"
 msgid "Settings"
-msgstr ""
+msgstr "Ð?одеÑ?аваÑ?а"
 
 msgctxt "ControlConnection"
 msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr ""
+msgstr "Vidalia ниÑ?е могао да Ñ?е повеже Ñ?а Tor. (%1)"
 
 msgctxt "ControlConnection"
 msgid "Control socket is not connected."
-msgstr ""
+msgstr "Ð?онÑ?Ñ?олна Ñ?Ñ?иÑ?ниÑ?а ниÑ?е повезана."
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Password Required"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ебна Ñ?е лозинка"
 
 msgctxt "ControlPasswordInputDialog"
 msgid "Remember my password"
-msgstr ""
+msgstr "Ð?апамÑ?и моÑ?Ñ? лозинкÑ?"
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
-msgstr ""
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
+msgstr "Vidalia Ñ?е повезан за покÑ?еÑ?аÑ?е Tor пÑ?оÑ?еÑ?а коÑ?и заÑ?Ñ?ева лозинкÑ?. Ð?олимо Ð?аÑ? да Ñ?неÑ?еÑ?е лозинкÑ?:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
-msgstr ""
+msgstr "Ð?онÑ?Ñ?олна Ñ?Ñ?иÑ?ниÑ?а ниÑ?е повезан."
 
 msgctxt "ControlSocket"
 msgid "Error sending control command. [%1]"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?лаÑ?Ñ? конÑ?Ñ?олне команде. [%1]"
 
 msgctxt "ControlSocket"
 msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
+msgstr "УÑ?иÑ?ниÑ?а пÑ?екинÑ?Ñ?а док Ñ?е покÑ?Ñ?авала да пÑ?оÑ?иÑ?а линиÑ?Ñ? подаÑ?ака."
 
 msgctxt "ControlSocket"
 msgid "Invalid control reply. [%1]"
-msgstr ""
+msgstr "Ð?еважеÑ?и конÑ?Ñ?олни одговоÑ?. [%1]"
 
 msgctxt "CountryInfo"
 msgid "Afghanistan"
-msgstr ""
+msgstr "Ð?вганиÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Andorra"
-msgstr ""
+msgstr "Ð?ндоÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Angola"
-msgstr ""
+msgstr "Ð?нгола"
 
 msgctxt "CountryInfo"
 msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "Ð?нÑ?игва и Ð?аÑ?бÑ?да"
 
 msgctxt "CountryInfo"
 msgid "Argentina"
-msgstr ""
+msgstr "Ð?Ñ?генÑ?ина"
 
 msgctxt "CountryInfo"
 msgid "Armenia"
-msgstr ""
+msgstr "Ð?еÑ?мениÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?алиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Ð?зеÑ?беÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr ""
+msgstr "Ð?аÑ?ами"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr ""
+msgstr "Ð?англадеÑ?"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
-msgstr ""
+msgstr "Ð?аÑ?бадоÑ?"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr ""
+msgstr "Ð?елоÑ?Ñ?Ñ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr ""
+msgstr "Ð?елгиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Belize"
-msgstr ""
+msgstr "Ð?елиз"
 
 msgctxt "CountryInfo"
 msgid "Bhutan"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr ""
+msgstr "Ð?оливиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Ð?оÑ?на и ХеÑ?Ñ?еговина"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr ""
+msgstr "Ð?оÑ?вана"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr ""
+msgstr "Ð?Ñ?азил"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?неÑ?и"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr ""
+msgstr "Ð?Ñ?гаÑ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?кина ФаÑ?о"
 
 msgctxt "CountryInfo"
 msgid "Burundi"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?Ñ?нди"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr ""
+msgstr "Ð?амбоÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr ""
+msgstr "Ð?амеÑ?Ñ?н"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr ""
+msgstr "Ð?анада"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr ""
+msgstr "Ð?еленоÑ?Ñ?Ñ?ка Ð?Ñ?Ñ?Ñ?ва"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr ""
+msgstr "ЦенÑ?Ñ?ална Ð?Ñ?Ñ?иÑ?ка РепÑ?блика"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr ""
+msgstr "Чад"
 
 msgctxt "CountryInfo"
 msgid "Chile"
-msgstr ""
+msgstr "Чиле"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "Ð?ина"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
-msgstr ""
+msgstr "Ð?олÑ?мбиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr ""
+msgstr "Ð?омоÑ?и"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Ð?онго, Ð?емокÑ?аÑ?Ñ?ка РепÑ?блика"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr ""
+msgstr "Ð?онго"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?аÑ?ика"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr ""
+msgstr "Ð?бала СлоноваÑ?е"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr ""
+msgstr "Ð¥Ñ?ваÑ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr ""
+msgstr "Ð?Ñ?ба"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr ""
+msgstr "Ð?ипаÑ?"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr ""
+msgstr "ЧеÑ?ка РепÑ?блика"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr ""
+msgstr "Ð?анÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr ""
+msgstr "Ð?ибÑ?Ñ?и"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr ""
+msgstr "Ð?оминика"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Ð?оминиканÑ?ка РепÑ?блика"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr ""
+msgstr "Ð?квадоÑ?"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr ""
+msgstr "Ð?гипаÑ?"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
-msgstr ""
+msgstr "Ð?л СалвадоÑ?"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Ð?кваÑ?оÑ?иÑ?ална Ð?винеÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr ""
+msgstr "Ð?Ñ?иÑ?Ñ?еÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?ониÑ?а"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr ""
+msgstr "ФÑ?анÑ?Ñ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
-msgstr ""
+msgstr "Ð?абон"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr ""
+msgstr "Ð?амбиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?зиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr ""
+msgstr "Ð?емаÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr ""
+msgstr "Ð?ана"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
-msgstr ""
+msgstr "Ð?Ñ?енада"
 
 msgctxt "CountryInfo"
 msgid "Guatemala"
-msgstr ""
+msgstr "Ð?ваÑ?емала"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr ""
+msgstr "Ð?винеÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Ð?винеÑ?а Ð?иÑ?ао"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
-msgstr ""
+msgstr "Ð?ваÑ?ана"
 
 msgctxt "CountryInfo"
 msgid "Hong Kong"
-msgstr ""
+msgstr "Хонгконг"
 
 msgctxt "CountryInfo"
 msgid "Haiti"
-msgstr ""
+msgstr "ХаиÑ?и"
 
 msgctxt "CountryInfo"
 msgid "Honduras"
-msgstr ""
+msgstr "ХондÑ?Ñ?аÑ?"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr ""
+msgstr "Ð?зÑ?аел"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr ""
+msgstr "Ð?Ñ?алиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr ""
+msgstr "Ð?амаÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Japan"
-msgstr ""
+msgstr "Ð?апан"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr ""
+msgstr "Ð?оÑ?дан"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Ð?азаÑ?Ñ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
-msgstr ""
+msgstr "Ð?ениÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Kiribati"
-msgstr ""
+msgstr "Ð?иÑ?ибаÑ?и"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr ""
+msgstr "Ð?Ñ?ваÑ?Ñ?"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Ð?иÑ?гиÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Laos"
-msgstr ""
+msgstr "Ð?аоÑ?"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr ""
+msgstr "Ð?еÑ?ониÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr ""
+msgstr "Ð?ибан"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
-msgstr ""
+msgstr "Ð?еÑ?оÑ?о"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr ""
+msgstr "Ð?ибеÑ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Ð?иÑ?Ñ?енÑ?Ñ?аÑ?н"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr ""
+msgstr "Ð?иÑ?ваниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr ""
+msgstr "Ð?Ñ?кÑ?ембÑ?Ñ?г"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr ""
+msgstr "Ð?акедониÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr ""
+msgstr "Ð?адагаÑ?каÑ?"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
-msgstr ""
+msgstr "Ð?алави"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr ""
+msgstr "Ð?алезиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Mali"
-msgstr ""
+msgstr "Ð?али"
 
 msgctxt "CountryInfo"
 msgid "Malta"
-msgstr ""
+msgstr "Ð?алÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?алÑ?ка Ð?Ñ?Ñ?Ñ?ва"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?иÑ?аниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?иÑ?иÑ?Ñ?Ñ?"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr ""
+msgstr "Ð?икÑ?онезиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
-msgstr ""
+msgstr "Ð?олдавиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr ""
+msgstr "Ð?онако"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr ""
+msgstr "Ð?онголиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr ""
+msgstr "ЦÑ?на Ð?оÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr ""
+msgstr "Ð?аÑ?око"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr ""
+msgstr "Ð?озамбик"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr ""
+msgstr "Ð?амибиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?Ñ?"
 
 msgctxt "CountryInfo"
 msgid "Nepal"
-msgstr ""
+msgstr "Ð?епал"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr ""
+msgstr "ХоландиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr ""
+msgstr "Ð?ови Ð?еланд"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr ""
+msgstr "Ð?икаÑ?агва"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr ""
+msgstr "Ð?игеÑ?"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr ""
+msgstr "Ð?игеÑ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr ""
+msgstr "Ð?оÑ?веÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr ""
+msgstr "Ð?ман"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
-msgstr ""
+msgstr "Ð?акиÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Palau"
-msgstr ""
+msgstr "Ð?алаÑ?"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr ""
+msgstr "Ð?алеÑ?Ñ?ина"
 
 msgctxt "CountryInfo"
 msgid "Panama"
-msgstr ""
+msgstr "Ð?анама"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Ð?апÑ?а Ð?ова Ð?винеÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
-msgstr ""
+msgstr "Ð?аÑ?агваÑ?"
 
 msgctxt "CountryInfo"
 msgid "Peru"
-msgstr ""
+msgstr "Ð?еÑ?Ñ?"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr ""
+msgstr "Филипини"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?Ñ?галиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr ""
+msgstr "Ð?аÑ?аÑ?"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr ""
+msgstr "РÑ?мÑ?ниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr ""
+msgstr "РÑ?Ñ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
-msgstr ""
+msgstr "РÑ?анда"
 
 msgctxt "CountryInfo"
 msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "СвеÑ?и Ð?иÑ?Ñ? и Ð?евиÑ?"
 
 msgctxt "CountryInfo"
 msgid "Saint Lucia"
-msgstr ""
+msgstr "СвеÑ?а Ð?Ñ?Ñ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "СвеÑ?и Ð?инÑ?енÑ? и Ð?Ñ?енадини"
 
 msgctxt "CountryInfo"
 msgid "Samoa"
-msgstr ""
+msgstr "Самоа"
 
 msgctxt "CountryInfo"
 msgid "San Marino"
-msgstr ""
+msgstr "Сан Ð?аÑ?ино"
 
 msgctxt "CountryInfo"
 msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "Сао Томе и Ð?Ñ?инÑ?ипе"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "СаÑ?диÑ?Ñ?ка Ð?Ñ?абиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
-msgstr ""
+msgstr "Сенегал"
 
 msgctxt "CountryInfo"
 msgid "Serbia"
-msgstr ""
+msgstr "СÑ?биÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr ""
+msgstr "СеÑ?Ñ?ели"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
-msgstr ""
+msgstr "СиÑ?еÑ?а Ð?еоне"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr ""
+msgstr "СингапÑ?Ñ?"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr ""
+msgstr "СловаÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr ""
+msgstr "СловениÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Соломонова Ð?Ñ?Ñ?Ñ?ва"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr ""
+msgstr "СомалиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr ""
+msgstr "Ð?Ñ?жна Ð?Ñ?Ñ?ика"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr ""
+msgstr "ШпаниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
-msgstr ""
+msgstr "ШÑ?и Ð?анка"
 
 msgctxt "CountryInfo"
 msgid "Sudan"
-msgstr ""
+msgstr "СÑ?дан"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr ""
+msgstr "СÑ?Ñ?инам"
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr ""
+msgstr "Свазиленд"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr ""
+msgstr "ШведÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr ""
+msgstr "ШваÑ?Ñ?аÑ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr ""
+msgstr "СиÑ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr ""
+msgstr "ТаÑ?икиÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr ""
+msgstr "ТанзаниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr ""
+msgstr "ТаÑ?ланд"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?оÑ?ни ТимоÑ? (Ð?Ñ?Ñ? ТимоÑ?)"
 
 msgctxt "CountryInfo"
 msgid "Togo"
-msgstr ""
+msgstr "Того"
 
 msgctxt "CountryInfo"
 msgid "Tonga"
-msgstr ""
+msgstr "Тонга"
 
 msgctxt "CountryInfo"
 msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "ТÑ?инидад и Тобаго"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr ""
+msgstr "ТÑ?ниÑ?"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
-msgstr ""
+msgstr "ТÑ?Ñ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Turkmenistan"
-msgstr ""
+msgstr "ТÑ?Ñ?кмениÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Tuvalu"
-msgstr ""
+msgstr "ТÑ?валÑ?"
 
 msgctxt "CountryInfo"
 msgid "Uganda"
-msgstr ""
+msgstr "Уганда"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr ""
+msgstr "УкÑ?аÑ?ина"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "УÑ?едиÑ?ени Ð?Ñ?апÑ?ки Ð?миÑ?аÑ?и"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr ""
+msgstr "Ð?елика Ð?Ñ?иÑ?аниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr ""
+msgstr "СÑ?едиÑ?ене Ð?меÑ?иÑ?ке Ð?Ñ?жаве"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
-msgstr ""
+msgstr "УÑ?Ñ?гваÑ?"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr ""
+msgstr "УзбекиÑ?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
-msgstr ""
+msgstr "Ð?анаÑ?Ñ?"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr ""
+msgstr "Ð?аÑ?икан"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
-msgstr ""
+msgstr "Ð?енеÑ?Ñ?ела"
 
 msgctxt "CountryInfo"
 msgid "Vietnam"
-msgstr ""
+msgstr "Ð?иÑ?еÑ?нам"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr ""
+msgstr "Ð?ападна СаÑ?аÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
-msgstr ""
+msgstr "Ð?емен"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr ""
+msgstr "Ð?амбиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Ð?имбабве"
+
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr "Zaire"
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr ""
+msgstr "Ð?лбаниÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr ""
+msgstr "Ð?лжиÑ?"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?иÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?еин"
 
 msgctxt "CountryInfo"
 msgid "Benin"
-msgstr ""
+msgstr "Ð?енин"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr ""
+msgstr "Ð?Ñ?иопиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
-msgstr ""
+msgstr "ФиÑ?и"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr ""
+msgstr "ФинÑ?ка"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Guam"
-msgstr ""
+msgstr "Ð?Ñ?ам"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr ""
+msgstr "Ð?аÑ?аÑ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr ""
+msgstr "Ð?Ñ?ланд"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr ""
+msgstr "Ð?ндиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr ""
+msgstr "Ð?ндонезиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Iran"
-msgstr ""
+msgstr "Ð?Ñ?ан"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr ""
+msgstr "Ð?Ñ?ак"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?ка"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr ""
+msgstr "СевеÑ?на Ð?оÑ?еÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr ""
+msgstr "Ð?Ñ?жна Ð?оÑ?еÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Libya"
-msgstr ""
+msgstr "Ð?ибиÑ?а"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr ""
+msgstr "Ð?алдиви"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr ""
+msgstr "Ð?екÑ?ико"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr ""
+msgstr "Ð?иÑ?анмаÑ?"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
+msgstr "ТаÑ?ван"
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr "Pošaljite izveštaj o rušenju"
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr "Vidalia je imala grešku, i potrebno je da se zatvori"
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr "Ponovo pokreni Vidalia"
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr "Nemoj da pokreÄ?eÅ¡ ponovo"
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr "NemoguÄ?e je ponovo pokrenuti Vidalia"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+msgstr "Mi nismo u moguÄ?nosti da restartujemo Vidalia automatski. Molimo vas da restartujete Vidalia ruÄ?no."
+
+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 "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
+
+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 "GeneralPage"
 msgid "Executables (*.exe)"
-msgstr ""
+msgstr "Ð?звÑ?Ñ?не (*. exe)"
 
 msgctxt "GeneralPage"
 msgid "Select Path to Tor"
-msgstr ""
+msgstr "Ð?дабеÑ?иÑ?е Ð?Ñ?Ñ?аÑ?Ñ? за ТоÑ?"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr ""
+msgstr "Ð?забеÑ?и Ð?звÑ?Ñ?ни пÑ?окÑ?и"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
+msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и име ТоÑ? извÑ?Ñ?не даÑ?оÑ?еке."
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
-msgstr ""
+msgstr "Ð?оÑ?еÑ?ак Ð?идалиа када моÑ? Ñ?иÑ?Ñ?ем поÑ?не"
 
 msgctxt "GeneralPage"
 msgid "Browse"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?Ñ?ажи"
 
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
-msgstr ""
+msgstr "Ð?окÑ?ени ТоÑ? Ñ?оÑ?Ñ?веÑ? када Ñ?е покÑ?ене Ð?идалиа"
 
 msgctxt "GeneralPage"
 msgid "Tor"
-msgstr ""
+msgstr "ТоÑ?"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr ""
+msgstr "Ð?Ñ?оки апликаÑ?иÑ?а (опÑ?ионо)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
-msgstr ""
+msgstr "Ð?окÑ?ени пÑ?окÑ?и апликаÑ?иÑ?Ñ? када Ñ?е покÑ?ене ТоÑ?"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr ""
+msgstr "Ð?Ñ?гÑ?менÑ?и пÑ?окÑ?и апликаÑ?иÑ?е:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr ""
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е Ñ?оÑ?Ñ?веÑ?а"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е нови Ñ?оÑ?Ñ?веÑ? доÑ?Ñ?Ñ?пан"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
-msgstr ""
+msgstr "Ð?Ñ?овеÑ?и одмаÑ?"
 
 msgctxt "GraphFrame"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 Ð?Ð?/Ñ?"
 
 msgctxt "GraphFrame"
 msgid "%1 KB"
-msgstr ""
+msgstr "%1 Ð?Ð?"
 
 msgctxt "GraphFrame"
 msgid "%1 MB"
-msgstr ""
+msgstr "%1 Ð?Ð?"
 
 msgctxt "GraphFrame"
 msgid "%1 GB"
-msgstr ""
+msgstr "%1 Ð?Ð?"
 
 msgctxt "GraphFrame"
 msgid "Recv:"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зеÑ?о:"
 
 msgctxt "GraphFrame"
 msgid "Sent:"
-msgstr ""
+msgstr "Ð?оÑ?лаÑ?о:"
 
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
+msgstr "Ð?Ñ?поÑ?Ñ?Ñ?ен XML Ñ?аÑ?л ниÑ?е валидан Ñ?адÑ?жаÑ? докÑ?менÑ?а."
 
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
-msgstr ""
+msgstr "ТÑ?ажилаÑ? доÑ?Ñ?игао кÑ?аÑ? докÑ?менÑ?а"
 
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
-msgstr ""
+msgstr "ТÑ?ажилаÑ? доÑ?Ñ?игао поÑ?еÑ?ак докÑ?менÑ?а"
 
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
-msgstr ""
+msgstr "ТекÑ?Ñ? ниÑ?е пÑ?онаÑ?ен Ñ? докÑ?менÑ?Ñ?"
 
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?ено %1 Ñ?езÑ?лÑ?аÑ?а"
 
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Ð?идалиа Ð?омоÑ?"
 
 msgctxt "HelpBrowser"
 msgid "Back"
-msgstr ""
+msgstr "Ð?азад"
 
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
-msgstr ""
+msgstr "Ð?ди на пÑ?еÑ?Ñ?однÑ? Ñ?Ñ?Ñ?анÑ? (Ñ?аÑ?Ñ?еÑ? Backspace)"
 
 msgctxt "HelpBrowser"
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace "
 
 msgctxt "HelpBrowser"
 msgid "Forward"
-msgstr ""
+msgstr "Ð?апÑ?ед"
 
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
-msgstr ""
+msgstr "Ð?ди на Ñ?ледеÑ?Ñ? Ñ?Ñ?Ñ?анÑ? (Shift+Backspace)"
 
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
-msgstr ""
+msgstr "Shift+Backspace "
 
 msgctxt "HelpBrowser"
 msgid "Home"
-msgstr ""
+msgstr "Ð?оÑ?еÑ?ак"
 
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
+msgstr "Ð?ди на поÑ?еÑ?нÑ? Ñ?Ñ?Ñ?анÑ? (Ctrl+H)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
-msgstr ""
+msgstr "Ctrl+H "
 
 msgctxt "HelpBrowser"
 msgid "Find"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и"
 
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
+msgstr "ТÑ?ажи Ñ?еÑ? или Ñ?Ñ?азÑ? на Ñ?Ñ?енÑ?Ñ?ноÑ? Ñ?Ñ?Ñ?аниÑ?и (ЦÑ?Ñ?л + Ф)"
 
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "ЦТРÐ? + Ф"
 
 msgctxt "HelpBrowser"
 msgid "Close"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и"
 
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и Ð?идалиа Ð?омоÑ?"
 
 msgctxt "HelpBrowser"
 msgid "Esc"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?"
 
 msgctxt "HelpBrowser"
 msgid "Find:"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и:"
 
 msgctxt "HelpBrowser"
 msgid "Find Previous"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и Ð?Ñ?еÑ?Ñ?одно"
 
 msgctxt "HelpBrowser"
 msgid "Find Next"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и СледеÑ?е"
 
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
-msgstr ""
+msgstr "Ð?елика и мала Ñ?лова"
 
 msgctxt "HelpBrowser"
 msgid "Whole words only"
-msgstr ""
+msgstr "Само Ñ?еле Ñ?еÑ?и"
 
 msgctxt "HelpBrowser"
 msgid "Help Topics"
-msgstr ""
+msgstr "Ð?омоÑ? Теме"
 
 msgctxt "HelpBrowser"
 msgid "Contents"
-msgstr ""
+msgstr "СадÑ?жаÑ?"
 
 msgctxt "HelpBrowser"
 msgid "Search"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?Ñ?ага"
 
 msgctxt "HelpBrowser"
 msgid "Searching for:"
-msgstr ""
+msgstr "ТÑ?ажи:"
 
 msgctxt "HelpBrowser"
 msgid "Found Documents"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?ени Ð?окÑ?менÑ?и"
 
 msgctxt "HelpBrowser"
 msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?иÑ?аваÑ?Ñ? Ð?омоÑ?ног СадÑ?жаÑ?а:"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr ""
+msgstr "Ð?Ñ?ваÑ?аÑ?е СпоÑ?ног линка"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
-msgstr ""
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
+msgstr "Ð?идалиа неможе да оÑ?воÑ?им линк коÑ?и Ñ?Ñ?е одабÑ?али Ñ? Ð?аÑ?ем подÑ?азÑ?меваном Ð?еб Ñ?иÑ?аÑ?Ñ?. Уколико ваÑ? пÑ?егледаÑ? Ñ?Ñ?енÑ?Ñ?но ниÑ?е конÑ?игÑ?Ñ?иÑ?ан да коÑ?иÑ?Ñ?и ТоÑ? онда заÑ?Ñ?ев неÑ?е биÑ?и анонимна."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
+msgstr "Ð?а ли желиÑ?е да Ð?идалиа оÑ?воÑ?или линк Ñ? ваÑ?ем веб Ñ?иÑ?аÑ?Ñ??"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
-msgstr ""
+msgstr "Ð?е може Ñ?е оÑ?воÑ?иÑ?и линк"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
-msgstr ""
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr "Ð?идалиа ниÑ?е могао да оÑ?воÑ?и изабÑ?анÑ? везÑ? Ñ? Ð?еб пÑ?егледаÑ?Ñ?. Ð?оÑ? Ñ?век можеÑ?е да копиÑ?аÑ?е УРÐ? адÑ?еÑ?Ñ? и налепиÑ?е га Ñ? Ñ?вом пÑ?егледаÑ?Ñ?."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка пÑ?и оÑ?ваÑ?аÑ?Ñ? Ñ?аÑ?ла за помоÑ?:"
 
 msgctxt "LicenseDialog"
 msgid "License Information"
-msgstr ""
+msgstr "Ð?нÑ?оÑ?маÑ?иÑ?е о лиÑ?енÑ?и"
 
 msgctxt "LicenseDialog"
 msgid "License"
-msgstr ""
+msgstr "Ð?иÑ?енÑ?а"
 
 msgctxt "LicenseDialog"
 msgid "Credits"
-msgstr ""
+msgstr "Ð?Ñ?едиÑ?и"
 
 msgctxt "LogEvent"
 msgid "Debug"
-msgstr ""
+msgstr "OÑ?клаÑ?аÑ?е гÑ?еÑ?ке"
 
 msgctxt "LogEvent"
 msgid "Info"
-msgstr ""
+msgstr "Ð?нÑ?о"
 
 msgctxt "LogEvent"
 msgid "Notice"
-msgstr ""
+msgstr "Ð?апомена"
 
 msgctxt "LogEvent"
 msgid "Warning"
-msgstr ""
+msgstr "УпозоÑ?еÑ?е"
 
 msgctxt "LogEvent"
 msgid "Error"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка"
 
 msgctxt "LogEvent"
 msgid "Unknown"
-msgstr ""
+msgstr "Ð?епознаÑ?о"
+
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr "Debuguj"
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr "Informacije"
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr "obratite Pažnju"
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr "Upozorenje"
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr "Greška"
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr "Nepoznato"
 
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr ""
+msgstr "Ð?окÑ?ени ТоÑ?"
 
 msgctxt "MainWindow"
 msgid "Exit"
-msgstr ""
+msgstr "Ð?злаз"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr ""
+msgstr "Ð?Ñ?аÑ?икон пÑ?оÑ?ока"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr ""
+msgstr "Ð?невник поÑ?Ñ?ка"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?а мÑ?еже"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr ""
+msgstr "Ð?онÑ?Ñ?олна Ñ?абла"
 
 msgctxt "MainWindow"
 msgid "Settings"
-msgstr ""
+msgstr "Ð?одеÑ?аваÑ?а"
 
 msgctxt "MainWindow"
 msgid "About"
-msgstr ""
+msgstr "Ð? нама"
 
 msgctxt "MainWindow"
 msgid "Help"
-msgstr ""
+msgstr "Ð?омоÑ?"
 
 msgctxt "MainWindow"
 msgid "New Identity"
-msgstr ""
+msgstr "Ð?ови иденÑ?иÑ?еÑ?"
 
 msgctxt "MainWindow"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ctrl+T "
 
 msgctxt "MainWindow"
 msgid "Ctrl+B"
-msgstr ""
+msgstr "Ctrl+B "
 
 msgctxt "MainWindow"
 msgid "Ctrl+L"
-msgstr ""
+msgstr "Ctrl+L "
 
 msgctxt "MainWindow"
 msgid "Ctrl+N"
-msgstr ""
+msgstr "Ctrl+N "
 
 msgctxt "MainWindow"
 msgid "Ctrl+?"
-msgstr ""
+msgstr "Ctrl+? "
 
 msgctxt "MainWindow"
 msgid "Ctrl+I"
-msgstr ""
+msgstr "Ctrl+I "
 
 msgctxt "MainWindow"
 msgid "Ctrl+P"
-msgstr ""
+msgstr "Ctrl+P "
 
 msgctxt "MainWindow"
 msgid "Tor"
-msgstr ""
+msgstr "ТоÑ?"
 
 msgctxt "MainWindow"
 msgid "View"
-msgstr ""
+msgstr "Ð?огледаÑ?"
 
 msgctxt "MainWindow"
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Ð?идалиа Ð?омоÑ?"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка покÑ?еÑ?аÑ?а веб пÑ?еÑ?Ñ?аживаÑ?а"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
+msgstr "Ð?идалиа ниÑ?е могао да поÑ?не конÑ?игÑ?Ñ?иÑ?аÑ?е веб пÑ?еÑ?Ñ?аживаÑ?а"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка покÑ?еÑ?аÑ?е Ð?Ð? клиÑ?енÑ?а"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
+msgstr "Ð?идалиа ниÑ?е могао да поÑ?не конÑ?игÑ?Ñ?иÑ?аÑ?е клиÑ?енÑ?а за Ñ?аÑ?каÑ?е"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка покÑ?еÑ?аÑ?е пÑ?окÑ?и Ñ?еÑ?веÑ?а"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
+msgstr "Ð?идалиа ниÑ?е могао да поÑ?не конÑ?игÑ?Ñ?иÑ?аÑ?е пÑ?окÑ?и Ñ?еÑ?веÑ?а"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
-msgstr ""
+msgstr "Ð?овезиваÑ?е Ñ?а Ñ?елеÑ? диÑ?екÑ?оÑ?иÑ?Ñ?мом"
 
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
-msgstr ""
+msgstr "УÑ?поÑ?Ñ?авÑ?аÑ?е Ñ?иÑ?Ñ?оване везе диÑ?екÑ?оÑ?иÑ?Ñ?ма"
 
 msgctxt "MainWindow"
 msgid "Retrieving network status"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зимаÑ?е мÑ?ежног Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
 msgctxt "MainWindow"
 msgid "Loading network status"
-msgstr ""
+msgstr "УÑ?иÑ?аваÑ?е мÑ?ежног Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зимаÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?а аÑ?Ñ?оÑ?иÑ?еÑ?а"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?ев за пÑ?еноÑ? инÑ?оÑ?маÑ?иÑ?е"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr ""
+msgstr "УÑ?иÑ?аваÑ?е пÑ?еноÑ?а инÑ?оÑ?маÑ?иÑ?е"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
-msgstr ""
+msgstr "Ð?овезиваÑ?е на ТоÑ? мÑ?ежÑ?"
 
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
-msgstr ""
+msgstr "УÑ?поÑ?Ñ?авÑ?аÑ?е ТоÑ? кÑ?Ñ?га"
 
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
+msgstr "Ð?овезан Ñ?а ТоÑ? мÑ?ежом!"
 
 msgctxt "MainWindow"
 msgid "miscellaneous"
-msgstr ""
+msgstr "Ñ?азно"
 
 msgctxt "MainWindow"
 msgid "identity mismatch"
-msgstr ""
+msgstr "иденÑ?иÑ?еÑ? неÑ?Ñ?клаÑ?ен"
 
 msgctxt "MainWindow"
 msgid "done"
-msgstr ""
+msgstr "Ñ?ади"
 
 msgctxt "MainWindow"
 msgid "connection refused"
-msgstr ""
+msgstr "веза одбиÑ?ена"
 
 msgctxt "MainWindow"
 msgid "connection timeout"
-msgstr ""
+msgstr "веза Ñ?е иÑ?Ñ?екла"
 
 msgctxt "MainWindow"
 msgid "read/write error"
-msgstr ""
+msgstr "гÑ?еÑ?ка пÑ?и пиÑ?аÑ?Ñ?/Ñ?иÑ?аÑ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "no route to host"
-msgstr ""
+msgstr "нема пÑ?Ñ?аÑ?е до Ñ?еÑ?веÑ?а"
 
 msgctxt "MainWindow"
 msgid "insufficient resources"
-msgstr ""
+msgstr "недовоÑ?на Ñ?Ñ?едÑ?Ñ?ва"
 
 msgctxt "MainWindow"
 msgid "unknown"
-msgstr ""
+msgstr "непознаÑ?"
 
 msgctxt "MainWindow"
 msgid "Tor is not running"
-msgstr ""
+msgstr "ТоÑ? не Ñ?ади"
 
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
-msgstr ""
+msgstr "ТоÑ? Ñ?е иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?Ñ?ави ТоÑ? Сада"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?Ñ?ави ТоÑ?"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
-msgstr ""
+msgstr "Ð?окÑ?еÑ?аÑ?е ТоÑ? Ñ?оÑ?Ñ?веÑ?а"
 
 msgctxt "MainWindow"
 msgid "Starting Tor"
-msgstr ""
+msgstr "Tor Ñ?е покÑ?еÑ?е"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка Ñ? покÑ?еÑ?аÑ?Ñ? ТоÑ?а"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
-msgstr ""
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
+msgstr "Vidalia не може да покÑ?ене Tor. Ð?Ñ?овеÑ?иÑ?е Ñ? ваÑ?им подеÑ?аваÑ?има да ли Ñ?Ñ? наведени иÑ?пÑ?авно име и локаÑ?иÑ?а ваÑ?ег Tor извÑ?Ñ?ног Ñ?аÑ?ла."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
-msgstr ""
+msgstr "Ð?овезиваÑ?е на ТоÑ?"
 
 msgctxt "MainWindow"
 msgid "Connection Error"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка Ñ? повезиваÑ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?Ñ?меÑ?аваÑ?е Ñ?е омогÑ?Ñ?ено"
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка Ñ? иÑ?кÑ?Ñ?Ñ?иваÑ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да Ñ?Ñ?опиÑ?а Tor."
 
 msgctxt "MainWindow"
 msgid "Unexpected Error"
-msgstr ""
+msgstr "Ð?еоÑ?екивана гÑ?еÑ?ка"
 
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
-msgstr ""
+msgstr "Ð?Ñ?иÑ?авÑ?иваÑ?е на Tor."
 
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?ева Ñ?е пÑ?иÑ?авÑ?иваÑ?е колаÑ?иÑ?а"
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
-msgstr ""
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
+msgstr " Tor заÑ?Ñ?ева од Vidalia-е да поÑ?аÑ?е Ñ?адÑ?жаÑ? колаÑ?иÑ?а за пÑ?иÑ?авÑ?иваÑ?е, али Vidalia не може да га пÑ?онаÑ?е."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
+msgstr "Ð?а ли желиÑ?е да поÑ?Ñ?ажиÑ?е Ñ?аÑ?л 'конÑ?Ñ?олни_пÑ?иÑ?ав_колаÑ?иÑ?' ?"
 
 msgctxt "MainWindow"
 msgid "Data Directory"
-msgstr ""
+msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м Ñ?а подаÑ?има"
 
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
-msgstr ""
+msgstr "Ð?онÑ?Ñ?олни колаÑ?иÑ? (конÑ?Ñ?олни_пÑ?иÑ?ав_колаÑ?иÑ?)"
 
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?егиÑ?Ñ?Ñ?оваÑ?Ñ? догаÑ?аÑ?а"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
-msgstr ""
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да Ñ?егиÑ?Ñ?Ñ?Ñ?Ñ?е неке догаÑ?аÑ?е. Ð?ноге могÑ?Ñ?ноÑ?Ñ?и Vidalia-е могÑ? биÑ?и недоÑ?Ñ?Ñ?пне."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?иÑ?авÑ?иваÑ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да Ñ?е пÑ?иÑ?ави на Tor. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
+msgstr "Ð?олимо да пÑ?овеÑ?иÑ?е подеÑ?аваÑ?а за поÑ?Ñ? за пÑ?иÑ?авÑ?иваÑ?е."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?Ñ?пна Ñ?е надогÑ?адÑ?а за Tor"
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
-msgstr ""
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
+msgstr "ТÑ?енÑ?Ñ?но инÑ?Ñ?алиÑ?ана веÑ?зиÑ?а ТоÑ?-а Ñ?е заÑ?Ñ?аÑ?ела или Ñ?е виÑ?е не пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е. Ð?олимо Ð?аÑ? поÑ?еÑ?иÑ?е ТоÑ? веб Ñ?аÑ?Ñ? да пÑ?еÑ?змеÑ?е наÑ?новиÑ?Ñ? веÑ?зиÑ?Ñ?."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
-msgstr ""
+msgstr "ТоÑ? вебÑ?аÑ?Ñ?: %1 "
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
-msgstr ""
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
+msgstr "Све даÑ?е везе Ñ?е изгледаÑ?и дÑ?Ñ?гаÑ?иÑ?е од ваÑ?иÑ? Ñ?Ñ?аÑ?иÑ? веза."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
-msgstr ""
+msgstr "Ð?Ñ?авÑ?еÑ?е новог иденÑ?иÑ?еÑ?а ниÑ?е Ñ?Ñ?пело"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
-msgstr ""
+msgstr "Ð?Ñ?оÑ?леÑ?иваÑ?е поÑ?Ñ?а ниÑ?е Ñ?Ñ?пело"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да подеÑ?и аÑ?Ñ?омаÑ?Ñ?ко пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ова."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
-msgstr ""
+msgstr "Ð?идалиа Ð?онÑ?Ñ?олна Ñ?абла"
 
 msgctxt "MainWindow"
 msgid "Status"
-msgstr ""
+msgstr "СÑ?аÑ?Ñ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
-msgstr ""
+msgstr "Ð?идалиа Ð?Ñ?еÑ?иÑ?е"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr ""
+msgstr "Ð?одеÑ?и пÑ?оÑ?леÑ?иваÑ?е"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
-msgstr ""
+msgstr "Ð?окÑ?ени Ñ?елеÑ? и помози да Ñ?е мÑ?ежа Ñ?иÑ?и"
 
 msgctxt "MainWindow"
 msgid "View the Network"
-msgstr ""
+msgstr "Ð?огледаÑ? Ð?Ñ?ежÑ?"
 
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
-msgstr ""
+msgstr "Ð?огледаÑ? мапÑ? ТоÑ? мÑ?еже"
 
 msgctxt "MainWindow"
 msgid "Use a New Identity"
-msgstr ""
+msgstr "Ð?оÑ?иÑ?Ñ?иÑ?е нови иденÑ?иÑ?еÑ?"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
-msgstr ""
+msgstr "УÑ?еди да Ñ?ве даÑ?е везе изгледаÑ?Ñ? као нове"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr ""
+msgstr "Ð?Ñ?икажи Ñ?коÑ?аÑ?Ñ?е коÑ?иÑ?Ñ?еÑ?е пÑ?оÑ?ока"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr ""
+msgstr "Ð?Ñ?икажи иÑ?Ñ?оÑ?иÑ?Ñ? забележениÑ? поÑ?Ñ?ка Ñ? запиÑ?никÑ?"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
-msgstr ""
+msgstr "Ð?огледаÑ? докÑ?менÑ?аÑ?иÑ?Ñ? за помоÑ?"
 
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
-msgstr ""
+msgstr "Ð?онÑ?игÑ?Ñ?иÑ?и Ð?идалиа"
 
 msgctxt "MainWindow"
 msgid "View version and license information"
-msgstr ""
+msgstr "Ð?огледаÑ? веÑ?зиÑ?Ñ? и инÑ?оÑ?маÑ?иÑ?е о лиÑ?енÑ?и"
 
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
-msgstr ""
+msgstr "Ð?заÑ?и Ð?идалиа"
 
 msgctxt "MainWindow"
 msgid "Show this window on startup"
-msgstr ""
+msgstr "Ð?Ñ?икажи оваÑ? пÑ?озоÑ? на покÑ?еÑ?аÑ?Ñ?"
 
 msgctxt "MainWindow"
 msgid "Hide"
-msgstr ""
+msgstr "СакÑ?иÑ?"
 
 msgctxt "MainWindow"
 msgid "Hide this window"
-msgstr ""
+msgstr "СакÑ?иÑ? оваÑ? пÑ?озоÑ?"
 
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
-msgstr ""
+msgstr "Ð?ониÑ?Ñ?аваÑ?е лозинке ниÑ?е Ñ?Ñ?пело"
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
-msgstr ""
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr "Vidalia Ñ?е покÑ?Ñ?ала да Ñ?еÑ?еÑ?Ñ?Ñ?е Tor конÑ?Ñ?олнÑ? Ñ?иÑ?Ñ?Ñ?, али ниÑ?е Ñ?Ñ?пела да поново покÑ?ене Tor. Ð?олимо ваÑ? да пÑ?овеÑ?иÑ?е Ñ? Task Manager-Ñ? да нема дÑ?Ñ?гиÑ? Tor пÑ?оÑ?еÑ?а."
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
-msgstr ""
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr "ТÑ?енÑ?Ñ?но инÑ?Ñ?алиÑ?ана веÑ?зиÑ?а ТоÑ?-а Ñ?е заÑ?Ñ?аÑ?ела или Ñ?е виÑ?е не пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е."
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
-msgstr ""
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr "Ð?елиÑ?е ли да пÑ?овеÑ?иÑ?е да ли Ñ?е новиÑ?и пакеÑ? доÑ?Ñ?Ñ?пан за инÑ?Ñ?алаÑ?иÑ?Ñ??"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
+msgstr "Ð?еза можда ниÑ?е безбедна"
 
 msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
-msgstr ""
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr "ТоÑ? Ñ?е аÑ?Ñ?омаÑ?Ñ?ки заÑ?воÑ?ио ваÑ?Ñ? везÑ? како би заÑ?Ñ?иÑ?ио ваÑ?Ñ? анонимноÑ?Ñ?."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
-msgstr ""
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е ниÑ?е Ñ?Ñ?пело"
 
 msgctxt "MainWindow"
 msgid "Your software is up to date"
-msgstr ""
+msgstr "Ð?аÑ? Ñ?оÑ?Ñ?веÑ? Ñ?е ажÑ?Ñ?ан"
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
-msgstr ""
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
+msgstr "У овом Ñ?Ñ?енÑ?Ñ?кÑ? нема новиÑ? ТоÑ? Ñ?оÑ?Ñ?веÑ?Ñ?киÑ? пакеÑ?а доÑ?Ñ?Ñ?пниÑ? за ваÑ? Ñ?аÑ?Ñ?наÑ?."
 
 msgctxt "MainWindow"
 msgid "Installation Failed"
-msgstr ""
+msgstr "Ð?нÑ?Ñ?алаÑ?иÑ?а ниÑ?е Ñ?Ñ?пела"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to install your software updates."
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да инÑ?Ñ?алиÑ?а надогÑ?адÑ?Ñ? Ñ?оÑ?Ñ?веÑ?а."
 
 msgctxt "MainWindow"
 msgid "The following error occurred:"
-msgstr ""
+msgstr "СледеÑ?е гÑ?еÑ?ке:"
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
+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."
+msgstr "Sve Å¡to je poslato kroz ovu veyu nemože biti nadgledano, Molimo proverite konfiguraciju aplikacije i koristite jedino enkriptovani protokol, kako shto je SSL ako je to moguÄ?e."
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Bootstrapping torrc from %1 to %2"
 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?"
-msgstr ""
+msgid "(probably Telnet)"
+msgstr "(веÑ?оваÑ?но ТелнеÑ?)"
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr ""
+msgid "(probably an email client)"
+msgstr "(веÑ?оваÑ?но емаил клиÑ?енÑ?)"
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ""
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Ð?згледа да Ñ?една од ваÑ?иÑ? апликаÑ?иÑ?а %1 пÑ?ави поÑ?енÑ?иÑ?ално неÑ?игÑ?Ñ?нÑ? везÑ? Ñ?а поÑ?Ñ?ом %2."
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
-msgstr ""
+msgid "failed (%1)"
+msgstr "неÑ?Ñ?пело (%1)"
 
 msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Ð?аÑ? Ñ?елеÑ? Ñ?е иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е.\nÐ?ликниÑ?е 'Stop' поново да биÑ?Ñ?е одмаÑ? иÑ?кÑ?Ñ?Ñ?или Ñ?елеÑ?."
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+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 "Home"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Ð?и Ñ?Ñ?енÑ?Ñ?но коÑ?иÑ?Ñ?иÑ?е Ñ?елеÑ?. Уколико га Ñ?гаÑ?иÑ?е Ñ?ада, Ñ?о Ñ?е пÑ?екинÑ?Ñ?и Ñ?ве оÑ?воÑ?ене везе Ñ?а клиÑ?енÑ?има.\n\nÐ?а ли желиÑ?е да благонаклоно иÑ?кÑ?Ñ?Ñ?иÑ?е Ñ?елеÑ? како би клиÑ?енÑ?и имали вÑ?емена да пÑ?онаÑ?Ñ? нови Ñ?елеÑ??"
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidalia Ñ?е оÑ?кÑ?ила да Ñ?е Tor био неоÑ?еиквано иÑ?кÑ?Ñ?Ñ?ен.\n\nÐ?олимо да пÑ?овеÑ?иÑ?е Ñ?коÑ?аÑ?Ñ?а Ñ?позоÑ?еÑ?а и поÑ?Ñ?ке о гÑ?еÑ?кама Ñ? запиÑ?никÑ?."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка Ñ? подеÑ?аваÑ?Ñ? Ñ?илÑ?Ñ?а"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да Ñ?е Ñ?егиÑ?Ñ?Ñ?Ñ?Ñ?е на догаÑ?аÑ?е из запиÑ?ника за Tor."
 
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка пÑ?и оÑ?ваÑ?аÑ?Ñ? Ñ?аÑ?ла Ñ?а запиÑ?ником"
 
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да оÑ?воÑ?и наведени Ñ?аÑ?л Ñ?а запиÑ?ником."
 
 msgctxt "MessageLog"
 msgid "Log Filename Required"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ебно Ñ?е име Ñ?аÑ?ла Ñ?а запиÑ?ником"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
+msgstr "Ð?оÑ?аÑ?е да Ñ?неÑ?еÑ?е име Ñ?аÑ?ла да биÑ?Ñ?е могли да Ñ?аÑ?Ñ?ваÑ?е запиÑ?ник."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
-msgstr ""
+msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?л Ñ?а запиÑ?ником"
 
 msgctxt "MessageLog"
 msgid "Save Log Messages"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ? запиÑ?ник"
 
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
-msgstr ""
+msgstr "ТекÑ?Ñ?Ñ?алне даÑ?оÑ?еке (*. Ñ?кÑ?)"
 
 msgctxt "MessageLog"
 msgid "Vidalia"
-msgstr ""
+msgstr "Ð?идалиа"
 
 msgctxt "MessageLog"
 msgid "Find in Message Log"
-msgstr ""
+msgstr "ТÑ?ажи Ñ? запиÑ?никÑ?"
 
 msgctxt "MessageLog"
 msgid "Find:"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и:"
 
 msgctxt "MessageLog"
 msgid "Not Found"
-msgstr ""
+msgstr "Ð?иÑ?е пÑ?онаÑ?ено"
 
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?ено 0 Ñ?езÑ?лÑ?аÑ?а."
 
 msgctxt "MessageLog"
 msgid "Message Log"
-msgstr ""
+msgstr "Ð?апиÑ?ник"
 
 msgctxt "MessageLog"
 msgid "Message Filters..."
-msgstr ""
+msgstr "ФилÑ?еÑ?и за поÑ?Ñ?ке..."
 
 msgctxt "MessageLog"
 msgid "Set message filters"
-msgstr ""
+msgstr "Ð?одеÑ?и Ñ?илÑ?еÑ?е за поÑ?Ñ?ке"
 
 msgctxt "MessageLog"
 msgid "History Size..."
-msgstr ""
+msgstr "Ð?Ñ?жина иÑ?Ñ?оÑ?иÑ?е поÑ?Ñ?ка..."
 
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?авиÑ?е макÑ?имални бÑ?оÑ? поÑ?Ñ?ка за пÑ?иказ"
 
 msgctxt "MessageLog"
 msgid "Clear"
-msgstr ""
+msgstr "Ð?бÑ?иÑ?и"
 
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
+msgstr "Ð?бÑ?иÑ?и Ñ?ве поÑ?Ñ?ке из запиÑ?ника (Ctrl+E)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+E"
-msgstr ""
+msgstr "Ctrl+E "
 
 msgctxt "MessageLog"
 msgid "Copy"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ?"
 
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ? обележене поÑ?Ñ?ке на clipboard (Ctrl+C)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+C"
-msgstr ""
+msgstr "Ctrl+C "
 
 msgctxt "MessageLog"
 msgid "Select All"
-msgstr ""
+msgstr "Ð?дабеÑ?и Ñ?ве"
 
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
-msgstr ""
+msgstr "Ð?дабеÑ?и Ñ?ве поÑ?Ñ?ке (Ctrl+A)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+A"
-msgstr ""
+msgstr "Ctrl+A "
 
 msgctxt "MessageLog"
 msgid "Save All"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ? Ñ?ве"
 
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ? Ñ?ве поÑ?Ñ?ке Ñ? даÑ?оÑ?екÑ?"
 
 msgctxt "MessageLog"
 msgid "Save Selected"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ? Ð?дабÑ?ано"
 
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ? одабÑ?ане поÑ?Ñ?ке Ñ? даÑ?оÑ?екÑ?"
 
 msgctxt "MessageLog"
 msgid "Settings"
-msgstr ""
+msgstr "Ð?одеÑ?аваÑ?а"
 
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
-msgstr ""
+msgstr "УÑ?еди подеÑ?аваÑ?а запиÑ?ника"
 
 msgctxt "MessageLog"
 msgid "Ctrl+T"
-msgstr ""
+msgstr "Ctrl+T "
 
 msgctxt "MessageLog"
 msgid "Help"
-msgstr ""
+msgstr "Ð?омоÑ?"
 
 msgctxt "MessageLog"
 msgid "Show the help browser"
-msgstr ""
+msgstr "Ð?Ñ?икажи помоÑ?"
 
 msgctxt "MessageLog"
 msgid "F1"
-msgstr ""
+msgstr "F1 "
 
 msgctxt "MessageLog"
 msgid "Close"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и"
 
 msgctxt "MessageLog"
 msgid "Close the Message Log"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и запиÑ?ник"
 
 msgctxt "MessageLog"
 msgid "Esc"
-msgstr ""
+msgstr "Esc "
 
 msgctxt "MessageLog"
 msgid "Find"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и"
 
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и Ñ?ве поÑ?Ñ?ке коÑ?е Ñ?адÑ?же Ñ?Ñ?ажени Ñ?екÑ?Ñ? (ЦÑ?Ñ?л + Ф)"
 
 msgctxt "MessageLog"
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ctrl+F "
 
 msgctxt "MessageLog"
 msgid "Time"
-msgstr ""
+msgstr "Ð?Ñ?еме"
 
 msgctxt "MessageLog"
 msgid "Type"
-msgstr ""
+msgstr "Ð?одел"
 
 msgctxt "MessageLog"
 msgid "Message"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ка"
 
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
-msgstr ""
+msgstr "Снима Ñ?Ñ?енÑ?Ñ?на подеÑ?аваÑ?а запиÑ?ника"
 
 msgctxt "MessageLog"
 msgid "Save Settings"
-msgstr ""
+msgstr "СаÑ?Ñ?ваÑ? подеÑ?аваÑ?а"
 
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
-msgstr ""
+msgstr "Ð?Ñ?кажи измене Ñ? подеÑ?аваÑ?има"
 
 msgctxt "MessageLog"
 msgid "Cancel"
-msgstr ""
+msgstr "Ð?Ñ?кажи"
 
 msgctxt "MessageLog"
 msgid "Message Filter"
-msgstr ""
+msgstr "ФилÑ?еÑ? за поÑ?Ñ?ке"
 
 msgctxt "MessageLog"
 msgid "Error"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?ка"
 
 msgctxt "MessageLog"
 msgid "Warning"
-msgstr ""
+msgstr "УпозоÑ?еÑ?е"
 
 msgctxt "MessageLog"
 msgid "Notice"
-msgstr ""
+msgstr "obratite Pažnju"
 
 msgctxt "MessageLog"
 msgid "Info"
-msgstr ""
+msgstr "Ð?нÑ?о"
 
 msgctxt "MessageLog"
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 msgctxt "MessageLog"
 msgid "Message Log History"
-msgstr ""
+msgstr "Ð?апиÑ?ник"
 
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
-msgstr ""
+msgstr "Ð?Ñ?оÑ? поÑ?Ñ?ка коÑ?е Ñ?е пÑ?иказÑ?Ñ?Ñ? Ñ? запиÑ?никÑ?"
 
 msgctxt "MessageLog"
 msgid "messages"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
+msgstr "поÑ?Ñ?ке"
 
 msgctxt "MessageLog"
 msgid "Browse"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?Ñ?ажи"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
+msgstr "Ð?могÑ?Ñ?и аÑ?Ñ?омаÑ?Ñ?ко Ñ?Ñ?ваÑ?е Ñ?виÑ? новиÑ? поÑ?Ñ?ка Ñ? Ñ?аÑ?л"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?аÑ?Ñ?ваÑ? нове поÑ?Ñ?ке Ñ? Ñ?аÑ?л"
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr "Osnovno"
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Tor Status"
+msgstr "Tor Status"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Napredno"
+
+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."
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ке коÑ?е Ñ?е Ñ?авÑ?аÑ?Ñ? када Ñ?е неÑ?Ñ?о лоÑ?е деÑ?и и Tor не може да наÑ?Ñ?ави да Ñ?ади."
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ке коÑ?е Ñ?е поÑ?авÑ?Ñ?Ñ?Ñ? Ñ?амо када Ñ?е неÑ?Ñ?о кÑ?енÑ?ло наопако Ñ?а ТоÑ?-ом."
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ке коÑ?е Ñ?е Ñ?еÑ?е Ñ?авÑ?аÑ?Ñ? Ñ?оком ноÑ?малног Ñ?ада Tor-а а ниÑ?Ñ? гÑ?еÑ?ке, али би Ñ?веÑ?едно Ñ?Ñ?ебало да Ñ?е побÑ?инеÑ?е за Ñ?иÑ?."
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ке коÑ?е Ñ?е поÑ?авÑ?Ñ?Ñ?Ñ? Ñ?еÑ?Ñ?о Ñ? Ñ?окÑ? ноÑ?малног Ñ?ада ТоÑ?-а."
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
-msgstr ""
+msgstr "Ð?еома деÑ?аÑ?не поÑ?Ñ?ке коÑ?е Ñ?Ñ? пÑ?венÑ?Ñ?вено коÑ?иÑ?не Tor Ñ?азвиÑ?аÑ?има."
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
+msgstr "Ð?еÑ?Ñ?пело пиÑ?аÑ?е Ñ?аÑ?ла %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
-msgstr ""
+msgstr "Ð?апа Tor мÑ?еже"
 
 msgctxt "NetViewer"
 msgid "Refresh"
-msgstr ""
+msgstr "Ð?Ñ?вежи"
 
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
-msgstr ""
+msgstr "Ð?Ñ?вежи лиÑ?Ñ?Ñ? Tor Ñ?елеÑ?а и веза"
 
 msgctxt "NetViewer"
 msgid "Ctrl+R"
-msgstr ""
+msgstr "Ctrl+R "
 
 msgctxt "NetViewer"
 msgid "Help"
-msgstr ""
+msgstr "Ð?омоÑ?"
 
 msgctxt "NetViewer"
 msgid "Show the network map help"
-msgstr ""
+msgstr "Ð?Ñ?икажи помоÑ? за мапÑ? мÑ?еже"
 
 msgctxt "NetViewer"
 msgid "Show network map help"
-msgstr ""
+msgstr "Ð?Ñ?икажи помоÑ? за мапÑ? мÑ?еже"
 
 msgctxt "NetViewer"
 msgid "F1"
-msgstr ""
+msgstr "F1 "
 
 msgctxt "NetViewer"
 msgid "Close"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и"
 
 msgctxt "NetViewer"
 msgid "Close the network map"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?и мапÑ? мÑ?еже"
 
 msgctxt "NetViewer"
 msgid "Esc"
-msgstr ""
+msgstr "Esc "
 
 msgctxt "NetViewer"
 msgid "Zoom In"
-msgstr ""
+msgstr "УвеÑ?аÑ?"
 
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
-msgstr ""
+msgstr "Ð?Ñ?миÑ?аÑ? мапÑ? мÑ?еже"
 
 msgctxt "NetViewer"
 msgid "+"
-msgstr ""
+msgstr "+ "
 
 msgctxt "NetViewer"
 msgid "Zoom Out"
-msgstr ""
+msgstr "УмаÑ?и"
 
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
-msgstr ""
+msgstr "Ð?дзÑ?миÑ?аÑ? мапÑ? мÑ?еже"
 
 msgctxt "NetViewer"
 msgid "-"
-msgstr ""
+msgstr "- "
 
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
-msgstr ""
+msgstr "Ð?Ñ?миÑ?аÑ? Ñ?ако да Ñ?ве бÑ?де видÑ?иво"
 
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
+msgstr "Ð?Ñ?миÑ?аÑ? Ñ?ако да Ñ?е Ñ?клопе Ñ?ва Ñ?Ñ?енÑ?Ñ?но пÑ?иказана кола"
 
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
-msgstr ""
+msgstr "Ctrl+Z "
 
 msgctxt "NetViewer"
 msgid "Relay Not Found"
-msgstr ""
+msgstr "РелеÑ? ниÑ?е пÑ?онаÑ?ен"
 
 msgctxt "NetViewer"
 msgid "No details on the selected relay are available."
-msgstr ""
+msgstr "Ð?иÑ?Ñ? доÑ?Ñ?Ñ?пни подаÑ?и о Ñ?ом Ñ?елеÑ?Ñ?"
 
 msgctxt "NetViewer"
 msgid "Unknown"
-msgstr ""
+msgstr "Ð?епознаÑ?о"
 
 msgctxt "NetViewer"
 msgid "Full Screen"
-msgstr ""
+msgstr "Цео Ð?кÑ?ан"
 
 msgctxt "NetViewer"
 msgid "View the network map as a full screen window"
-msgstr ""
+msgstr "Ð?Ñ?икажи мапÑ? мÑ?еже пÑ?еко Ñ?елог екÑ?ана"
 
 msgctxt "NetViewer"
 msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr ""
+msgstr "Ctrl+F "
 
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ? (ЦÑ?Ñ?л + Ц)"
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
-msgstr ""
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
+msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и IP адÑ?еÑ?Ñ? или име и поÑ?Ñ? да би подеÑ?или Tor да коÑ?иÑ?Ñ?и пÑ?окÑ?и на инÑ?еÑ?неÑ?Ñ?."
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
-msgstr ""
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
+msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и Ñ?едан или виÑ?е поÑ?Ñ?ова пÑ?еко коÑ?иÑ? вам firewall дозвоÑ?ава да Ñ?е повежеÑ?е."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
-msgstr ""
+msgstr "'%1' ниÑ?е одговаÑ?аÑ?Ñ?Ñ?и бÑ?оÑ? поÑ?Ñ?а."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
+msgstr "Ð?Ñ?овеÑ?иÑ?е да ли ваÑ?а локална мÑ?ежа заÑ?Ñ?ева пÑ?окÑ?и за пÑ?иÑ?Ñ?Ñ?п Ð?нÑ?еÑ?неÑ?Ñ?"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
-msgstr ""
+msgstr "Ð?а коÑ?иÑ?Ñ?им пÑ?окÑ?и за пÑ?иÑ?Ñ?Ñ?п Ð?нÑ?еÑ?неÑ?Ñ?"
 
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
+msgstr "Ð?Ñ?окÑ?и Ð?одеÑ?аваÑ?а"
 
 msgctxt "NetworkPage"
 msgid "Username:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
+msgstr "Ð?оÑ?иÑ?ниÑ?ко име:"
 
 msgctxt "NetworkPage"
 msgid "Password:"
-msgstr ""
+msgstr "Ð?озинка:"
 
 msgctxt "NetworkPage"
 msgid "Port:"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
+msgstr "Ð?знаÑ?иÑ?е да биÑ?Ñ?е Ñ?е повезивали Ñ?амо на Ñ?елеÑ?е коÑ?и коÑ?иÑ?Ñ?е поÑ?Ñ?ове коÑ?е дозвоÑ?ава ваÑ? firewall"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
-msgstr ""
+msgstr "Ð?оÑ? firewall дозвоÑ?ава да Ñ?е повежем Ñ?амо пÑ?еко одÑ?еÑ?ениÑ? поÑ?Ñ?ова"
 
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
-msgstr ""
+msgstr "Ð?одеÑ?аваÑ?а за firewall"
 
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
-msgstr ""
+msgstr "Ð?озвоÑ?ени Ð?оÑ?Ñ?ови:"
 
 msgctxt "NetworkPage"
 msgid "80, 443"
-msgstr ""
+msgstr "80, 443"
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
-msgstr ""
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
+msgstr "Ð?знаÑ?иÑ?е да биÑ?Ñ?е Ñ?иÑ?Ñ?овали заÑ?Ñ?еве за лиÑ?Ñ?ингом и, опÑ?ионо, коÑ?иÑ?Ñ?или моÑ?Ñ?ове Ñ?елеÑ?е да Ñ?е пÑ?иÑ?Ñ?Ñ?пиÑ?е Tor мÑ?ежи"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
-msgstr ""
+msgstr "Ð?оÑ? Ð?нÑ?еÑ?неÑ? СеÑ?виÑ? Ð?Ñ?оваÑ?деÑ? блокиÑ?а везе на ТоÑ? мÑ?ежи"
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
+msgstr "Ð?одеÑ?аваÑ?а моÑ?Ñ?а"
 
 msgctxt "NetworkPage"
 msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
+msgstr "Ð?одаÑ? моÑ?Ñ?:"
 
 msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
-msgstr ""
+msgstr "Уклони изабÑ?ане моÑ?Ñ?ови Ñ?а лиÑ?Ñ?е"
 
 msgctxt "NetworkPage"
 msgid "Copy the selected bridges to the clipboard"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ? обележене моÑ?Ñ?ове на clipboard"
 
 msgctxt "NetworkPage"
 msgid "Find Bridges Now"
-msgstr ""
+msgstr "Ð?Ñ?онаÑ?и Ð?оÑ?Ñ?ови Сада"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Ð?ако Ñ?оÑ? могÑ? да пÑ?онаÑ?ем моÑ?Ñ?ове?</a>"
 
 msgctxt "NetworkPage"
 msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Ð?ако могÑ? да пÑ?онаÑ?ем моÑ?Ñ?ове?</a>"
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
-msgstr ""
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr "Ð?ема новиÑ? моÑ?Ñ?ова коÑ?и Ñ?Ñ? Ñ?Ñ?енÑ?Ñ?но доÑ?Ñ?Ñ?пни. Ð?ожеÑ?е да Ñ?аÑ?екаÑ?е и покÑ?Ñ?аÑ?е поново, или пÑ?обаÑ?Ñ?е дÑ?Ñ?ги меÑ?од за пÑ?оналажеÑ?е новиÑ? моÑ?Ñ?ова."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
+msgstr "Ð?ликниÑ?е на дÑ?гме Ð?омоÑ? да биÑ?Ñ?е видели дÑ?Ñ?ге меÑ?оде за пÑ?оналажеÑ?е новиÑ? моÑ?Ñ?ова."
 
-msgctxt "Policy"
-msgid "accept"
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr "Adresa:"
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr "Tip:"
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr "Morate izabrati tip proxya."
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
+msgid "accept"
+msgstr "пÑ?иÑ?ваÑ?иÑ?и"
+
+msgctxt "Policy"
 msgid "reject"
-msgstr ""
+msgstr "одбиÑ?и"
 
 msgctxt "RouterDescriptor"
 msgid "Online"
-msgstr ""
+msgstr "Ð?а вези"
 
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
-msgstr ""
+msgstr "ХибеÑ?наÑ?иÑ?а"
 
 msgctxt "RouterDescriptor"
 msgid "Offline"
-msgstr ""
+msgstr "Ð?Ñ?лаÑ?н"
 
 msgctxt "RouterDescriptorView"
 msgid "Location:"
-msgstr ""
+msgstr "Ð?окаÑ?иÑ?а:"
 
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
-msgstr ""
+msgstr "Ð?Ð? адÑ?еÑ?а:"
 
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
-msgstr ""
+msgstr "Ð?лаÑ?Ñ?оÑ?ма:"
 
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Ð?Ñ?оÑ?ок:"
 
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
-msgstr ""
+msgstr "Ð?Ñ?еме Ñ?ада:"
 
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
-msgstr ""
+msgstr "Ð?оÑ?ледÑ?и пÑ?Ñ? ажÑ?Ñ?иÑ?ано:"
 
 msgctxt "RouterDescriptorView"
 msgid "Copy"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ?"
 
 msgctxt "RouterInfoDialog"
 msgid "Hibernating"
-msgstr ""
+msgstr "ХибеÑ?наÑ?иÑ?а"
 
 msgctxt "RouterInfoDialog"
 msgid "Online"
-msgstr ""
+msgstr "Ð?нлаÑ?н"
 
 msgctxt "RouterInfoDialog"
 msgid "Offline"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?алн"
 
 msgctxt "RouterInfoDialog"
 msgid "Unknown"
-msgstr ""
+msgstr "Ð?епознаÑ?о"
 
 msgctxt "RouterInfoDialog"
 msgid "Relay Details"
-msgstr ""
+msgstr "Ð?еÑ?аÑ?и Ñ?елеÑ?а"
 
 msgctxt "RouterInfoDialog"
 msgid "Summary"
-msgstr ""
+msgstr "Резиме"
 
 msgctxt "RouterInfoDialog"
 msgid "Name:"
-msgstr ""
+msgstr "Ð?ме:"
 
 msgctxt "RouterInfoDialog"
 msgid "Status:"
-msgstr ""
+msgstr "СÑ?аÑ?Ñ?Ñ?:"
 
 msgctxt "RouterInfoDialog"
 msgid "Location:"
-msgstr ""
+msgstr "Ð?окаÑ?иÑ?а:"
 
 msgctxt "RouterInfoDialog"
 msgid "IP Address:"
-msgstr ""
+msgstr "Ð?Ð? адÑ?еÑ?а:"
 
 msgctxt "RouterInfoDialog"
 msgid "Platform:"
-msgstr ""
+msgstr "Ð?лаÑ?Ñ?оÑ?ма:"
 
 msgctxt "RouterInfoDialog"
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Ð?Ñ?оÑ?ок:"
 
 msgctxt "RouterInfoDialog"
 msgid "Uptime:"
-msgstr ""
+msgstr "Ð?Ñ?еме Ñ?ада:"
 
 msgctxt "RouterInfoDialog"
 msgid "Contact:"
-msgstr ""
+msgstr "Ð?онÑ?акÑ?:"
 
 msgctxt "RouterInfoDialog"
 msgid "Last Updated:"
-msgstr ""
+msgstr "Ð?оÑ?ледÑ?и пÑ?Ñ? ажÑ?Ñ?иÑ?ано:"
 
 msgctxt "RouterInfoDialog"
 msgid "Descriptor"
-msgstr ""
+msgstr "Ð?пиÑ?иваÑ?"
 
 msgctxt "RouterListItem"
 msgid "Offline"
-msgstr ""
+msgstr "Ð?Ñ?лаÑ?н"
 
 msgctxt "RouterListItem"
 msgid "Hibernating"
-msgstr ""
+msgstr "ХибеÑ?наÑ?иÑ?а"
 
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s "
 
 msgctxt "RouterListWidget"
 msgid "Relay"
-msgstr ""
+msgstr "РелеÑ?"
 
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
-msgstr ""
+msgstr "Ð?Ñ?миÑ?аÑ? на Ñ?елеÑ?"
 
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
-msgstr ""
+msgstr "%1 Ñ?елеÑ?а Ñ?Ñ? онлаÑ?н"
 
 msgctxt "RouterListWidget"
 msgid "Copy"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ?"
 
 msgctxt "RouterListWidget"
 msgid "Nickname"
-msgstr ""
+msgstr "Ð?адимак"
 
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
-msgstr ""
+msgstr "Ð?Ñ?иÑ?ак пÑ?Ñ?Ñ?а"
 
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
-msgstr ""
+msgstr "Ð?ема подÑ?Ñ?ке за моÑ?Ñ?ове"
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
-msgstr ""
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
+msgstr "Ð?одеÑ?или Ñ?Ñ?е Tor да Ñ?ади као моÑ?Ñ? Ñ?елеÑ? за Ñ?ензÑ?Ñ?иÑ?ане коÑ?иÑ?нике, али ваÑ?а веÑ?зиÑ?а Tor-а не подÑ?жава моÑ?Ñ?ове."
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
-msgstr ""
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
+msgstr "Ð?олимо ваÑ? да надогÑ?адиÑ?е ваÑ? Tor Ñ?оÑ?Ñ?веÑ? или да подеÑ?иÑ?е Tor да Ñ?ади као обиÑ?ан Ñ?елеÑ?."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
-msgstr ""
+msgstr "Ð?аÑ? моÑ?Ñ? Ñ?елеÑ? не Ñ?ади."
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr ""
+msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и баÑ? надимак Ñ?елеÑ?а и поÑ?Ñ?."
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
+msgstr "Ð?окÑ?ени Ñ?амо као клиÑ?енÑ?"
 
 msgctxt "ServerPage"
 msgid "Relay Port:"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ови за пÑ?оÑ?леÑ?иваÑ?е:"
 
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
-msgstr ""
+msgstr "OmoguÄ?i da bi linkovao oslanjajuci direktorijum"
 
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
-msgstr ""
+msgstr "Ð?окÑ?Ñ?аÑ? аÑ?Ñ?омаÑ?Ñ?ки да подеÑ?иÑ? пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ова"
 
 msgctxt "ServerPage"
 msgid "Test"
-msgstr ""
+msgstr "ТеÑ?Ñ?"
 
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
-msgstr ""
+msgstr "Ð?Ñ?икажи помоÑ? за пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ова"
 
 msgctxt "ServerPage"
 msgid "Directory Port:"
-msgstr ""
+msgstr "Ð?оÑ?Ñ? лиÑ?Ñ?инга:"
 
 msgctxt "ServerPage"
 msgid "Directory Port Number"
-msgstr ""
+msgstr "Ð?Ñ?оÑ? поÑ?Ñ?а за лиÑ?Ñ?инг"
 
 msgctxt "ServerPage"
 msgid "Contact Info:"
-msgstr ""
+msgstr "Ð?онÑ?акÑ? инÑ?о:"
 
 msgctxt "ServerPage"
 msgid "Name of your relay"
-msgstr ""
+msgstr "Ð?ме ваÑ?ег Ñ?елеÑ?а"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
+msgstr "Ð?оÑ?Ñ? пÑ?еко ког коÑ?иÑ?ниÑ?и и дÑ?Ñ?ги Ñ?елеÑ?и комÑ?ниÑ?иÑ?аÑ?Ñ? Ñ?а ваÑ?им Ñ?елеÑ?ом"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
-msgstr ""
+msgstr "Ð?адимак:"
 
 msgctxt "ServerPage"
 msgid "Basic Settings"
-msgstr ""
+msgstr "Ð?Ñ?новна подеÑ?аваÑ?а"
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
-msgstr ""
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
+msgstr "Ð?а инÑ?еÑ?неÑ? везе Ñ?а бÑ?зим download-ом, а Ñ?поÑ?им upload-ом, молимо наведиÑ?е бÑ?зинÑ? ваÑ?ег upload-а."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
-msgstr ""
+msgstr "Cable/DSL 256 Kbps "
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
-msgstr ""
+msgstr "Cable/DSL 512 Kbps "
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
-msgstr ""
+msgstr "Cable/DSL 768 Kbps "
 
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr ""
+msgstr "T1/Cable/DSL 1.5 Mbps "
 
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
-msgstr ""
+msgstr "> 1.5 Mbps "
 
 msgctxt "ServerPage"
 msgid "Custom"
-msgstr ""
+msgstr "РÑ?Ñ?но Ñ?пиÑ?иваÑ?е"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
+msgstr "Ð?забеÑ?иÑ?е Ñ?ноÑ? коÑ?и Ñ?е наÑ?Ñ?лиÑ?ниÑ?и ваÑ?оÑ? инÑ?еÑ?неÑ? конекÑ?иÑ?и"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
-msgstr ""
+msgstr "Ð?Ñ?икажи помоÑ? за лимиÑ? пÑ?оÑ?ока"
 
 msgctxt "ServerPage"
 msgid "Average Rate"
-msgstr ""
+msgstr "Ð?Ñ?оÑ?еÑ?на Ñ?Ñ?опа"
 
 msgctxt "ServerPage"
 msgid "Long-term average bandwidth limit"
-msgstr ""
+msgstr "Ð?Ñ?гоÑ?оÑ?ни Ñ?Ñ?едÑ?и лимиÑ? за пÑ?оÑ?ок"
 
 msgctxt "ServerPage"
 msgid "KB/s"
-msgstr ""
+msgstr "KB/s "
 
 msgctxt "ServerPage"
 msgid "Maximum Rate"
-msgstr ""
+msgstr "Ð?аÑ?веÑ?а бÑ?зина"
 
 msgctxt "ServerPage"
 msgid "Peak bandwidth rate limit"
-msgstr ""
+msgstr "Ð?имиÑ? Ñ?пиÑ?а пÑ?оÑ?ока"
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Ð?аÑ?а макÑ?имална Ñ?Ñ?опа пÑ?опÑ?Ñ?ног опÑ?ега моÑ?а биÑ?и веÑ?а или Ñ?еднака ваÑ?оÑ? пÑ?оÑ?еÑ?ноÑ? Ñ?Ñ?опи пÑ?опÑ?Ñ?ног опÑ?ега. Ð?бе вÑ?едноÑ?Ñ?и моÑ?аÑ?Ñ? биÑ?и наÑ?маÑ?е 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Ð?гÑ?аниÑ?еÑ?а пÑ?опÑ?Ñ?ног опÑ?ега"
 
 msgctxt "ServerPage"
 msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ови 6660 - 6669 и 6697"
 
 msgctxt "ServerPage"
 msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "Internet Relay Chat (IRC)"
 
 msgctxt "ServerPage"
 msgid "Ports 110, 143, 993 and 995"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ови 110, 143, 993 и 995"
 
 msgctxt "ServerPage"
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зми поÑ?Ñ?Ñ? (Ð?Ð?Ð?, Ð?Ð?Ð?Ð?)"
 
 msgctxt "ServerPage"
 msgid "Ports unspecified by other checkboxes"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ови коÑ?и ниÑ?Ñ? наведени Ñ? дÑ?Ñ?гим кÑ?Ñ?иÑ?ама"
 
 msgctxt "ServerPage"
 msgid "Misc Other Services"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?ги Ñ?еÑ?виÑ?и"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
+msgstr "Ð?оÑ?Ñ?ови 706, 1863, 5050, 5190, 5222, 5223, 8300 и 8888"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "Instant Messaging (IM)"
 
 msgctxt "ServerPage"
 msgid "Port 443"
-msgstr ""
+msgstr "Ð?оÑ?Ñ? 443"
 
 msgctxt "ServerPage"
 msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "Ð?езбедни СаÑ?Ñ?ови (ССÐ?)"
 
 msgctxt "ServerPage"
 msgid "Port 80"
-msgstr ""
+msgstr "Ð?оÑ?Ñ? 80"
 
 msgctxt "ServerPage"
 msgid "Websites"
-msgstr ""
+msgstr "СаÑ?Ñ?ови"
 
 msgctxt "ServerPage"
 msgid "Show help topic on exit policies"
-msgstr ""
+msgstr "Ð?Ñ?икажи помоÑ? за излазна подеÑ?аваÑ?а"
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
-msgstr ""
+msgid ""
+"What Internet resources should users be able to access from your relay?"
+msgstr "Ð?оÑ?им инÑ?еÑ?неÑ? Ñ?еÑ?Ñ?Ñ?Ñ?има Ñ?е коÑ?иÑ?ниÑ?и моÑ?и да пÑ?иÑ?Ñ?Ñ?пе пÑ?еко ваÑ?ег Ñ?елеÑ?а?"
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
-msgstr ""
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
+msgstr "Tor Ñ?е ипак да блокиÑ?а неке одлазне меÑ?лове и пÑ?огÑ?аме за деÑ?еÑ?е Ñ?аÑ?лова како би Ñ?е Ñ?маÑ?ио Ñ?пам и дÑ?Ñ?ге злоÑ?поÑ?Ñ?ебе."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
-msgstr ""
+msgstr "Ð?злазна подеÑ?аваÑ?а"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
+msgstr "Ð?озволиÑ?е дÑ?Ñ?гима да пÑ?иÑ?Ñ?Ñ?пе ваÑ?ем моÑ?Ñ?Ñ?, даÑ?Ñ?Ñ?и им овÑ? линиÑ?Ñ?:"
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
+msgstr "Ð?во Ñ?е иденÑ?иÑ?еÑ? ваÑ?ег моÑ?Ñ?а Ñ?елеÑ?а коÑ?и можеÑ?е да даÑ?е дÑ?Ñ?гим Ñ?Ñ?дима"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ? иденÑ?иÑ?еÑ? ваÑ?ег Ñ?елеÑ?а на clipboard"
 
 msgctxt "ServerPage"
 msgid "No Recent Usage"
-msgstr ""
+msgstr "Ð?иÑ?е било Ñ?коÑ?иÑ?е Ñ?поÑ?Ñ?ебе"
 
 msgctxt "ServerPage"
 msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "Ð?и Ñ?едан клиÑ?енÑ? ниÑ?е коÑ?иÑ?Ñ?ио ваÑ? Ñ?елеÑ? Ñ? Ñ?коÑ?иÑ?е вÑ?еме."
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
-msgstr ""
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
+msgstr "Ð?Ñ?Ñ?авиÑ?е ваÑ? Ñ?елеÑ? да Ñ?ади како би клиÑ?енÑ?и имали могÑ?Ñ?ноÑ?Ñ? да га пÑ?онаÑ?Ñ? и коÑ?иÑ?Ñ?е."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?оÑ?иÑ?а моÑ?Ñ?а"
 
 msgctxt "ServerPage"
 msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да пÑ?еÑ?зме иÑ?Ñ?оÑ?иÑ?Ñ? коÑ?иÑ?Ñ?еÑ?а ваÑ?ег моÑ?Ñ?а."
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
-msgstr ""
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
+msgstr "Tor Ñ?е поÑ?лао непÑ?опиÑ?но Ñ?Ñ?еÑ?ен одговоÑ? када Ñ?е Vidalia заÑ?Ñ?ажила иÑ?Ñ?оÑ?иÑ?аÑ? коÑ?иÑ?Ñ?еÑ?а ваÑ?ег моÑ?Ñ?а."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
-msgstr ""
+msgstr "Ð?оÑ?лаÑ? одговоÑ? Ñ?е: %1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
+msgstr "Ð?омоÑ? Ñ?ензÑ?Ñ?иÑ?аним коÑ?иÑ?ниÑ?има да доÑ?Ñ? до ТоÑ? мÑ?еже"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">Ð?о Ñ?е коÑ?иÑ?Ñ?ио моÑ? моÑ?Ñ??</a>"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr "<a href=\"#bridgeHelp\">Å ta je ovo?</a>"
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr "Automatski distribuiraj adresu mog bridža"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid "Mirror the Relay Directory"
+msgstr "Linkuj relejni direktorijum"
+
+msgctxt "ServerPage"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
+msgstr "Ð?маил адÑ?еÑ?а на коÑ?Ñ? можемо да ваÑ? конÑ?акÑ?иÑ?амо Ñ?колико поÑ?Ñ?оÑ?и пÑ?облем Ñ?а ваÑ?им Ñ?елеÑ?ом. ТакоÑ?е можеÑ?е да додаÑ?е ваÑ? PGP или GPG поÑ?пиÑ?."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
-msgstr ""
+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 ""
+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 ""
+msgstr "Ð?Ñ?еÑ?ка"
 
 msgctxt "ServicePage"
 msgid "Please select a Service."
-msgstr ""
+msgstr "Ð?олимо Ð?аÑ? да изабеÑ?еÑ?е Ñ?еÑ?виÑ?."
 
 msgctxt "ServicePage"
 msgid "Select Service Directory"
-msgstr ""
+msgstr "Ð?забеÑ?и лиÑ?Ñ?инг Ñ?еÑ?виÑ?а"
 
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
+msgstr "Ð?иÑ?Ñ?Ñ?елни поÑ?Ñ? може да Ñ?адÑ?жи Ñ?амо Ñ?Ñ?едне бÑ?оÑ?еве поÑ?Ñ?а [1 .. 65535]."
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
+msgstr "ЦилÑ? може да Ñ?адÑ?жи Ñ?амо адÑ?еÑ?Ñ?:поÑ?Ñ?, адÑ?еÑ?Ñ? или поÑ?Ñ?."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
-msgstr ""
+msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м Ñ?е веÑ? Ñ? Ñ?поÑ?Ñ?еби од Ñ?Ñ?Ñ?ане дÑ?Ñ?гог Ñ?еÑ?виÑ?а."
 
 msgctxt "ServicePage"
 msgid "Form"
-msgstr ""
+msgstr "Ð?бÑ?азаÑ?"
 
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
-msgstr ""
+msgstr "Ð?онÑ?Ñ?ени Ñ?кÑ?ивени Ñ?еÑ?виÑ?и"
 
 msgctxt "ServicePage"
 msgid "Onion Address"
-msgstr ""
+msgstr "Onion адÑ?еÑ?а"
 
 msgctxt "ServicePage"
 msgid "Virtual Port"
-msgstr ""
+msgstr "Ð?иÑ?Ñ?Ñ?елни Ð?оÑ?Ñ?"
 
 msgctxt "ServicePage"
 msgid "Target"
-msgstr ""
+msgstr "ЦиÑ?"
 
 msgctxt "ServicePage"
 msgid "Directory Path"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?аÑ?а диÑ?екÑ?оÑ?иÑ?Ñ?ма"
 
 msgctxt "ServicePage"
 msgid "Enabled"
-msgstr ""
+msgstr "Ð?могÑ?Ñ?ено"
 
 msgctxt "ServicePage"
 msgid "Add new service to list"
-msgstr ""
+msgstr "Ð?одаÑ? нови Ñ?еÑ?виÑ? на лиÑ?Ñ?Ñ?"
 
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
-msgstr ""
+msgstr "Уклони изабÑ?ане Ñ?Ñ?лÑ?ге Ñ?а лиÑ?Ñ?е"
 
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
-msgstr ""
+msgstr "Ð?опиÑ?аÑ? onion адÑ?еÑ?Ñ? изабÑ?аног Ñ?еÑ?виÑ?а на clipboard"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
+msgstr "Ð?огледаÑ?Ñ?е Ñ? локалном Ñ?иÑ?Ñ?емÑ? даÑ?оÑ?ека и изабеÑ?иÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м за одабÑ?ане Ñ?Ñ?лÑ?ге"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
+msgstr "Ð?Ñ?еиÑ?ано од ТоÑ?-а"
+
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr "Kopiraj u Clipboard"
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr "Tor je pokrenut"
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr "Trenutno koristite \"%1\"  verziju Tor softwera"
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr "Tor softwer nije pokrenut"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr "Klikni \"Pokreni Tor\" u Vidalia Kontrolnoj Tabli da bi restartovali Tor Softwer. Ako je Tor izaÅ¡ao neoÄ?ekivano, izaberite \"Napredni\" tab iznad za detalje o bilo kakvoj greÅ¡ci."
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr "Trenutno koristite verziju \"%1\" Tor softwera koja viÅ¡e nije preporuÄ?ljiva. Molimo ažurirajte na naj noviju verziju softwera koja možda sadrži važne bezbednosne zakrpe."
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr "Trenutno koristite verziju \"%1\" Tor softwera, koji možda neradi sa Tor mrežom. Molimo ažurirajte na naj noviju verziju ovog softwera koja možda sadrži važne bezbednosne zakrpe."
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr "Vaš Tor softwer nije ažuran"
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr "Povezani ste na Tor mrežu"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr "Uspešno smo uspostavili vezu ka Tor mreži. Sada možete konfigurisati vaše aplikacije da bi ste koristili internet anonimno."
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr "Greška sa Tor softwerom"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr "Ð?Ñ?овеÑ?а доÑ?Ñ?пноÑ?Ñ?и поÑ?Ñ?а Ñ?еÑ?веÑ?а"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr "Tor пÑ?овеÑ?ава да ли Ñ?е Ñ?еÑ?веÑ? поÑ?Ñ? ваÑ?ег Ñ?елеÑ?а доÑ?Ñ?Ñ?пан Ñ?а Tor мÑ?еже повезиваÑ?ем на  %1:%2. Ð?ваÑ? Ñ?еÑ?Ñ? може поÑ?Ñ?аÑ?аÑ?и неколико минÑ?Ñ?а."
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr "ТеÑ?Ñ? доÑ?Ñ?Ñ?пноÑ?Ñ?и Ñ?еÑ?веÑ? поÑ?Ñ?а Ñ?е Ñ?Ñ?пеÑ?ан!"
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr "СеÑ?веÑ? поÑ?Ñ? ваÑ?ег Ñ?елеÑ?а Ñ?е доÑ?Ñ?Ñ?пан Ñ?а Tor мÑ?еже!"
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr "ТеÑ?Ñ? доÑ?Ñ?пноÑ?Ñ?и Ñ?еÑ?веÑ? поÑ?Ñ?а ниÑ?е Ñ?Ñ?пеÑ?ан"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr "СеÑ?веÑ? поÑ?Ñ? ваÑ?ег Ñ?елеÑ?а ниÑ?е доÑ?Ñ?Ñ?пан дÑ?Ñ?гим Tor клиÑ?енÑ?има. Ð?во Ñ?е деÑ?ава ако коÑ?иÑ?Ñ?иÑ?е Ñ?Ñ?Ñ?еÑ? или firewall коÑ?и заÑ?Ñ?ева да подеÑ?иÑ?е пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ова. Ð?ко %1:%2 ниÑ?Ñ? ваÑ?а IP адÑ?еÑ?а и Ñ?еÑ?веÑ? поÑ?Ñ?, пÑ?овеÑ?иÑ?е подеÑ?аваÑ?а ваÑ?ег Ñ?елеÑ?а."
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr "Ð?Ñ?овеÑ?а доÑ?Ñ?пноÑ?Ñ?и поÑ?Ñ?а за лиÑ?Ñ?инг"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr "Tor пÑ?овеÑ?ава да ли Ñ?е поÑ?Ñ? за лиÑ?Ñ?инг ваÑ?ег Ñ?елеÑ?а доÑ?Ñ?Ñ?пан из Tor мÑ?еже повезиваÑ?ем на %1:%2. Ð?ваÑ? Ñ?еÑ?Ñ? моÑ?е поÑ?Ñ?аÑ?аÑ?и неколико минÑ?Ñ?а."
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr "ТеÑ?Ñ? доÑ?Ñ?Ñ?пноÑ?Ñ?и поÑ?Ñ?а за лиÑ?Ñ?инг Ñ?е Ñ?Ñ?пеÑ?ан!"
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr "Ð?оÑ?Ñ? за лиÑ?Ñ?инг ваÑ?ег Ñ?елеÑ?а Ñ?е доÑ?Ñ?Ñ?пан Ñ?а Tor мÑ?еже!"
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr "ТеÑ?Ñ? доÑ?Ñ?Ñ?пноÑ?Ñ?и поÑ?Ñ?а за лиÑ?Ñ?инг ниÑ?е Ñ?Ñ?пеÑ?ан"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr "Ð?оÑ?Ñ? за лиÑ?Ñ?инг ваÑ?ег Ñ?елеÑ?а ниÑ?е доÑ?Ñ?Ñ?пан дÑ?Ñ?гим Tor клиÑ?енÑ?има. Ð?во Ñ?е деÑ?ава ако коÑ?иÑ?Ñ?иÑ?е Ñ?Ñ?Ñ?еÑ? или firewall коÑ?и заÑ?Ñ?ева да подеÑ?иÑ?е пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ова. Ð?ко %1:%2 ниÑ?Ñ? ваÑ?а IP адÑ?еÑ?а и поÑ?Ñ? за лиÑ?Ñ?инг, пÑ?овеÑ?иÑ?е подеÑ?аваÑ?а ваÑ?ег Ñ?елеÑ?а."
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr "Ð?пиÑ?иваÑ? Ñ?елеÑ?а ниÑ?е пÑ?иÑ?ваÑ?ен"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr "Ð?пиÑ?иваÑ? ваÑ?ег Ñ?елеÑ?а, коÑ?и омогÑ?Ñ?ава клиÑ?енÑ?има да Ñ?е повежÑ? на ваÑ? Ñ?елеÑ?, ниÑ?е пÑ?иÑ?ваÑ?ен од Ñ?Ñ?Ñ?ане Ñ?еÑ?веÑ?а за лиÑ?Ñ?инг на %1:%2. Ð?аведен Ñ?е Ñ?азлог: %3"
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr "Ð?аÑ? Ñ?елеÑ? Ñ?е онлаÑ?н"
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr "Ð?аÑ? Ñ?елеÑ? Ñ?е Ñ?ада онлаÑ?н и доÑ?Ñ?Ñ?пан Ñ?е Tor клиÑ?енÑ?има на коÑ?иÑ?Ñ?еÑ?е. Ð?Ñ?имеÑ?иÑ?еÑ?е повеÑ?аÑ?е мÑ?ежног Ñ?аобÑ?аÑ?аÑ?а на гÑ?аÑ?иконÑ? пÑ?оÑ?ока Ñ? Ñ?окÑ? од паÑ? Ñ?аÑ?и како клиÑ?енÑ?и бÑ?дÑ? пÑ?оналазили ваÑ? Ñ?елеÑ?. Хвала за допÑ?иноÑ?Ñ? Tor мÑ?ежи!"
+
 msgctxt "Stream"
 msgid "New"
-msgstr ""
+msgstr "Ð?ови"
 
 msgctxt "Stream"
 msgid "Resolving"
-msgstr ""
+msgstr "РеÑ?аваÑ?е"
 
 msgctxt "Stream"
 msgid "Connecting"
-msgstr ""
+msgstr "Ð?овезиваÑ?е"
 
 msgctxt "Stream"
 msgid "Open"
-msgstr ""
+msgstr "Ð?Ñ?воÑ?ено"
 
 msgctxt "Stream"
 msgid "Failed"
-msgstr ""
+msgstr "Ð?иÑ?е Ñ?Ñ?пело"
 
 msgctxt "Stream"
 msgid "Closed"
-msgstr ""
+msgstr "Ð?аÑ?воÑ?ено"
 
 msgctxt "Stream"
 msgid "Retrying"
-msgstr ""
+msgstr "Ð?оновно"
 
 msgctxt "Stream"
 msgid "Remapped"
-msgstr ""
+msgstr "Remapirano"
 
 msgctxt "Stream"
 msgid "Unknown"
-msgstr ""
+msgstr "Ð?епознаÑ?о"
 
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
-msgstr ""
+msgstr "Ð?Ñ?оÑ?еÑ? %1 ниÑ?е Ñ?Ñ?пео да Ñ?е заÑ?Ñ?Ñ?ави. [%2]"
 
 msgctxt "TorService"
 msgid "The Tor service is not installed."
-msgstr ""
+msgstr "ТоÑ? Ñ?еÑ?виÑ? ниÑ?е инÑ?Ñ?алиÑ?ан."
 
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
-msgstr ""
+msgstr "Ð?иÑ?е могÑ?Ñ?е поÑ?еÑ?и ТоÑ? Ñ?Ñ?лÑ?гÑ?."
 
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
+msgstr "ХаÑ?иÑ?аÑ?е конÑ?Ñ?олне Ñ?иÑ?Ñ?е ниÑ?е Ñ?Ñ?пело."
+
+msgctxt "TorrcDialog"
+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 "Ð?Ñ?еÑ?и"
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr "Ð?опиÑ?аÑ?"
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
 msgstr ""
 
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 "Ð?Ñ?еÑ?ка"
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке пÑ?и оÑ?ваÑ?аÑ?Ñ? torrc Ñ?аÑ?ла"
+
 msgctxt "UPNPControl"
 msgid "Success"
-msgstr ""
+msgstr "УÑ?пеÑ?но"
 
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Ð?иÑ?Ñ? пÑ?онаÑ?ени UPnP Ñ?Ñ?еÑ?аÑ?и"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
+msgstr "No valid UPnP-enabled Internet gateway devices found"
 
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
-msgstr ""
+msgstr "WSAPokretanje nije uspelo"
 
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
-msgstr ""
+msgstr "Ð?иÑ?е Ñ?Ñ?пело додаваÑ?е пÑ?оÑ?леÑ?иваÑ?а поÑ?Ñ?ова"
 
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
-msgstr ""
+msgstr "Ð?иÑ?е Ñ?Ñ?пело пÑ?еÑ?зимаÑ?е пÑ?оÑ?леÑ?иваÑ?а поÑ?Ñ?ова"
 
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
-msgstr ""
+msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?клаÑ?аÑ?е пÑ?оÑ?леÑ?иваÑ?а поÑ?Ñ?ова"
 
 msgctxt "UPNPControl"
 msgid "Unknown error"
-msgstr ""
+msgstr "Ð?епознаÑ?а гÑ?еÑ?ка"
 
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
-msgstr ""
+msgstr "ТÑ?ажим UPnP Ñ?Ñ?еÑ?аÑ?е..."
 
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
-msgstr ""
+msgstr "Ð?Ñ?вежавам мапиÑ?аÑ?е лиÑ?Ñ?инг поÑ?Ñ?а"
 
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
-msgstr ""
+msgstr "Ð?Ñ?вежавам мапиÑ?аÑ?е Ñ?елеÑ?ног поÑ?Ñ?а"
 
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
-msgstr ""
+msgstr "ТеÑ?Ñ? Ñ?е Ñ?Ñ?пеÑ?но извÑ?Ñ?ен!"
 
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
-msgstr ""
+msgstr "ТеÑ?Ñ?иÑ?аÑ?е UPnP подÑ?Ñ?ке"
 
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
-msgstr ""
+msgstr "ТеÑ?Ñ?иÑ?ам Universal Plug & Play подÑ?Ñ?кÑ?"
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
-msgstr ""
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да пÑ?овеÑ?и доÑ?Ñ?Ñ?пне надогÑ?адÑ?е Ñ?оÑ?Ñ?веÑ?а Ñ?еÑ? ниÑ?е могла да пÑ?онаÑ?е '%1'."
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
-msgstr ""
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr "Vidalia ниÑ?е Ñ?Ñ?пела да пÑ?овеÑ?и доÑ?Ñ?Ñ?пне надогÑ?адÑ?е Ñ?оÑ?Ñ?веÑ?а Ñ?еÑ? Ñ?е Tor-ов пÑ?оÑ?еÑ? за надогÑ?адÑ?Ñ? неоÑ?екивано пÑ?екинÑ?Ñ?."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
-msgstr ""
+msgstr "Ð?Ñ?овеÑ?а доÑ?Ñ?Ñ?пниÑ? ажÑ?Ñ?иÑ?аÑ?а ..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Hide"
-msgstr ""
+msgstr "СакÑ?иÑ?"
 
 msgctxt "UpdateProgressDialog"
 msgid "Downloading updates..."
-msgstr ""
+msgstr "Ð?Ñ?еÑ?зимаÑ?е иÑ?пÑ?авки ..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Installing updated software..."
-msgstr ""
+msgstr "Ð?нÑ?Ñ?алиÑ?аÑ?е ажÑ?Ñ?иÑ?аног Ñ?оÑ?Ñ?веÑ?а ..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "Ð?оÑ?ово! Ð?аÑ? Ñ?оÑ?Ñ?веÑ? Ñ?е ажÑ?Ñ?иÑ?ан."
 
 msgctxt "UpdateProgressDialog"
 msgid "OK"
-msgstr ""
+msgstr "У Ñ?едÑ?"
 
 msgctxt "UpdateProgressDialog"
 msgid "Software Updates"
-msgstr ""
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е Ñ?оÑ?Ñ?веÑ?а"
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for updates..."
-msgstr ""
+msgstr "Ð?Ñ?овеÑ?авам надогÑ?адÑ?е..."
 
 msgctxt "UpdateProgressDialog"
 msgid "Cancel"
-msgstr ""
+msgstr "Ð?Ñ?казаÑ?и"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Software Updates Available"
-msgstr ""
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е Ñ?оÑ?Ñ?веÑ?а доÑ?Ñ?Ñ?пно"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Remind Me Later"
-msgstr ""
+msgstr "Ð?одÑ?еÑ?и ме каÑ?ниÑ?е"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Install"
-msgstr ""
+msgstr "Ð?нÑ?Ñ?алиÑ?аÑ?и"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "The following updated software packages are ready for installation:"
-msgstr ""
+msgstr "СледеÑ?и ажÑ?Ñ?иÑ?ани Ñ?оÑ?Ñ?веÑ?Ñ?ки пакеÑ?и Ñ?Ñ? Ñ?пÑ?емни за инÑ?Ñ?алаÑ?иÑ?Ñ?:"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Package"
-msgstr ""
+msgstr "Ð?акеÑ?"
 
 msgctxt "UpdatesAvailableDialog"
 msgid "Version"
-msgstr ""
+msgstr "Ð?еÑ?зиÑ?а"
 
 msgctxt "VMessageBox"
 msgid "OK"
-msgstr ""
+msgstr "У Ñ?едÑ?"
 
 msgctxt "VMessageBox"
 msgid "Cancel"
-msgstr ""
+msgstr "Ð?Ñ?казаÑ?и"
 
 msgctxt "VMessageBox"
 msgid "Yes"
-msgstr ""
+msgstr "Ð?а"
 
 msgctxt "VMessageBox"
 msgid "No"
-msgstr ""
+msgstr "Ð?ема"
 
 msgctxt "VMessageBox"
 msgid "Help"
-msgstr ""
+msgstr "Ð?омоÑ?"
 
 msgctxt "VMessageBox"
 msgid "Retry"
-msgstr ""
+msgstr "Ð?окÑ?Ñ?аÑ? поново"
 
 msgctxt "VMessageBox"
 msgid "Show Log"
-msgstr ""
+msgstr "Ð?пÑ?икажи запиÑ?ник"
 
 msgctxt "VMessageBox"
 msgid "Show Settings"
-msgstr ""
+msgstr "Ð?Ñ?икажи Ð?одеÑ?аваÑ?а"
 
 msgctxt "VMessageBox"
 msgid "Continue"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?авиÑ?и"
 
 msgctxt "VMessageBox"
 msgid "Quit"
-msgstr ""
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?иÑ?и"
 
 msgctxt "VMessageBox"
 msgid "Browse"
-msgstr ""
+msgstr "Ð?Ñ?еÑ?Ñ?ажиÑ?и"
 
 msgctxt "Vidalia"
 msgid "Invalid Argument"
-msgstr ""
+msgstr "Ð?еодговаÑ?аÑ?Ñ?Ñ?и аÑ?гÑ?менÑ?"
 
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
-msgstr ""
+msgstr "Ð?идалиа Ñ?е веÑ? покÑ?енÑ?Ñ?"
 
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
-msgstr ""
+msgstr "Prikaži ovu poruku, a zatim izaÄ?i"
 
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
-msgstr ""
+msgstr "РеÑ?еÑ?Ñ?Ñ?е Ñ?ва Ñ?аÑ?Ñ?вана Ð?идалиа подеÑ?аваÑ?а."
 
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
+msgstr "Ð?одеÑ?ава диÑ?екÑ?оÑ?иÑ?Ñ?м коÑ?ег Vidalia коÑ?иÑ?Ñ?и за Ñ?меÑ?Ñ?аÑ?е подаÑ?ака."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
+msgstr "Ð?одеÑ?ава име и локаÑ?иÑ?Ñ? Vidalia \"pidfile\"-а."
 
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
+msgstr "Ð?одеÑ?ава име и локаÑ?иÑ?Ñ? Vidalia запиÑ?ника."
 
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
+msgstr "Ð?одеÑ?ава опÑ?иÑ?ноÑ?Ñ? Vidalia запиÑ?ника."
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
-msgstr ""
+msgstr "СеÑ?ови Ð?идалиа инÑ?еÑ?Ñ?еÑ?Ñ? Ñ?Ñ?ила."
 
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
-msgstr ""
+msgstr "Ð?одеÑ?ава Ñ?език за Vidalia-Ñ?."
 
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
-msgstr ""
+msgstr "Ð?идалиа Ð?одаÑ?и о коÑ?иÑ?Ñ?еÑ?Ñ?"
 
 msgctxt "Vidalia"
 msgid "Unable to open log file '%1': %2"
-msgstr ""
+msgstr "Ð?еÑ?Ñ?пело оÑ?ваÑ?аÑ?е запиÑ?ника '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Value required for parameter :"
+msgstr "Ð?Ñ?едноÑ?Ñ? Ñ?е обавезна за паÑ?амеÑ?аÑ?:"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Ð?аведени Ñ?езиÑ?ки код Ñ?е неодговаÑ?аÑ?Ñ?Ñ?:"
 
 msgctxt "Vidalia"
 msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Ð?аведени Ñ?Ñ?ил гÑ?аÑ?иÑ?ког инÑ?еÑ?Ñ?еÑ?Ñ?а Ñ?е неодговаÑ?аÑ?Ñ?Ñ?:"
 
 msgctxt "Vidalia"
 msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Ð?аведени ниво заÑ?пиÑ?иваÑ?а Ñ? запиÑ?ник Ñ?е неодговаÑ?аÑ?Ñ?Ñ?:"
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
-msgstr ""
+msgstr "%1 Ñ?екÑ?нди"
 
 msgctxt "stringutil.h"
 msgid "%1 B/s"
-msgstr ""
+msgstr "%1 B/s "
 
 msgctxt "stringutil.h"
 msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB/s "
 
 msgctxt "stringutil.h"
 msgid "%1 MB/s"
-msgstr ""
+msgstr "%1 MB/s "
 
 msgctxt "stringutil.h"
 msgid "%1 GB/s"
-msgstr ""
+msgstr "%1 GB/s "
 
 msgctxt "stringutil.h"
 msgid "%1 days"
-msgstr ""
+msgstr "%1 дана"
 
 msgctxt "stringutil.h"
 msgid "%1 hours"
-msgstr ""
+msgstr "%1 Ñ?аÑ?и"
 
 msgctxt "stringutil.h"
 msgid "%1 mins"
-msgstr ""
+msgstr "%1 минÑ?Ñ?а"
diff --git a/src/vidalia/i18n/po/st/qt_st.po b/src/vidalia/i18n/po/st/qt_st.po
index 0c50933..0e27c17 100644
--- a/src/vidalia/i18n/po/st/qt_st.po
+++ b/src/vidalia/i18n/po/st/qt_st.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/st/vidalia_st.po b/src/vidalia/i18n/po/st/vidalia_st.po
index 22b0f4e..37a6a67 100644
--- a/src/vidalia/i18n/po/st/vidalia_st.po
+++ b/src/vidalia/i18n/po/st/vidalia_st.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/su/qt_su.po b/src/vidalia/i18n/po/su/qt_su.po
index c1c0116..dfdaa08 100644
--- a/src/vidalia/i18n/po/su/qt_su.po
+++ b/src/vidalia/i18n/po/su/qt_su.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/su/vidalia_su.po b/src/vidalia/i18n/po/su/vidalia_su.po
index b0c343e..b7dcc7c 100644
--- a/src/vidalia/i18n/po/su/vidalia_su.po
+++ b/src/vidalia/i18n/po/su/vidalia_su.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/sv/qt_sv.po b/src/vidalia/i18n/po/sv/qt_sv.po
index b01cd6a..8a4cb9c 100644
--- a/src/vidalia/i18n/po/sv/qt_sv.po
+++ b/src/vidalia/i18n/po/sv/qt_sv.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <marta.leffler@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-07-04 10:34+0000\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
 "Last-Translator: mle <marta.leffler@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -210,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1 \n"
-"Filen hittades inte.\n"
-"Var god bekräfta att det korrekta filnamnet har angetts."
+msgstr "%1 \nFilen hittades inte.\nVar god bekräfta att det korrekta filnamnet har angetts."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -271,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Mappen hittades inte.\n"
-"Var god bekräfta att det korrekta mappnamnet har angetts."
+msgstr "%1\nMappen hittades inte.\nVar god bekräfta att det korrekta mappnamnet har angetts."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"'%1' är skrivskyddat.\n"
-"Vill du ta bort det ändå?"
+msgstr "'%1' är skrivskyddat.\nVill du ta bort det ändå?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -380,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>Namnet \"%1\" kan inte användas.</b><p>Försök använda ett nytt namn, med "
-"färre tecken eller inga skiljetecken."
+msgstr "<b>Namnet \"%1\" kan inte användas.</b><p>Försök använda ett nytt namn, med färre tecken eller inga skiljetecken."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -443,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/sv/vidalia_sv.po b/src/vidalia/i18n/po/sv/vidalia_sv.po
index 81e690a..109e635 100644
--- a/src/vidalia/i18n/po/sv/vidalia_sv.po
+++ b/src/vidalia/i18n/po/sv/vidalia_sv.po
@@ -1,14 +1,16 @@
 # 
 # Translators:
+#   <bik1230@xxxxxxxxx>, 2012.
+#   <lars.edman@xxxxxxxxxxxx>, 2012.
 #   <marta.leffler@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: mle <marta.leffler@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: Larse <lars.edman@xxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,9 +74,7 @@ msgstr "Välj en katalog för Tor-data"
 
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
-msgstr ""
-"Vidalia kunde inte ta bort Windows-tjänsten för Tor. Du kanske måste ta bort"
-" tjänsten manuellt."
+msgstr "Vidalia kunde inte ta bort Windows-tjänsten för Tor. Du kanske måste ta bort tjänsten manuellt."
 
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
@@ -142,7 +142,7 @@ msgstr "Välj den katalog som används för att lagra programdata för Tor"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr ""
+msgstr "Tor Kontroll"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
@@ -162,7 +162,7 @@ msgstr "Redigera aktuell torrc"
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "OBS: det här kommer att ändra den för nuvarande laddade torrc"
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
@@ -202,13 +202,17 @@ 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 kunde inte ta bort Tor-tjänsten.\n"
-"\n"
-"Du kan behöva ta bort den manuellt."
+msgstr "Vidalia kunde inte ta bort Tor-tjänsten.\n\nDu kan behöva ta bort den manuellt."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -230,6 +234,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia kunde ej ladda den valda språköversättningen"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "Sedan:"
@@ -450,9 +471,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia har anslutit till en pågående Tor process som kräver ett lösenord. "
-"Vänligen ange ditt kontrollösenord:"
+msgstr "Vidalia har anslutit till en pågående Tor process som kräver ett lösenord. Vänligen ange ditt kontrollösenord:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -1290,9 +1309,7 @@ msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
-"Vi kunde inte starta om Vidalia automatiskt. Vänligen starta om Vidalia "
-"manuellt."
+msgstr "Vi kunde inte starta om Vidalia automatiskt. Vänligen starta om Vidalia manuellt."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
@@ -1534,10 +1551,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia kan öppna länken du valde i din uppsprungliga webbrowser. Om din "
-"browser inte är konfigurerar att använda Tor så kommer inte begäran vara "
-"annonym."
+msgstr "Vidalia kan öppna länken du valde i din uppsprungliga webbrowser. Om din browser inte är konfigurerar att använda Tor så kommer inte begäran vara annonym."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1551,9 +1565,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kunde inte öppna den valda länken i din webbrowser. Du kan "
-"fortfarande kopiera länken och klistra in det i din browser."
+msgstr "Vidalia kunde inte öppna den valda länken i din webbrowser. Du kan fortfarande kopiera länken och klistra in det i din browser."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1764,10 +1776,6 @@ msgid "Connected to the Tor network!"
 msgstr "Ansluten till Tor-nätverket!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Okänt starttillstånd"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "blandat"
 
@@ -1835,9 +1843,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia kunde ej starta Tor. Kontrollera dina inställningar: stämmer namnet "
-"och sökvägen för Tors exekverbara fil?"
+msgstr "Vidalia kunde ej starta Tor. Kontrollera dina inställningar: stämmer namnet och sökvägen för Tors exekverbara fil?"
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1875,9 +1881,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor programvaran kräver att Vidalia skickar innehållet i en verifierad "
-"cookie men Vidalia kunde ej finna någon."
+msgstr "Tor programvaran kräver att Vidalia skickar innehållet i en verifierad cookie men Vidalia kunde ej finna någon."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1899,9 +1903,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia kunde ej registrera sig för vissa händelser. Många av Vidalias "
-"funktioner kan vara otillgängliga."
+msgstr "Vidalia kunde ej registrera sig för vissa händelser. Många av Vidalias funktioner kan vara otillgängliga."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1913,8 +1915,7 @@ msgstr "Vidalia kunde ej styrka till Tor-program. (%1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Vänligen kontrollera dina inställningar för kontrollportsautentisering."
+msgstr "Vänligen kontrollera dina inställningar för kontrollportsautentisering."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1924,9 +1925,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Den installerade versionen av Tor är inte aktuell eller rekommenderas inte "
-"längre. Besök Torhemsidan för att ladda ner den senaste versionen."
+msgstr "Den installerade versionen av Tor är inte aktuell eller rekommenderas inte längre. Besök Torhemsidan för att ladda ner den senaste versionen."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1936,9 +1935,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Efterföljande anslutningar kommer att framstå som olika från dina gamla "
-"anslutningar."
+msgstr "Efterföljande anslutningar kommer att framstå som olika från dina gamla anslutningar."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1986,9 +1983,7 @@ msgstr "Använd en ny identitet"
 
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
-msgstr ""
-"Få efterföljande anslutningar att framstå som olika från mina gamla "
-"anslutningar"
+msgstr "Få efterföljande anslutningar att framstå som olika från mina gamla anslutningar"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
@@ -2035,24 +2030,18 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia försökte ställa om Tors kontrollösenord, men kunde inte starta om "
-"Tormjukvaran. Kolla i aktivitetshanteraren och säkerställ att ingen annan "
-"Torprocess körs."
+msgstr "Vidalia försökte ställa om Tors kontrollösenord, men kunde inte starta om Tormjukvaran. Kolla i aktivitetshanteraren och säkerställ att ingen annan Torprocess körs."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Den installerade versionen av Tor är inte aktuell eller rekommenderas inte "
-"längre. Besök Torhemsidan för att ladda ner den senaste versionen."
+msgstr "Den installerade versionen av Tor är inte aktuell eller rekommenderas inte längre. Besök Torhemsidan för att ladda ner den senaste versionen."
 
 msgctxt "MainWindow"
 msgid ""
 "Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Vill du kontrollera om ett nyare paket är tillgängligt för installation?"
+msgstr "Vill du kontrollera om ett nyare paket är tillgängligt för installation?"
 
 msgctxt "MainWindow"
 msgid "Potentially Unsafe Connection"
@@ -2062,8 +2051,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"Tor har automatiskt stängs din anslutning för att skydda din anonymitet."
+msgstr "Tor har automatiskt stängs din anslutning för att skydda din anonymitet."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2096,10 +2084,25 @@ 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."
+msgstr "Allt som skickas över denna anslutning kan övervakas. Vänligen kontrollera din programkonfiguration och använd endast krypterade protokoll, t.ex. SSL, om möjligt."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"Allt som skickas över denna anslutning kan övervakas. Vänligen kontrollera "
-"din programkonfiguration och använd endast krypterade protokoll, t.ex. SSL, "
-"om möjligt."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2109,10 +2112,21 @@ msgctxt "MainWindow"
 msgid ""
 "Your relay is shutting down.\n"
 "Click 'Stop' again to stop your relay now."
+msgstr "Ditt Tor-relä stänger nu ner.â??\nTryck 'Stopp' igen för att stänga det omgÃ¥ende."
+
+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 "Bootstrapping torrc from %1 to %2"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2127,24 +2141,7 @@ msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia upptäckte att Tor programvaran avslutades oväntat.\n"
-"\n"
-"Kontrollera meddelandeloggen för nya varnings- eller felmeddelanden."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Vidalia upptäckte att Tor programvaran avslutades oväntat.\n\nKontrollera meddelandeloggen för nya varnings- eller felmeddelanden."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2168,8 +2165,7 @@ msgstr "Namn för loggfilen krävs"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Vänligen skriv in ett filnamn för att spara loggmeddelanden till en fil."
+msgstr "Vänligen skriv in ett filnamn för att spara loggmeddelanden till en fil."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2419,9 +2415,7 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Meddelanden som visas när något har gått väldigt fel och Tor kan inte "
-"fortsätta."
+msgstr "Meddelanden som visas när något har gått väldigt fel och Tor kan inte fortsätta."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2435,9 +2429,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Meddelanden som sällan visas under normal Tor-drift och som inte anses vara "
-"fel, men som du kanske bryr dig om."
+msgstr "Meddelanden som sällan visas under normal Tor-drift och som inte anses vara fel, men som du kanske bryr dig om."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2456,10 +2448,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"Kan inte skriva till fil %1\n"
-"\n"
-"%2."
+msgstr "Kan inte skriva till fil %1\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2566,14 +2555,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Ogiltig brygga"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Den angivna bryggidentiteten är ogiltig."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopiera (Ctrl+C)"
 
@@ -2581,17 +2562,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Du måste ange både en IP-adress (eller ett värddatornamn) och ett portnummer"
-" för att Tor ska kunna ansluta till Internet via en proxyserver."
+msgstr "Du måste ange både en IP-adress (eller ett värddatornamn) och ett portnummer för att Tor ska kunna ansluta till Internet via en proxyserver."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Du måste ange ett eller flera portnummer som din brandvägg tillåter dig att "
-"ansluta till."
+msgstr "Du måste ange ett eller flera portnummer som din brandvägg tillåter dig att ansluta till."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2599,8 +2576,7 @@ msgstr "'%1' är inte ett giltigt portnummer."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Se ifall ditt lokala nätverk kräver en proxy för att komma åt Internet."
+msgstr "Se ifall ditt lokala nätverk kräver en proxy för att komma åt Internet."
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2624,9 +2600,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kryssa i för att endast ansluta till noder som använder portar som är "
-"tillåtna av din brandvägg"
+msgstr "Kryssa i för att endast ansluta till noder som använder portar som är tillåtna av din brandvägg"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2648,9 +2622,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Kryssa i för att kryptera katalogförfrågningar och för att (efter separat "
-"val) använda bryggnoder för att komma åt Tornätverket"
+msgstr "Kryssa i för att kryptera katalogförfrågningar och för att (efter separat val) använda bryggnoder för att komma åt Tornätverket"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2688,10 +2660,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Det finns inga nya bryggor tillgängliga för närvarande. Du kan antingen "
-"vänta ett tag och försöka igen eller pröva en annan metod för att hitta nya "
-"bryggor."
+msgstr "Det finns inga nya bryggor tillgängliga för närvarande. Du kan antingen vänta ett tag och försöka igen eller pröva en annan metod för att hitta nya bryggor."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2718,13 +2687,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "acceptera"
@@ -2881,17 +2850,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Du har konfigurerat Tor för att agera brygga åt censurerade användare, men "
-"din version av Tor stödjer inte bryggor."
+msgstr "Du har konfigurerat Tor för att agera brygga åt censurerade användare, men din version av Tor stödjer inte bryggor."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Var god att uppgradera din Torprogramvara eller konfigurera den för att "
-"agera normal Tornod."
+msgstr "Var god att uppgradera din Torprogramvara eller konfigurera den för att agera normal Tornod."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2906,10 +2871,6 @@ msgid "Run as a client only"
 msgstr "Kör endast som klient"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Vidarebefordra trafik för Tor-nätverket (kör som Tor-router)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Routerport:"
 
@@ -2947,8 +2908,7 @@ msgstr "Namnet på din router"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Den port som användare och andra routrar kan kommunicera med din router på"
+msgstr "Den port som användare och andra routrar kan kommunicera med din router på"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2962,9 +2922,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Om din Internetanslutning har snabb nerladdningshastighet men långsam "
-"uppladdningshastighet, vänligen välj uppladningshastighet här."
+msgstr "Om din Internetanslutning har snabb nerladdningshastighet men långsam uppladdningshastighet, vänligen välj uppladningshastighet här."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -2992,8 +2950,7 @@ msgstr "Annat"
 
 msgctxt "ServerPage"
 msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Välj det alternativ som bäst överensstämmer med din Internetanslutning"
+msgstr "Välj det alternativ som bäst överensstämmer med din Internetanslutning"
 
 msgctxt "ServerPage"
 msgid "Show help topic on bandwidth rate limits"
@@ -3023,9 +2980,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Maxvärdet för bandbreddshastigheten måste vara högre eller lika med "
-"snittvärdet för bandbreddhastigheten. Båda värdena måste vara minst 20 KB/s."
+msgstr "Maxvärdet för bandbreddshastigheten måste vara högre eller lika med snittvärdet för bandbreddhastigheten. Båda värdena måste vara minst 20 KB/s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3086,16 +3041,13 @@ msgstr "Visa hjälpavsnitt om användningspolicyn"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Vilka resurser på Internet ska användare kunna komma åt genom din router?"
+msgstr "Vilka resurser på Internet ska användare kunna komma åt genom din router?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor kommer fortfarande att blockera vissa utgående mail- och "
-"fildelningsprogram för att minska spam och annat missbruk."
+msgstr "Tor kommer fortfarande att blockera vissa utgående mail- och fildelningsprogram för att minska spam och annat missbruk."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3108,8 +3060,7 @@ msgstr "Ge andra tillgång till din brygga genom att ge dem följande textrad:"
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Det här är din bryggrouters identitet som du kan ge till andra människor"
+msgstr "Det här är din bryggrouters identitet som du kan ge till andra människor"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3127,9 +3078,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Lämna din router igång så att klienter får större möjlighet att hitta och "
-"använda den."
+msgstr "Lämna din router igång så att klienter får större möjlighet att hitta och använda den."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3143,9 +3092,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Tor returnerade ett felaktigt formaterat svar när Vidalia begärde din "
-"bryggas användningshistorik."
+msgstr "Tor returnerade ett felaktigt formaterat svar när Vidalia begärde din bryggas användningshistorik."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3153,9 +3100,7 @@ msgstr "Det returnerade svaret var:%1"
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"Hjälp censurerade användare att använda Tornätverket (Tor 0.2.0.8-alpha "
-"eller nyare)"
+msgstr "Hjälp censurerade användare att använda Tornätverket (Tor 0.2.0.8-alpha eller nyare)"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3170,6 +3115,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "Distribuera min bryggadress automatiskt"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "Spegla routerkatalogen"
 
@@ -3177,23 +3130,17 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"E-postadress där du kan nås om det finns ett problem med din router. Du kan "
-"också inkludera ditt PGP eller GPG-fingeravtryck."
+msgstr "E-postadress där du kan nås om det finns ett problem med din router. Du kan också inkludera ditt PGP eller GPG-fingeravtryck."
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
-msgstr ""
-"Ett fel uppstod när alla tjänster skulle göras otillgängliga (Error while "
-"trying to unpublish all services)"
+msgstr "Ett fel uppstod när alla tjänster skulle göras otillgängliga (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 ""
-"Konfigurera åtminstone en aktivitetskatalog och en virtuell port för varje "
-"aktivitet du vill spara. Ta bort de andra."
+msgstr "Konfigurera åtminstone en aktivitetskatalog och en virtuell port för varje aktivitet du vill spara. Ta bort de andra."
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3261,8 +3208,7 @@ msgstr "Kopiera det vald onion-adress till urklipp"
 
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Bläddra i det lokala filsystemet och välj katalog för den valda tjänsten"
+msgstr "Bläddra i det lokala filsystemet och välj katalog för den valda tjänsten"
 
 msgctxt "ServicePage"
 msgid "Created by Tor"
@@ -3319,9 +3265,7 @@ msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Vi lyckades upprätta en anslutning till Tor-nätverket. Nu kan du konfigurera"
-" dina program att använda Internet anonymt."
+msgstr "Vi lyckades upprätta en anslutning till Tor-nätverket. Nu kan du konfigurera dina program att använda Internet anonymt."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
@@ -3689,17 +3633,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia kunde inte söka efter programuppdateringar eftersom den inte kunde "
-"hitta '%1'."
+msgstr "Vidalia kunde inte söka efter programuppdateringar eftersom den inte kunde hitta '%1'."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia kunde inte söka efter programuppdateringar eftersom Tors "
-"uppdateringsprocess avslutades oväntat."
+msgstr "Vidalia kunde inte söka efter programuppdateringar eftersom Tors uppdateringsprocess avslutades oväntat."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3859,22 +3799,22 @@ msgstr ""
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Ogiltig språk kod:"
 
 msgctxt "Vidalia"
 msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Ogiltig GUI stil:"
 
 msgctxt "Vidalia"
 msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Ogiltig loggnings nivå:"
 
 msgctxt "Vidalia"
 msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
+msgstr "En annan Vidalia process kanske redan körs. Om det faktiskt inte finns en annan Vidalia process kan du forstäta ändå.\n\nVill du fortsätta?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3907,5 +3847,3 @@ msgstr "%1 timmar"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 min"
-
-
diff --git a/src/vidalia/i18n/po/sw/qt_sw.po b/src/vidalia/i18n/po/sw/qt_sw.po
index 5b0a18f..d96a0a0 100644
--- a/src/vidalia/i18n/po/sw/qt_sw.po
+++ b/src/vidalia/i18n/po/sw/qt_sw.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/sw/vidalia_sw.po b/src/vidalia/i18n/po/sw/vidalia_sw.po
index 257ffc6..5509397 100755
--- a/src/vidalia/i18n/po/sw/vidalia_sw.po
+++ b/src/vidalia/i18n/po/sw/vidalia_sw.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ta/qt_ta.po b/src/vidalia/i18n/po/ta/qt_ta.po
index fdc9bd7..fb948e7 100644
--- a/src/vidalia/i18n/po/ta/qt_ta.po
+++ b/src/vidalia/i18n/po/ta/qt_ta.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ta/vidalia_ta.po b/src/vidalia/i18n/po/ta/vidalia_ta.po
index b89c502..740b3bf 100644
--- a/src/vidalia/i18n/po/ta/vidalia_ta.po
+++ b/src/vidalia/i18n/po/ta/vidalia_ta.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/te/qt_te.po b/src/vidalia/i18n/po/te/qt_te.po
index 267cd8e..3e09d16 100644
--- a/src/vidalia/i18n/po/te/qt_te.po
+++ b/src/vidalia/i18n/po/te/qt_te.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/te/vidalia_te.po b/src/vidalia/i18n/po/te/vidalia_te.po
index 188b0f3..08b6dcc 100644
--- a/src/vidalia/i18n/po/te/vidalia_te.po
+++ b/src/vidalia/i18n/po/te/vidalia_te.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/tg/qt_tg.po b/src/vidalia/i18n/po/tg/qt_tg.po
index d75b2fa..bc1f157 100644
--- a/src/vidalia/i18n/po/tg/qt_tg.po
+++ b/src/vidalia/i18n/po/tg/qt_tg.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/tg/vidalia_tg.po b/src/vidalia/i18n/po/tg/vidalia_tg.po
index 9fa44e6..09526d2 100644
--- a/src/vidalia/i18n/po/tg/vidalia_tg.po
+++ b/src/vidalia/i18n/po/tg/vidalia_tg.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/th/qt_th.po b/src/vidalia/i18n/po/th/qt_th.po
index 40bb480..1bb0941 100644
--- a/src/vidalia/i18n/po/th/qt_th.po
+++ b/src/vidalia/i18n/po/th/qt_th.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/th/vidalia_th.po b/src/vidalia/i18n/po/th/vidalia_th.po
index 7762017..921466a 100644
--- a/src/vidalia/i18n/po/th/vidalia_th.po
+++ b/src/vidalia/i18n/po/th/vidalia_th.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -114,8 +115,7 @@ msgstr "��ล��ั����า�าร�ำ�า��อ���
 
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"�ริ�ม�าร�ำ�า���ร��รม Tor ��วย��ล��ั����า�าร�ำ�า��อ���ร��รม(torrc)�ี�ระ�ุ"
+msgstr "�ริ�ม�าร�ำ�า���ร��รม Tor ��วย��ล��ั����า�าร�ำ�า��อ���ร��รม(torrc)�ี�ระ�ุ"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
@@ -194,6 +194,17 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
@@ -220,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia �ม�สามาร��ึ�ภาษา�ี��ลือ��ึ��มา������"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "�ั�����:"
@@ -1263,24 +1291,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 ""
 
@@ -1298,16 +1308,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -1527,16 +1548,11 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia �ะ��ิ���ื�อหา��อิ���อร������ี��ุ��ลือ� "
-"��วย��ร��รม��อ�อิ���อร������ี��ุ�����ระ�ำ(default Web browser). "
-"��า�ุ�ยั��ม�����ั����า��ร��รม��อ�อิ���อร������ี��ุ�����ระ�ำ�ห���อ�อิ���อร�������า�"
-" Tor �ล�ว, �าร�ำ�า��ี��ะ�ม���อ��ัว���ห��ุ�"
+msgstr "Vidalia �ะ��ิ���ื�อหา��อิ���อร������ี��ุ��ลือ� ��วย��ร��รม��อ�อิ���อร������ี��ุ�����ระ�ำ(default Web browser). ��า�ุ�ยั��ม�����ั����า��ร��รม��อ�อิ���อร������ี��ุ�����ระ�ำ�ห���อ�อิ���อร�������า� Tor �ล�ว, �าร�ำ�า��ี��ะ�ม���อ��ัว���ห��ุ�"
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-"�ุ�ยั���อ��าร�ห� Vidalia ��ิ���ื�อหา��วย��ร��รม��อ�อิ���อร������อ��ุ�หรือ�ม�"
+msgstr "�ุ�ยั���อ��าร�ห� Vidalia ��ิ���ื�อหา��วย��ร��รม��อ�อิ���อร������อ��ุ�หรือ�ม�"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
@@ -1546,9 +1562,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia �ม�สามาร���ิ���ื�อหา�ี��ุ��ืลือ����ร��รม��อ�อิ���อร������อ��ุ����. "
-"�รุ�า�ั�ลอ� URL ��ื�อ���รีย�����า���ร��รม��อ�อิ���อร�������วย���อ�"
+msgstr "Vidalia �ม�สามาร���ิ���ื�อหา�ี��ุ��ืลือ����ร��รม��อ�อิ���อร������อ��ุ����. �รุ�า�ั�ลอ� URL ��ื�อ���รีย�����า���ร��รม��อ�อิ���อร�������วย���อ�"
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1759,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "��ื�อม��อสู���รือ��าย Tor �รีย�ร�อย!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "ส�า�ะ�ริ�ม����ี��ม�รู��ั�"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "������ล��"
 
@@ -1830,10 +1840,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia �ม�สามาร��ริ�ม�าร�ำ�า� Tor ���. "
-"�รุ�า�รว�สอ��าร�ั����าระ�ุ�ึ��ี�อยู��อ���ร��รม Tor ����รื�อ��อ��ุ� "
-"ว�า�ู���อ�หรือ�ม�."
+msgstr "Vidalia �ม�สามาร��ริ�ม�าร�ำ�า� Tor ���. �รุ�า�รว�สอ��าร�ั����าระ�ุ�ึ��ี�อยู��อ���ร��รม Tor ����รื�อ��อ��ุ� ว�า�ู���อ�หรือ�ม�."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1871,8 +1878,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"��ร��รม Tor ��อ��าร�ห� Vidalia ส�� Cookie ��ื�อ�อสิ��ิ, ��� Vidalia หา�ม���."
+msgstr "��ร��รม Tor ��อ��าร�ห� Vidalia ส�� Cookie ��ื�อ�อสิ��ิ, ��� Vidalia หา�ม���."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1894,9 +1900,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia �ม�สามาร�ล��ะ��ีย���ื�อรั� event �า�อย�า����. "
-"�ำ�ห��วามสามาร�หลาย�อย�า��อ� Vidalia อา��ม�สามาร�����า����"
+msgstr "Vidalia �ม�สามาร�ล��ะ��ีย���ื�อรั� event �า�อย�า����. �ำ�ห��วามสามาร�หลาย�อย�า��อ� Vidalia อา��ม�สามาร�����า����"
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1918,9 +1922,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"��ร��รม Tor รุ���ี����อยู��ั��ุ�ั� ��รุ�� หรือ �ม���ะ�ำ�ห�����ล�ว. "
-"�รุ�า���ี� website �อ� Tor ��ื�อ�าว���หล� Tor รุ���หม�ล�าสุ�"
+msgstr "��ร��รม Tor รุ���ี����อยู��ั��ุ�ั� ��รุ�� หรือ �ม���ะ�ำ�ห�����ล�ว. �รุ�า���ี� website �อ� Tor ��ื�อ�าว���หล� Tor รุ���หม�ล�าสุ�"
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -2025,10 +2027,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia �ยายามล�า�รหัส��า� ���าร�ว��ุม Tor �ิ��. "
-"����ม�สามาร��ริ�ม�าร�ำ�า���ร��รม Tor �หม����. �รุ�า�รว�สอ�������� Task "
-"Manager ��ื�อ�ห�มั�������ว�า Tor �ัว��ิม �ม�����ำ�า�อยู�."
+msgstr "Vidalia �ยายามล�า�รหัส��า� ���าร�ว��ุม Tor �ิ��. ����ม�สามาร��ริ�ม�าร�ำ�า���ร��รม Tor �หม����. �รุ�า�รว�สอ�������� Task Manager ��ื�อ�ห�มั�������ว�า Tor �ัว��ิม �ม�����ำ�า�อยู�."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2079,15 +2078,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2102,24 +2113,31 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2534,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Bridge �ม��ู���อ� "
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "��า Bridge �ี�ระ�ุ �ม��ู���อ�"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "�ั�ลอ� (Ctrl+C)"
 
@@ -2549,17 +2559,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"�ุ���อ�ระ�ุ�ั�� �ล� IP หรือ �ื�อ��รื�อ���อิ���อร����� �ละ �ล� port �อ� proxy"
-" ��ื�อ�ั����า�ห���ร��รม Tor ����า� proxy ����ู���อ�"
+msgstr "�ุ���อ�ระ�ุ�ั�� �ล� IP หรือ �ื�อ��รื�อ���อิ���อร����� �ละ �ล� port �อ� proxy ��ื�อ�ั����า�ห���ร��รม Tor ����า� proxy ����ู���อ�"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"�ุ��ะ��อ��อ��ล� port �ี� firewall ยิ�ยอม�ห��ุ��ิ���อภาย�อ����. ��ามีหลาย�ล� "
-"port �ห��ั����วย ��รื�อ�หมายลู���ำ(,)"
+msgstr "�ุ��ะ��อ��อ��ล� port �ี� firewall ยิ�ยอม�ห��ุ��ิ���อภาย�อ����. ��ามีหลาย�ล� port �ห��ั����วย ��รื�อ�หมายลู���ำ(,)"
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2613,9 +2619,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"�รุ�า�ลือ� ��ื�อ��ิ�ม�าร���ารหัส�ารร�อ��อ���าสู���รือ��าย Tor, ��ย�ะระุ�ุ�ล�"
-" IP �ละ Port �อ� Bridge ��วย�����"
+msgstr "�รุ�า�ลือ� ��ื�อ��ิ�ม�าร���ารหัส�ารร�อ��อ���าสู���รือ��าย Tor, ��ย�ะระุ�ุ�ล� IP �ละ Port �อ� Bridge ��วย�����"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2623,9 +2627,7 @@ msgstr "�ู��ห��ริ�ารอิ���อร�����
 
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
-msgstr ""
-"�ั����า Bridge (��รื�อ��ี��ะส����า���อมูล���าร���า�ึ���รือ��าย Tor "
-"�ห��ั��รา)"
+msgstr "�ั����า Bridge (��รื�อ��ี��ะส����า���อมูล���าร���า�ึ���รือ��าย Tor �ห��ั��รา)"
 
 msgctxt "NetworkPage"
 msgid "Add a Bridge:"
@@ -2682,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2839,26 +2841,19 @@ msgstr "ลาย�ิ�วมือ"
 
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
-msgstr ""
-"�ม�ส�ั�ส�ุ� �าร�ำ�า���� Bridge "
-"(ส����า���อมูล�ี��ำ�������าร��ื�อม��อ��รือ��าย Tor �ห��ู�อื��)"
+msgstr "�ม�ส�ั�ส�ุ� �าร�ำ�า���� Bridge (ส����า���อมูล�ี��ำ�������าร��ื�อม��อ��รือ��าย Tor �ห��ู�อื��)"
 
 msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"�ุ��ั����า Tor �ห����� bridge relay "
-"(��วยส����า���อมูล�ี��ำ�������าร��ื�อม��อ��รือ��าย Tor "
-"�ห��ั��ู�����า��ี��ู��ิ��ั���าร���า�ึ���รือ��าย Tor ��ย�ร�) ��� Tor "
-"รุ���ี��ุ����อยู��ม�ส�ั�ส�ุ��าร�ำ�า��ี�"
+msgstr "�ุ��ั����า Tor �ห����� bridge relay (��วยส����า���อมูล�ี��ำ�������าร��ื�อม��อ��รือ��าย Tor �ห��ั��ู�����า��ี��ู��ิ��ั���าร���า�ึ���รือ��าย Tor ��ย�ร�) ��� Tor รุ���ี��ุ����อยู��ม�ส�ั�ส�ุ��าร�ำ�า��ี�"
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"�รุ�า�ิ��ั�� Tor รุ���ี��หม��ว�า หรือ �ั����า�ห����� Tor relay ������ิ"
+msgstr "�รุ�า�ิ��ั�� Tor รุ���ี��หม��ว�า หรือ �ั����า�ห����� Tor relay ������ิ"
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2866,25 +2861,19 @@ msgstr "��รื�อ��อ��ุ� �ม�����ำ�า
 
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
-msgstr ""
-"�ุ���อ�ระ�ุ�ื�อ�รีย��อ� relay �ี��ะ�ำ�า�����รื�อ��อ��ุ� �ละ�ล� port �ี��ะ���"
+msgstr "�ุ���อ�ระ�ุ�ื�อ�รีย��อ� relay �ี��ะ�ำ�า�����รื�อ��อ��ุ� �ละ�ล� port �ี��ะ���"
 
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr "�����ัวลู� (����า�อย�า���ียว)"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "���� Tor Relay (��วยส����า���อมูล��า���ห���รือ��าย Tor ��วย)"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "�ล� Port Relay:"
 
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
-msgstr ""
-"ยอม�ห�����สำ��า �ลั�ราย�ื�อ�อ� relay (relay directory) �ว�����รื�อ���วย"
+msgstr "ยอม�ห�����สำ��า �ลั�ราย�ื�อ�อ� relay (relay directory) �ว�����รื�อ���วย"
 
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
@@ -2916,9 +2905,7 @@ msgstr "�ื�อ relay �ี��ะ�ั��"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"�ล� port �ี��ะ�ห� relay �ำ�า�ส����า���อมูลระหว�า��ู������อื��� �ละ relay "
-"��รื�อ�อื���"
+msgstr "�ล� port �ี��ะ�ห� relay �ำ�า�ส����า���อมูลระหว�า��ู������อื��� �ละ relay ��รื�อ�อื���"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2932,9 +2919,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"สำหรั��าร��ื�อม��ออิ���อร������ี� รั���อมูล����ร�ว���ส����อมูล�����า "
-"�รุ�า�ลือ��าม�วาม�ร�ว���ารส����อมูล"
+msgstr "สำหรั��าร��ื�อม��ออิ���อร������ี� รั���อมูล����ร�ว���ส����อมูล�����า �รุ�า�ลือ��าม�วาม�ร�ว���ารส����อมูล"
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -2992,9 +2977,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"ระ�ั� bandwidth สู�สุ��อ��ุ� �ะ��อ�มา��ว�า หรือ ���า�ั� ระ�ั� bandwidth "
-"��ลี�ย, ����ม���อย�ว�า 20 KB ��อวิ�า�ี."
+msgstr "ระ�ั� bandwidth สู�สุ��อ��ุ� �ะ��อ�มา��ว�า หรือ ���า�ั� ระ�ั� bandwidth ��ลี�ย, ����ม���อย�ว�า 20 KB ��อวิ�า�ี."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3055,17 +3038,13 @@ msgstr "�ส��ส�ว���วย�หลือ หัว��อ 
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"�ระ�ภ��ริ�าร�ี��ุ��ะยิ�ยอม�ห� �ู�����า� Tor ��อื��� ����า���า���รื�อ��ุ�"
+msgstr "�ระ�ภ��ริ�าร�ี��ุ��ะยิ�ยอม�ห� �ู�����า� Tor ��อื��� ����า���า���รื�อ��ุ�"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"��ย���ิ ระ�� Tor มี�าร�ิ��ั���าร�ำ�า��อ��า���ร��รม�ี���ี�ยว�ั��ารส�� E-mail "
-"�ละ�ารส����ล� ��ื�อล��ั�หา�าร���ระ�� Tor �����า���า����าร ส���มล��ยะ(spam) "
-"�ละ ร��ว��ู�อื��(abuse)"
+msgstr "��ย���ิ ระ�� Tor มี�าร�ิ��ั���าร�ำ�า��อ��า���ร��รม�ี���ี�ยว�ั��ารส�� E-mail �ละ�ารส����ล� ��ื�อล��ั�หา�าร���ระ�� Tor �����า���า����าร ส���มล��ยะ(spam) �ละ ร��ว��ู�อื��(abuse)"
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3078,9 +3057,7 @@ msgstr "�ห��ู�อื�����า�ึ� Bridge ����
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"�ี�����รหัสระ�ุ�ึ���รื�อ��อ��ุ��ี��ำ�า����� Bridge "
-"�ึ���ุ�สามาร�ส���ห��ู�อื�����"
+msgstr "�ี�����รหัสระ�ุ�ึ���รื�อ��อ��ุ��ี��ำ�า����� Bridge �ึ���ุ�สามาร�ส���ห��ู�อื�����"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3135,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3152,9 +3137,7 @@ 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. ล�สิ���ี��ม���ี�ยว��อ�ออ��ห�หม�"
+msgstr "�รุ�า�ั����า ระ�ุ�ี��ั�����รายละ�อีย��าร�ห��ริ�าร �ละระ�ุ�ล� port �สมือ�(virtual port) อย�า���อยห�ึ�� port. ล�สิ���ี��ม���ี�ยว��อ�ออ��ห�หม�"
 
 msgctxt "ServicePage"
 msgid "Error"
@@ -3174,8 +3157,7 @@ msgstr "�ล� port �สมือ� (Virtual Port) �ะ��อ��
 
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"���าหมาย���ารส����อ�าร�ำ�า� �ะ��อ�อยู���รู� address:port, address หรือ port."
+msgstr "���าหมาย���ารส����อ�าร�ำ�า� �ะ��อ�อยู���รู� address:port, address หรือ port."
 
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
@@ -3716,14 +3698,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 "��ล�"
@@ -3817,6 +3791,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 ""
 
@@ -3866,5 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ti/qt_ti.po b/src/vidalia/i18n/po/ti/qt_ti.po
index 5405d06..19c9aa9 100644
--- a/src/vidalia/i18n/po/ti/qt_ti.po
+++ b/src/vidalia/i18n/po/ti/qt_ti.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ti/vidalia_ti.po b/src/vidalia/i18n/po/ti/vidalia_ti.po
index eaa7645..3b8ded0 100644
--- a/src/vidalia/i18n/po/ti/vidalia_ti.po
+++ b/src/vidalia/i18n/po/ti/vidalia_ti.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/tk/qt_tk.po b/src/vidalia/i18n/po/tk/qt_tk.po
index 2f82848..edcd75c 100644
--- a/src/vidalia/i18n/po/tk/qt_tk.po
+++ b/src/vidalia/i18n/po/tk/qt_tk.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/tk/vidalia_tk.po b/src/vidalia/i18n/po/tk/vidalia_tk.po
index 797c107..9707d96 100644
--- a/src/vidalia/i18n/po/tk/vidalia_tk.po
+++ b/src/vidalia/i18n/po/tk/vidalia_tk.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/tr/qt_tr.po b/src/vidalia/i18n/po/tr/qt_tr.po
index 7ca2144..8f71cc8 100644
--- a/src/vidalia/i18n/po/tr/qt_tr.po
+++ b/src/vidalia/i18n/po/tr/qt_tr.po
@@ -1,13 +1,14 @@
-# 
 # Translators:
+# Translators:
+# Deniz  <>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
+"Last-Translator: Deniz <>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,17 +90,17 @@ msgstr "Kaydetme"
 #: qdialogbuttonbox.cpp:554
 msgctxt "QDialogButtonBox"
 msgid "Discard"
-msgstr "Kaydetme"
+msgstr "Iptal"
 
 #: qdialogbuttonbox.cpp:557
 msgctxt "QDialogButtonBox"
 msgid "&Yes"
-msgstr "Evet"
+msgstr "&Evet"
 
 #: qdialogbuttonbox.cpp:560
 msgctxt "QDialogButtonBox"
 msgid "Yes to &All"
-msgstr "Tümüne evet"
+msgstr "&Tümüne evet"
 
 #: qdialogbuttonbox.cpp:563
 msgctxt "QDialogButtonBox"
@@ -109,7 +110,7 @@ msgstr "Hayır"
 #: qdialogbuttonbox.cpp:566
 msgctxt "QDialogButtonBox"
 msgid "N&o to All"
-msgstr "Tümüne hayır"
+msgstr "Tümüne h&ayır"
 
 #: qdialogbuttonbox.cpp:569
 msgctxt "QDialogButtonBox"
@@ -179,7 +180,7 @@ msgstr "Tüm Dosyalar"
 #: qfiledialog.cpp:881
 msgctxt "QFileDialog"
 msgid "Directories"
-msgstr "Klasörler"
+msgstr "Dizinler"
 
 #: qfiledialog.cpp:2408
 msgctxt "QFileDialog"
@@ -201,9 +202,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 Belirtilen dosya zaten var.\n"
-"DeÄ?iÅ?tirmek ister misiniz?"
+msgstr "%1 Belirtilen dosya zaten var.\nDeÄ?iÅ?tirmek ister misiniz?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -211,10 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"Dosya bulunamadı. \n"
-"Lütfen dosya adından emin olup tekrar deneyin."
+msgstr "%1\nDosya bulunamadı. \nLütfen dosya adından emin olup tekrar deneyin."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -272,19 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"Klasör bulunamadı.\n"
-" Lütfen Klasör adından emin olarak tekrar deneyiniz."
+msgstr "%1\nKlasör bulunamadı.\n Lütfen Klasör adından emin olarak tekrar deneyiniz."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"%1 yazmaya karÅ?ı korumalı.\n"
-"Yine de silmek ister misiniz?"
+msgstr "%1 yazmaya karÅ?ı korumalı.\nYine de silmek ister misiniz?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -324,7 +315,7 @@ msgstr "Bilinmiyor"
 #: qfiledialog.cpp:439
 msgctxt "QFileDialog"
 msgid "Find Directory"
-msgstr "Klasör bul"
+msgstr "Dizin bul"
 
 #: qfiledialog.cpp:458
 msgctxt "QFileDialog"
@@ -344,12 +335,12 @@ msgstr "Yeni klasör"
 #: qfiledialog.cpp:465
 msgctxt "QFileDialog"
 msgid "&New Folder"
-msgstr "Yeni klasör"
+msgstr "&Yeni klasör"
 
 #: qfiledialog.cpp:917
 msgctxt "QFileDialog"
 msgid "&Choose"
-msgstr "seç"
+msgstr "&Seç"
 
 #: qsidebar.cpp:388
 msgctxt "QFileDialog"
@@ -381,9 +372,7 @@ msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
-"<b>\"%1\" ismi kullanılamıyor.</b><p> Lütfen baÅ?ka bir ismi biraz daha az "
-"karakterle veya yazım iÅ?areti kullanmadan deneyin."
+msgstr "<b>\"%1\" ismi kullanılamıyor.</b><p> Lütfen baÅ?ka bir ismi biraz daha az karakterle veya yazım iÅ?areti kullanmadan deneyin."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
@@ -444,5 +433,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 bayt"
-
-
diff --git a/src/vidalia/i18n/po/tr/vidalia_tr.po b/src/vidalia/i18n/po/tr/vidalia_tr.po
index 6561bdb..3d1d0ae 100644
--- a/src/vidalia/i18n/po/tr/vidalia_tr.po
+++ b/src/vidalia/i18n/po/tr/vidalia_tr.po
@@ -1,13 +1,17 @@
 # 
 # Translators:
+# Caglar Ulkuderner <caglar@xxxxxxxxxxxxxx>, 2012.
+#   <cannuhlar@xxxxxxxxxxx>, 2012.
+# Deniz  <>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <zahmetr@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-04-08 19:44+0000\n"
+"Last-Translator: ZahMeTR <zahmetr@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +47,7 @@ msgstr "'%1' geçerli bir IP adresi deÄ?il."
 msgctxt "AdvancedPage"
 msgid ""
 "You selected 'Password' authentication, but did not specify a password."
-msgstr "Parola ile kimlik kanıtlamayı seçtiniz ama bir parola girmediniz."
+msgstr "Parola ile kimlik doÄ?rulamayı seçtiniz ama bir parola girmediniz."
 
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
@@ -103,7 +107,7 @@ msgstr "Parola"
 
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr "Rastgele Seç"
+msgstr "Rastgele Uret"
 
 msgctxt "AdvancedPage"
 msgid ":"
@@ -119,7 +123,7 @@ msgstr "Tor'u, belirtilen yapılandırma dosyası (torrc) ile çalıÅ?tır"
 
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
-msgstr "Yapılandırma dosyasının için klasör seç"
+msgstr "Yapılandırma dosyasının konumun seç"
 
 msgctxt "AdvancedPage"
 msgid "Browse"
@@ -127,7 +131,7 @@ msgstr "Gözat"
 
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr "Kayıt Klasörü"
+msgstr "Veri Klasörü"
 
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
@@ -139,62 +143,69 @@ msgstr "Tor için kullanılacak kayıt klasörünü seç"
 
 msgctxt "AdvancedPage"
 msgid "Tor Control"
-msgstr ""
+msgstr "Tor Kontrolü"
 
 msgctxt "AdvancedPage"
 msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "TCP baÄ?lantısı kullan (ControlPort)"
 
 msgctxt "AdvancedPage"
 msgid "Path:"
-msgstr ""
+msgstr "Konum:"
 
 msgctxt "AdvancedPage"
 msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Unix alanadı soketi kullan (Kontrol Soketi)"
 
 msgctxt "AdvancedPage"
 msgid "Edit current torrc"
-msgstr ""
+msgstr "Mevcut torrc'yi düzenle"
 
 msgctxt "AdvancedPage"
 msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "Not: bu ayar Å?uan kullanılan torrc'yi düzenler."
 
 msgctxt "AdvancedPage"
 msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "ControlSocket konumu bulunmuyor"
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor configuration file location contains characters that "
 "cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "Belirtilen Tor ayar dosyası, Å?u anda kullandıÄ?ınız 8-bit karakter kodlamasıyla gösterilemeyen karakterler içermektedir."
 
 msgctxt "AdvancedPage"
 msgid ""
 "The specified Tor data directory location contains characters that cannot be"
 " represented in your system's current 8-bit character encoding."
-msgstr ""
+msgstr "Belirtilen Tor veri dizini, Å?u anda kullandıÄ?ınız 8-bit karakter kodlamasıyla gösterilemeyen karakterler içermektedir."
 
 msgctxt "AdvancedPage"
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 msgctxt "AdvancedPage"
 msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "torrc konumunu deÄ?iÅ?tirdiniz, Tor'u yeniden baÅ?latmak ister misiniz?"
 
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor Ayar Dosyası (torrc);; Bütün Dosyalar (*)"
 
 msgctxt "AdvancedPage"
 msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Tor soket konumu için bir dosya seçin"
 
 msgctxt "AdvancedPage"
 msgid "Configure ControlPort automatically"
+msgstr "ControlPort u otomatik ayarla"
+
+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"
@@ -202,10 +213,7 @@ 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"
-"\n"
-"Kendiniz kaldırmayı deneyebilirsiniz."
+msgstr "Vidalia Tor servisini kaldıramıyor.\n\nKendiniz kaldırmayı deneyebilirsiniz."
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -227,6 +235,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 "Sistem Simgesi Ayarları (Vidalia'yı yeniden baÅ?latmanız gerekir)"
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr "TrayIcon ve DockIcon göster (Varsayılan)"
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr "TrayIcon gizle"
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr "DockIcon u gizle"
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "BaÅ?langıç:"
@@ -273,7 +298,7 @@ msgstr "100"
 
 msgctxt "BandwidthGraph"
 msgid "% Opaque"
-msgstr "% Saydam"
+msgstr "% Mat"
 
 msgctxt "BandwidthGraph"
 msgid "Save"
@@ -285,7 +310,7 @@ msgstr "Ä°ptal"
 
 msgctxt "BridgeDownloader"
 msgid "Starting HTTPS bridge request..."
-msgstr "HTTPS isteÄ?ini baÅ?latıyor..."
+msgstr "HTTPS köprü isteÄ?ini baÅ?latıyor..."
 
 msgctxt "BridgeDownloader"
 msgid "Connecting to %1:%2..."
@@ -293,7 +318,7 @@ msgstr "BaÄ?lanıyor %1:%2..."
 
 msgctxt "BridgeDownloader"
 msgid "Sending an HTTPS request for bridges..."
-msgstr "HTTPS baÅ?latma isteÄ?ini gönderiyor..."
+msgstr "Köprüler için HTTPS isteÄ?ini gönderiyor..."
 
 msgctxt "BridgeDownloader"
 msgid "Downloading a list of bridges..."
@@ -321,7 +346,7 @@ msgstr "# Kullanıcılar"
 
 msgctxt "BridgeUsageDialog"
 msgid "Clients from the following countries have used your relay since %1"
-msgstr "%1 tarihinden beri belirlenen ülkelerden sizi kullanan kullanıcılar"
+msgstr "%1 tarihinden beri belirlenen ülkelerden sizin köprünüzü kullanan kullanıcılar"
 
 msgctxt "BridgeUsageDialog"
 msgid "Bridge Usage Summary"
@@ -447,9 +472,7 @@ msgctxt "ControlPasswordInputDialog"
 msgid ""
 "Vidalia has connected to a running Tor process that requires a password. "
 "Please enter your control password:"
-msgstr ""
-"Vidalia parola gerektiren bir Tor sürecine baÄ?landı. Lütfen kontrol "
-"parolasını giriniz:"
+msgstr "Vidalia parola gerektiren bir Tor sürecine baÄ?landı. Lütfen kontrol parolasını giriniz:"
 
 msgctxt "ControlSocket"
 msgid "Control socket is not connected."
@@ -493,19 +516,19 @@ msgstr "Ermenistan"
 
 msgctxt "CountryInfo"
 msgid "Australia"
-msgstr "Australia"
+msgstr "Avustralya"
 
 msgctxt "CountryInfo"
 msgid "Azerbaijan"
-msgstr "Azerbaijan"
+msgstr "Azerbaycan"
 
 msgctxt "CountryInfo"
 msgid "Bahamas"
-msgstr "Bahamas"
+msgstr "Bahamalar"
 
 msgctxt "CountryInfo"
 msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr "BengaldeÅ?"
 
 msgctxt "CountryInfo"
 msgid "Barbados"
@@ -513,11 +536,11 @@ msgstr "Barbados"
 
 msgctxt "CountryInfo"
 msgid "Belarus"
-msgstr "Belarus"
+msgstr "Beyaz Rusya"
 
 msgctxt "CountryInfo"
 msgid "Belgium"
-msgstr "Belgium"
+msgstr "Belçika"
 
 msgctxt "CountryInfo"
 msgid "Belize"
@@ -529,19 +552,19 @@ msgstr "Bhutan"
 
 msgctxt "CountryInfo"
 msgid "Bolivia"
-msgstr "Bolivia"
+msgstr "Bolivya"
 
 msgctxt "CountryInfo"
 msgid "Bosnia & Herzegovina"
-msgstr "Bosnia & Herzegovina"
+msgstr "Bosna-Hersek"
 
 msgctxt "CountryInfo"
 msgid "Botswana"
-msgstr "Botswana"
+msgstr "Botsvana"
 
 msgctxt "CountryInfo"
 msgid "Brazil"
-msgstr "Brazil"
+msgstr "Brezilya"
 
 msgctxt "CountryInfo"
 msgid "Brunei Darussalam"
@@ -549,7 +572,7 @@ msgstr "Brunei Darussalam"
 
 msgctxt "CountryInfo"
 msgid "Bulgaria"
-msgstr "Bulgaria"
+msgstr "Bulgaristan"
 
 msgctxt "CountryInfo"
 msgid "Burkina Faso"
@@ -561,27 +584,27 @@ msgstr "Burundi"
 
 msgctxt "CountryInfo"
 msgid "Cambodia"
-msgstr "Cambodia"
+msgstr "Kamboçya"
 
 msgctxt "CountryInfo"
 msgid "Cameroon"
-msgstr "Cameroon"
+msgstr "Kamerun"
 
 msgctxt "CountryInfo"
 msgid "Canada"
-msgstr "Canada"
+msgstr "Kanada"
 
 msgctxt "CountryInfo"
 msgid "Cape Verde"
-msgstr "Cape Verde"
+msgstr "YeÅ?il Burun Adaları"
 
 msgctxt "CountryInfo"
 msgid "Central African Republic"
-msgstr "Central African Republic"
+msgstr "Orta Afrika Cumhuriyeti"
 
 msgctxt "CountryInfo"
 msgid "Chad"
-msgstr "Chad"
+msgstr "Ã?ad"
 
 msgctxt "CountryInfo"
 msgid "Chile"
@@ -589,7 +612,7 @@ msgstr "Chile"
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr "China"
+msgstr "Å?ili"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
@@ -597,63 +620,63 @@ msgstr "Colombia"
 
 msgctxt "CountryInfo"
 msgid "Comoros"
-msgstr "Comoros"
+msgstr "Kolombiya"
 
 msgctxt "CountryInfo"
 msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, The Democratic Republic of the"
+msgstr "Demokratik Kongo Cumhuriyeti"
 
 msgctxt "CountryInfo"
 msgid "Congo"
-msgstr "Congo"
+msgstr "Kongo"
 
 msgctxt "CountryInfo"
 msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr "Kosta Rika"
 
 msgctxt "CountryInfo"
 msgid "Cote d�Ivoire"
-msgstr "Cote d�Ivoire"
+msgstr "FildiÅ?i Sahilleri"
 
 msgctxt "CountryInfo"
 msgid "Croatia"
-msgstr "Croatia"
+msgstr "Hırvatistan"
 
 msgctxt "CountryInfo"
 msgid "Cuba"
-msgstr "Cuba"
+msgstr "Küba"
 
 msgctxt "CountryInfo"
 msgid "Cyprus"
-msgstr "Cyprus"
+msgstr "Kıbrıs"
 
 msgctxt "CountryInfo"
 msgid "Czech Republic"
-msgstr "Czech Republic"
+msgstr "Ã?ek Cumhuriyeti"
 
 msgctxt "CountryInfo"
 msgid "Denmark"
-msgstr "Denmark"
+msgstr "Danimarka"
 
 msgctxt "CountryInfo"
 msgid "Djibouti"
-msgstr "Djibouti"
+msgstr "Cibuti"
 
 msgctxt "CountryInfo"
 msgid "Dominica"
-msgstr "Dominica"
+msgstr "Dominika"
 
 msgctxt "CountryInfo"
 msgid "Dominican Republic"
-msgstr "Dominican Republic"
+msgstr "Dominik Cumhuriyeti"
 
 msgctxt "CountryInfo"
 msgid "Ecuador"
-msgstr "Ecuador"
+msgstr "Ekvador"
 
 msgctxt "CountryInfo"
 msgid "Egypt"
-msgstr "Egypt"
+msgstr "Mısır"
 
 msgctxt "CountryInfo"
 msgid "El Salvador"
@@ -661,19 +684,19 @@ msgstr "El Salvador"
 
 msgctxt "CountryInfo"
 msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
+msgstr "Ekvatoryal Gine"
 
 msgctxt "CountryInfo"
 msgid "Eritrea"
-msgstr "Eritrea"
+msgstr "Eritre"
 
 msgctxt "CountryInfo"
 msgid "Estonia"
-msgstr "Estonia"
+msgstr "Estonya"
 
 msgctxt "CountryInfo"
 msgid "France"
-msgstr "France"
+msgstr "Fransa"
 
 msgctxt "CountryInfo"
 msgid "Gabon"
@@ -681,19 +704,19 @@ msgstr "Gabon"
 
 msgctxt "CountryInfo"
 msgid "Gambia"
-msgstr "Gambia"
+msgstr "Gambiya"
 
 msgctxt "CountryInfo"
 msgid "Georgia"
-msgstr "Georgia"
+msgstr "Gürcistan"
 
 msgctxt "CountryInfo"
 msgid "Germany"
-msgstr "Germany"
+msgstr "Almanya"
 
 msgctxt "CountryInfo"
 msgid "Ghana"
-msgstr "Ghana"
+msgstr "Gana"
 
 msgctxt "CountryInfo"
 msgid "Grenada"
@@ -705,11 +728,11 @@ msgstr "Guatemala"
 
 msgctxt "CountryInfo"
 msgid "Guinea"
-msgstr "Guinea"
+msgstr "Gine"
 
 msgctxt "CountryInfo"
 msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr "Gine-Bissau"
 
 msgctxt "CountryInfo"
 msgid "Guyana"
@@ -729,27 +752,27 @@ msgstr "Honduras"
 
 msgctxt "CountryInfo"
 msgid "Israel"
-msgstr "Israel"
+msgstr "Israil"
 
 msgctxt "CountryInfo"
 msgid "Italy"
-msgstr "Italy"
+msgstr "Italya"
 
 msgctxt "CountryInfo"
 msgid "Jamaica"
-msgstr "Jamaica"
+msgstr "Jamaika"
 
 msgctxt "CountryInfo"
 msgid "Japan"
-msgstr "Japan"
+msgstr "Japonya"
 
 msgctxt "CountryInfo"
 msgid "Jordan"
-msgstr "Jordan"
+msgstr "Urdun"
 
 msgctxt "CountryInfo"
 msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr "Kazakistan"
 
 msgctxt "CountryInfo"
 msgid "Kenya"
@@ -761,11 +784,11 @@ msgstr "Kiribati"
 
 msgctxt "CountryInfo"
 msgid "Kuwait"
-msgstr "Kuwait"
+msgstr "Kuveyt"
 
 msgctxt "CountryInfo"
 msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
+msgstr "Kirgizstan"
 
 msgctxt "CountryInfo"
 msgid "Laos"
@@ -773,11 +796,11 @@ msgstr "Laos"
 
 msgctxt "CountryInfo"
 msgid "Latvia"
-msgstr "Latvia"
+msgstr "Letonya"
 
 msgctxt "CountryInfo"
 msgid "Lebanon"
-msgstr "Lebanon"
+msgstr "Lubnan"
 
 msgctxt "CountryInfo"
 msgid "Lesotho"
@@ -785,27 +808,27 @@ msgstr "Lesotho"
 
 msgctxt "CountryInfo"
 msgid "Liberia"
-msgstr "Liberia"
+msgstr "Liberya"
 
 msgctxt "CountryInfo"
 msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr "LihtenÅ?tayn"
 
 msgctxt "CountryInfo"
 msgid "Lithuania"
-msgstr "Lithuania"
+msgstr "Litvanya"
 
 msgctxt "CountryInfo"
 msgid "Luxembourg"
-msgstr "Luxembourg"
+msgstr "Luksemburg"
 
 msgctxt "CountryInfo"
 msgid "Macedonia"
-msgstr "Macedonia"
+msgstr "Makedonya"
 
 msgctxt "CountryInfo"
 msgid "Madagascar"
-msgstr "Madagascar"
+msgstr "Madagaskar"
 
 msgctxt "CountryInfo"
 msgid "Malawi"
@@ -813,7 +836,7 @@ msgstr "Malawi"
 
 msgctxt "CountryInfo"
 msgid "Malaysia"
-msgstr "Malaysia"
+msgstr "Malezya"
 
 msgctxt "CountryInfo"
 msgid "Mali"
@@ -825,11 +848,11 @@ msgstr "Malta"
 
 msgctxt "CountryInfo"
 msgid "Marshall Islands"
-msgstr "Marshall Islands"
+msgstr "Marshall Adaları"
 
 msgctxt "CountryInfo"
 msgid "Mauritania"
-msgstr "Mauritania"
+msgstr "Moritanya"
 
 msgctxt "CountryInfo"
 msgid "Mauritius"
@@ -837,7 +860,7 @@ msgstr "Mauritius"
 
 msgctxt "CountryInfo"
 msgid "Micronesia"
-msgstr "Micronesia"
+msgstr "Mikronezya"
 
 msgctxt "CountryInfo"
 msgid "Moldova"
@@ -845,27 +868,27 @@ msgstr "Moldova"
 
 msgctxt "CountryInfo"
 msgid "Monaco"
-msgstr "Monaco"
+msgstr "Monako"
 
 msgctxt "CountryInfo"
 msgid "Mongolia"
-msgstr "Mongolia"
+msgstr "Mongolya"
 
 msgctxt "CountryInfo"
 msgid "Montenegro"
-msgstr "Montenegro"
+msgstr "KaradaÄ?"
 
 msgctxt "CountryInfo"
 msgid "Morocco"
-msgstr "Morocco"
+msgstr "Fas"
 
 msgctxt "CountryInfo"
 msgid "Mozambique"
-msgstr "Mozambique"
+msgstr "Mozambik"
 
 msgctxt "CountryInfo"
 msgid "Namibia"
-msgstr "Namibia"
+msgstr "Namibiya"
 
 msgctxt "CountryInfo"
 msgid "Nauru"
@@ -877,31 +900,31 @@ msgstr "Nepal"
 
 msgctxt "CountryInfo"
 msgid "Netherlands"
-msgstr "Netherlands"
+msgstr "Hollanda"
 
 msgctxt "CountryInfo"
 msgid "New Zealand"
-msgstr "New Zealand"
+msgstr "Yeni Zelanda"
 
 msgctxt "CountryInfo"
 msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr "Nikaragua"
 
 msgctxt "CountryInfo"
 msgid "Niger"
-msgstr "Niger"
+msgstr "Nijer"
 
 msgctxt "CountryInfo"
 msgid "Nigeria"
-msgstr "Nigeria"
+msgstr "Nijerya"
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr "Norway"
+msgstr "Norveç"
 
 msgctxt "CountryInfo"
 msgid "Oman"
-msgstr "Oman"
+msgstr "Umman"
 
 msgctxt "CountryInfo"
 msgid "Pakistan"
@@ -913,7 +936,7 @@ msgstr "Palau"
 
 msgctxt "CountryInfo"
 msgid "Palestine"
-msgstr "Palestine"
+msgstr "Filistin"
 
 msgctxt "CountryInfo"
 msgid "Panama"
@@ -921,7 +944,7 @@ msgstr "Panama"
 
 msgctxt "CountryInfo"
 msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
+msgstr "Papua Yeni Gine"
 
 msgctxt "CountryInfo"
 msgid "Paraguay"
@@ -933,27 +956,27 @@ msgstr "Peru"
 
 msgctxt "CountryInfo"
 msgid "Philippines"
-msgstr "Philippines"
+msgstr "Filipinler"
 
 msgctxt "CountryInfo"
 msgid "Poland"
-msgstr "Poland"
+msgstr "Polonya"
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr "Portugal"
+msgstr "Portekiz"
 
 msgctxt "CountryInfo"
 msgid "Qatar"
-msgstr "Qatar"
+msgstr "Katar"
 
 msgctxt "CountryInfo"
 msgid "Romania"
-msgstr "Romania"
+msgstr "Romanya"
 
 msgctxt "CountryInfo"
 msgid "Russia"
-msgstr "Russia"
+msgstr "Rusya"
 
 msgctxt "CountryInfo"
 msgid "Rwanda"
@@ -985,7 +1008,7 @@ msgstr "Sao Tome & Principe"
 
 msgctxt "CountryInfo"
 msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
+msgstr "Suudi Arabistan"
 
 msgctxt "CountryInfo"
 msgid "Senegal"
@@ -997,7 +1020,7 @@ msgstr "Serbia"
 
 msgctxt "CountryInfo"
 msgid "Seychelles"
-msgstr "Seychelles"
+msgstr "SeyÅ?eller"
 
 msgctxt "CountryInfo"
 msgid "Sierra Leone"
@@ -1005,31 +1028,31 @@ msgstr "Sierra Leone"
 
 msgctxt "CountryInfo"
 msgid "Singapore"
-msgstr "Singapore"
+msgstr "Singapur"
 
 msgctxt "CountryInfo"
 msgid "Slovakia"
-msgstr "Slovakia"
+msgstr "Slovakya"
 
 msgctxt "CountryInfo"
 msgid "Slovenia"
-msgstr "Slovenia"
+msgstr "Slovenya"
 
 msgctxt "CountryInfo"
 msgid "Solomon Islands"
-msgstr "Solomon Islands"
+msgstr "Solomon Adaları"
 
 msgctxt "CountryInfo"
 msgid "Somalia"
-msgstr "Somalia"
+msgstr "Somali"
 
 msgctxt "CountryInfo"
 msgid "South Africa"
-msgstr "South Africa"
+msgstr "Güney Afrika"
 
 msgctxt "CountryInfo"
 msgid "Spain"
-msgstr "Spain"
+msgstr "Ispanya"
 
 msgctxt "CountryInfo"
 msgid "Sri Lanka"
@@ -1041,39 +1064,39 @@ msgstr "Sudan"
 
 msgctxt "CountryInfo"
 msgid "Suriname"
-msgstr "Suriname"
+msgstr "Surinam"
 
 msgctxt "CountryInfo"
 msgid "Swaziland"
-msgstr "Swaziland"
+msgstr "Svaziland"
 
 msgctxt "CountryInfo"
 msgid "Sweden"
-msgstr "Sweden"
+msgstr "Isveç"
 
 msgctxt "CountryInfo"
 msgid "Switzerland"
-msgstr "Switzerland"
+msgstr "Isviçre"
 
 msgctxt "CountryInfo"
 msgid "Syria"
-msgstr "Syria"
+msgstr "Suriye"
 
 msgctxt "CountryInfo"
 msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr "Tacikistan"
 
 msgctxt "CountryInfo"
 msgid "Tanzania"
-msgstr "Tanzania"
+msgstr "Tanzanya"
 
 msgctxt "CountryInfo"
 msgid "Thailand"
-msgstr "Thailand"
+msgstr "Tayland"
 
 msgctxt "CountryInfo"
 msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (East Timor)"
+msgstr "Timor-Leste (DoÄ?u Timor)"
 
 msgctxt "CountryInfo"
 msgid "Togo"
@@ -1089,7 +1112,7 @@ msgstr "Trinidad & Tobago"
 
 msgctxt "CountryInfo"
 msgid "Tunisia"
-msgstr "Tunisia"
+msgstr "Tunus"
 
 msgctxt "CountryInfo"
 msgid "Turkey"
@@ -1109,19 +1132,19 @@ msgstr "Uganda"
 
 msgctxt "CountryInfo"
 msgid "Ukraine"
-msgstr "Ukraine"
+msgstr "Ukrayna"
 
 msgctxt "CountryInfo"
 msgid "United Arab Emirates"
-msgstr "United Arab Emirates"
+msgstr "BirleÅ?ik Arap Emirlikleri"
 
 msgctxt "CountryInfo"
 msgid "United Kingdom"
-msgstr "United Kingdom"
+msgstr "BirleÅ?ik Krallık"
 
 msgctxt "CountryInfo"
 msgid "United States"
-msgstr "United States"
+msgstr "BirleÅ?ik Devletler"
 
 msgctxt "CountryInfo"
 msgid "Uruguay"
@@ -1129,7 +1152,7 @@ msgstr "Uruguay"
 
 msgctxt "CountryInfo"
 msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr "Ã?zbekistan"
 
 msgctxt "CountryInfo"
 msgid "Vanuatu"
@@ -1137,7 +1160,7 @@ msgstr "Vanuatu"
 
 msgctxt "CountryInfo"
 msgid "Vatican"
-msgstr "Vatican"
+msgstr "Vatikan"
 
 msgctxt "CountryInfo"
 msgid "Venezuela"
@@ -1149,7 +1172,7 @@ msgstr "Vietnam"
 
 msgctxt "CountryInfo"
 msgid "Western Sahara"
-msgstr "Western Sahara"
+msgstr "Batı Sahra"
 
 msgctxt "CountryInfo"
 msgid "Yemen"
@@ -1157,7 +1180,7 @@ msgstr "Yemen"
 
 msgctxt "CountryInfo"
 msgid "Zambia"
-msgstr "Zambia"
+msgstr "Zambiya"
 
 msgctxt "CountryInfo"
 msgid "Zimbabwe"
@@ -1165,23 +1188,23 @@ msgstr "Zimbabwe"
 
 msgctxt "CountryInfo"
 msgid "Zaire"
-msgstr ""
+msgstr "Demokratik Kongo Cumhuriyeti"
 
 msgctxt "CountryInfo"
 msgid "Albania"
-msgstr "Albania"
+msgstr "Arnavutluk"
 
 msgctxt "CountryInfo"
 msgid "Algeria"
-msgstr "Algeria"
+msgstr "Cezayir"
 
 msgctxt "CountryInfo"
 msgid "Austria"
-msgstr "Austria"
+msgstr "Avusturya"
 
 msgctxt "CountryInfo"
 msgid "Bahrain"
-msgstr "Bahrain"
+msgstr "Bahreyn"
 
 msgctxt "CountryInfo"
 msgid "Benin"
@@ -1189,7 +1212,7 @@ msgstr "Benin"
 
 msgctxt "CountryInfo"
 msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr "Ethiyopya"
 
 msgctxt "CountryInfo"
 msgid "Fiji"
@@ -1197,11 +1220,11 @@ msgstr "Fiji"
 
 msgctxt "CountryInfo"
 msgid "Finland"
-msgstr "Finland"
+msgstr "Finlandiya"
 
 msgctxt "CountryInfo"
 msgid "Greece"
-msgstr "Greece"
+msgstr "Yunanistan"
 
 msgctxt "CountryInfo"
 msgid "Guam"
@@ -1209,19 +1232,19 @@ msgstr "Guam"
 
 msgctxt "CountryInfo"
 msgid "Hungary"
-msgstr "Hungary"
+msgstr "Macaristan"
 
 msgctxt "CountryInfo"
 msgid "Iceland"
-msgstr "Iceland"
+msgstr "Izlanda"
 
 msgctxt "CountryInfo"
 msgid "India"
-msgstr "India"
+msgstr "Hindistan"
 
 msgctxt "CountryInfo"
 msgid "Indonesia"
-msgstr "Indonesia"
+msgstr "Endonezya"
 
 msgctxt "CountryInfo"
 msgid "Iran"
@@ -1229,19 +1252,19 @@ msgstr "Iran"
 
 msgctxt "CountryInfo"
 msgid "Iraq"
-msgstr "Iraq"
+msgstr "Irak"
 
 msgctxt "CountryInfo"
 msgid "Ireland"
-msgstr "Ireland"
+msgstr "Irlanda"
 
 msgctxt "CountryInfo"
 msgid "Korea, North"
-msgstr "Korea, North"
+msgstr "Kore, Kuzey"
 
 msgctxt "CountryInfo"
 msgid "Korea, South"
-msgstr "Korea, South"
+msgstr "Korea, Güney"
 
 msgctxt "CountryInfo"
 msgid "Libya"
@@ -1249,68 +1272,68 @@ msgstr "Libya"
 
 msgctxt "CountryInfo"
 msgid "Maldives"
-msgstr "Maldives"
+msgstr "Maldivler"
 
 msgctxt "CountryInfo"
 msgid "Mexico"
-msgstr "Mexico"
+msgstr "Meksika"
 
 msgctxt "CountryInfo"
 msgid "Myanmar"
-msgstr "Myanmar"
+msgstr "Burma"
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
-msgstr "Taiwan"
+msgstr "Tayvan"
 
 msgctxt "CrashReportDialog"
 msgid "Submit a Crash Report"
-msgstr ""
+msgstr "�ökme Raporu Gönder"
 
 msgctxt "CrashReportDialog"
 msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "Vidalia bir sorunla karÅ?ılaÅ?tı ve kapanması gerekiyor."
 
 msgctxt "CrashReportDialog"
 msgid "Restart Vidalia"
-msgstr ""
+msgstr "Vidalia'yı yeniden baÅ?lat."
 
 msgctxt "CrashReportDialog"
 msgid "Don't Restart"
-msgstr ""
+msgstr "Yeniden BaÅ?latma"
 
 msgctxt "CrashReportDialog"
 msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Vidalia yeniden baÅ?latılamadı."
 
 msgctxt "CrashReportDialog"
 msgid ""
 "We were unable to automatically restart Vidalia. Please restart Vidalia "
 "manually."
-msgstr ""
+msgstr "Vidalia'yı yeniden otomatik olarak baÅ?latamadık. Lütfen Vidalia'yı manuel olarak baÅ?latın."
 
 msgctxt "CrashReportDialog"
 msgid "Please fill a ticket in:"
-msgstr ""
+msgstr "Bir baÅ?vuru doldurun"
 
 msgctxt "CrashReportDialog"
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 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 ""
+msgstr "Sorunu belirlemek ve çözmek için Vidalia geliÅ?tiricilerine gönderebileceÄ?iniz bir çökme raporu yaratıldı. Bu rapor herhangi bir kiÅ?isel bilgi içermez."
 
 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 ""
+msgstr "uyguluma çökmeden önce yaptıklarınızın bir açıklaması ile, ayrıca çökme raporuyla ilgili Å?u dosyalarla birlikte:"
 
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
@@ -1322,7 +1345,7 @@ msgstr "Tor için klasör seç"
 
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
-msgstr "Proxy seçin"
+msgstr "Vekil Sunucu Uygulamasını Seçin"
 
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
@@ -1330,7 +1353,7 @@ msgstr "Tor için bir isim belirlemek zorundasınız."
 
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
-msgstr "Windows'la birlikte baÅ?lat"
+msgstr "Bilgisayarla birlikte baÅ?lat"
 
 msgctxt "GeneralPage"
 msgid "Browse"
@@ -1346,7 +1369,7 @@ msgstr "Tor"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
-msgstr "Proxy (isteÄ?e baÄ?lı)"
+msgstr "Vekil Sunucu (isteÄ?e baÄ?lı)"
 
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
@@ -1354,15 +1377,15 @@ msgstr "Tor baÅ?ladıÄ?ında proxyide baÅ?lat"
 
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
-msgstr "Proxy parametleri:"
+msgstr "Vekil Sunucu parametreleri:"
 
 msgctxt "GeneralPage"
 msgid "Software Updates"
-msgstr "Güncellemeler"
+msgstr "Yazılım Güncellemeleri"
 
 msgctxt "GeneralPage"
 msgid "Check for new software updates automatically"
-msgstr "Güncellemeleri otomatik kontor et"
+msgstr "Güncellemeleri otomatik kontrol et"
 
 msgctxt "GeneralPage"
 msgid "Check Now"
@@ -1494,7 +1517,7 @@ msgstr "büyük-küçük harfe duyarlı"
 
 msgctxt "HelpBrowser"
 msgid "Whole words only"
-msgstr "Tam szöcükler"
+msgstr "Tam sözcükler"
 
 msgctxt "HelpBrowser"
 msgid "Help Topics"
@@ -1522,21 +1545,18 @@ msgstr "Yardım içeriÄ?ini yüklerken hata oluÅ?tu:"
 
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
-msgstr "BaÅ?ka bir link açma"
+msgstr "Harici Link Açılıyor"
 
 msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidali seçmiÅ? olduÄ?unuz adresi web gezgininizde açabiliyor. EÄ?er web "
-"gezgininiz henüz ayarlanmamııÅ?sa isteÄ?iniz Tor üzerinden "
-"gerçekleÅ?meyecektir."
+msgstr "Vidali seçmiÅ? olduÄ?unuz adresi web gezgininizde açabiliyor. EÄ?er web gezgininiz henüz ayarlanmamııÅ?sa isteÄ?iniz Tor üzerinden gerçekleÅ?meyecektir."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Vidalianın web gezgininde açmasını istermisin?"
+msgstr "Vidalia'nın linki web tarayıcınızda açmasını ister misiniz?"
 
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
@@ -1546,9 +1566,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia seçtiÄ?iniz baÄ?lantıyı web gezgininizde açamıyor. Adresi web "
-"gezgininize kopyalayıp devam edebilirsiniz."
+msgstr "Vidalia seçtiÄ?iniz baÄ?lantıyı web tarayıcınızda açamıyor. Adresi web tarayıcınıza kopyalayıp devam edebilirsiniz."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1592,31 +1610,31 @@ msgstr "Bilinmeyen"
 
 msgctxt "LogTreeItem"
 msgid "Debug"
-msgstr ""
+msgstr "Hata ayıkla"
 
 msgctxt "LogTreeItem"
 msgid "Info"
-msgstr ""
+msgstr "Bilgi"
 
 msgctxt "LogTreeItem"
 msgid "Notice"
-msgstr ""
+msgstr "Bildirim"
 
 msgctxt "LogTreeItem"
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 msgctxt "LogTreeItem"
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 msgctxt "LogTreeItem"
 msgid "Unknown"
-msgstr ""
+msgstr "Bilinmeyen"
 
 msgctxt "MainWindow"
 msgid "Start Tor"
-msgstr "BaÅ?lat"
+msgstr "Tor'u BaÅ?lat"
 
 msgctxt "MainWindow"
 msgid "Exit"
@@ -1624,19 +1642,19 @@ msgstr "Ã?ıkıÅ?"
 
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
-msgstr "Band GrafiÄ?i"
+msgstr "BantgeniÅ?liÄ?i GrafiÄ?i"
 
 msgctxt "MainWindow"
 msgid "Message Log"
-msgstr "Günlükler"
+msgstr "Kayıtlar"
 
 msgctxt "MainWindow"
 msgid "Network Map"
-msgstr "AÄ? haritası"
+msgstr "AÄ? Haritası"
 
 msgctxt "MainWindow"
 msgid "Control Panel"
-msgstr "Kontol paneli"
+msgstr "Kontrol paneli"
 
 msgctxt "MainWindow"
 msgid "Settings"
@@ -1696,27 +1714,27 @@ msgstr "Yardım"
 
 msgctxt "MainWindow"
 msgid "Error starting web browser"
-msgstr "Web gezgini baÅ?latırlırken hata oluÅ?tu"
+msgstr "Web tarayıcısı baÅ?latılırken hata oluÅ?tu"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia web gezginini baÅ?latamıyor"
+msgstr "Vidalia web tarayıcısını baÅ?latamıyor"
 
 msgctxt "MainWindow"
 msgid "Error starting IM client"
-msgstr "Im kullanıcısını baÅ?latamada hata oluÅ?tu"
+msgstr "IM uygulamasını baÅ?latmada 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"
+msgstr "Vidalia IM uygulamasını baÅ?latamıyor"
 
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
-msgstr "Proxy sunucusu baÅ?latmada hata"
+msgstr "Vekil sunucusu baÅ?latmada hata"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Proxy sunucusu baÅ?latılamıyor"
+msgstr "Vekil sunucusu baÅ?latılamıyor"
 
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
@@ -1740,11 +1758,11 @@ msgstr "DoÄ?rulama sertifikalarını yüklüyor"
 
 msgctxt "MainWindow"
 msgid "Requesting relay information"
-msgstr "Aktarım bilgisi isteniyor"
+msgstr "Ayna bilgisi isteniyor"
 
 msgctxt "MainWindow"
 msgid "Loading relay information"
-msgstr "Aktarım bilgisi yükleniyor"
+msgstr "Ayna bilgisi yükleniyor"
 
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
@@ -1759,20 +1777,16 @@ 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"
 
 msgctxt "MainWindow"
 msgid "identity mismatch"
-msgstr "Kimlik uyumsuz"
+msgstr "kimlik uyumsuz"
 
 msgctxt "MainWindow"
 msgid "done"
-msgstr "Tamam"
+msgstr "tamam"
 
 msgctxt "MainWindow"
 msgid "connection refused"
@@ -1800,27 +1814,27 @@ msgstr "Bilinmeyen"
 
 msgctxt "MainWindow"
 msgid "Tor is not running"
-msgstr "Ã?alıÅ?mıyor"
+msgstr "Tor çalıÅ?mıyor"
 
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
-msgstr "Kapatılıyor"
+msgstr "Tor kapatılıyor"
 
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
-msgstr "Durdur"
+msgstr "Tor'u Å?imdi Durdur"
 
 msgctxt "MainWindow"
 msgid "Stop Tor"
-msgstr "Durdur"
+msgstr "Tor'u Durdur"
 
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
-msgstr "BaÅ?latılıyor"
+msgstr "Tor yazılımı baÅ?latılıyor"
 
 msgctxt "MainWindow"
 msgid "Starting Tor"
-msgstr "BaÅ?lıyor"
+msgstr "Tor baÅ?latılıyor"
 
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
@@ -1830,8 +1844,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia Tor'u baÅ?latamıyor.Ayarlardan belirlediÄ?iniz konumu kontrol ediniz."
+msgstr "Vidalia Tor'u baÅ?latamıyor.Ayarlardan belirlediÄ?iniz konumu kontrol ediniz."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1843,7 +1856,7 @@ msgstr "BaÄ?lantı hatası"
 
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
-msgstr "Aktarım aktif"
+msgstr "Ayna etkin."
 
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
@@ -1869,9 +1882,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor yazılımı kimlik doprulama çerezlerinin içerini vidaliaya göndermesi "
-"gerekiyor, ama çerez bulamıyor."
+msgstr "Tor yazılımı kimlik doprulama çerezlerinin içerini vidaliaya göndermesi gerekiyor, ama çerez bulamıyor."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1893,9 +1904,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia bazı olayarın kaydını gerçekleÅ?tiremedi.Å?u anda bir çok vidalia "
-"fonksiyonu çalıÅ?mıyor olabilir."
+msgstr "Vidalia bazı olayarın kaydını gerçekleÅ?tiremedi.Å?u anda bir çok vidalia fonksiyonu çalıÅ?mıyor olabilir."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1917,9 +1926,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Tor Å?u anda kullanmıÅ? olduÄ?unuz sürümü tavsiye etmiyor.Lütfen Tor'un "
-"websitesini ziyaret edip en son sürümünü indirin."
+msgstr "Tor Å?u anda kullanmıÅ? olduÄ?unuz sürümü tavsiye etmiyor.Lütfen Tor'un websitesini ziyaret edip en son sürümünü indirin."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1929,8 +1936,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Tüm alt baÄ?lantılarınız önceki baÄ?lantılarınızdan farklı gözükecektir."
+msgstr "Tüm alt baÄ?lantılarınız önceki baÄ?lantılarınızdan farklı gözükecektir."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -1938,7 +1944,7 @@ msgstr "Yeni kimlik alırken hata oluÅ?tu"
 
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
-msgstr "Port yanıtlarken hata oluÅ?tu"
+msgstr "Port iletirken hata oluÅ?tu"
 
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
@@ -1946,7 +1952,7 @@ msgstr "Vidalia port yanıtlama ayarlarını uygulayamıyor."
 
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
-msgstr "Kontrol Paneli"
+msgstr "Vidalia Kontrol Paneli"
 
 msgctxt "MainWindow"
 msgid "Status"
@@ -1954,15 +1960,15 @@ msgstr "Durum"
 
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
-msgstr "Kısayollar"
+msgstr "Vidalia Kısayollar"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "BaÄ?lantı ayarları\n"
+msgstr "Ayna Ayarları"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
-msgstr "Kendi aÄ?ınızı kurarak bu hizmetin büyümesine yardımcı olabilirsiniz."
+msgstr "Kendi aÄ?ınızı kurarak bu hizmetin büyümesine yardımcı olun"
 
 msgctxt "MainWindow"
 msgid "View the Network"
@@ -1982,11 +1988,11 @@ msgstr "Yeni baÄ?lantılar oluÅ?turur"
 
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
-msgstr "Band kullanımı"
+msgstr "Guncel bantgeniÅ?liÄ?i kullanımını görüntüle"
 
 msgctxt "MainWindow"
 msgid "View log message history"
-msgstr "Günlük kayıtları"
+msgstr "Günlük kayıtlarını görüntüle"
 
 msgctxt "MainWindow"
 msgid "View help documentation"
@@ -2025,18 +2031,13 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidilia kontrol Å?ifresinizi sıfırlamayı denedi, ama baÅ?aramadı.Lütfen "
-"programı yeniden baÅ?latın.Ayrıca görev yöneticinizden baÅ?ka tor programının "
-"çalıÅ?madıÄ?ından emin olun."
+msgstr "Vidilia kontrol Å?ifresinizi sıfırlamayı denedi, ama baÅ?aramadı.Lütfen programı yeniden baÅ?latın.Ayrıca görev yöneticinizden baÅ?ka tor programının çalıÅ?madıÄ?ından emin olun."
 
 msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended."
-msgstr ""
-"Tor Å?u anda kullanmıÅ? olduÄ?unuz versiyonu tavsyie etmiyor.Lütfen Tor'un "
-"websitesini ziyaret edip en son sürümünü indirin."
+msgstr "Tor Å?u anda kullanmıÅ? olduÄ?unuz versiyonu tavsyie etmiyor.Lütfen Tor'un websitesini ziyaret edip en son sürümünü indirin."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2051,8 +2052,7 @@ msgctxt "MainWindow"
 msgid ""
 "Tor has automatically closed your connection in order to protect your "
 "anonymity."
-msgstr ""
-"BaÄ?lantınız, gizliliÄ?iniz devam etmesi için otomatik olarak kapatıldı."
+msgstr "BaÄ?lantınız, gizliliÄ?iniz devam etmesi için otomatik olarak kapatıldı."
 
 msgctxt "MainWindow"
 msgid "Update Failed"
@@ -2085,7 +2085,25 @@ 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."
-msgstr ""
+msgstr "Bu baÄ?lantı üzerinden gönderilen herhangi birÅ?ey izlenebilir. Lütfen uygulamanızın ayarlarını kontrol edin ve eÄ?er mümkünse, sadece SSL gibi Å?ifreli protokolleri kullanın."
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Torrc %1 den %2 ye önyükleniyor"
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr "(muhtemelen Telnet)"
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr "(muhtemelen eposta istemcisi)"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr "Uygulamalarınızdan biri %1 , %2 portundan olası bir Å?ifrelenmemiÅ? ve güvensiz bir baÄ?lantı yapıyor."
 
 msgctxt "MainWindow"
 msgid "failed (%1)"
@@ -2098,42 +2116,33 @@ msgid ""
 msgstr "BaÄ?lantınız sonlandırılıyor."
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr ""
+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, Tor ile iletiÅ?im kuramadı çünkü %1 dosyasına eriÅ?emedi.\n\nSon hata mesajı:\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 "GörünüÅ?e göre Tor Vidalia nın baÅ?lamasıyla beraber durdu.\n\nDaha fazla bilgi için GeliÅ?miÅ? Mesaj Kaydı na bakın."
 
 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?"
-msgstr ""
-"Å?u anda bir çok noktaya baÄ?lısınız. Tüm baÄ?lantılarınız sonlandırılacak.\n"
-"\n"
-"Ã?ıkmak istediÄ?inizden emin misiniz?"
+msgstr "Å?u anda bir çok noktaya baÄ?lısınız. Tüm baÄ?lantılarınız sonlandırılacak.\n\nÃ?ıkmak istediÄ?inizden emin misiniz?"
 
 msgctxt "MainWindow"
 msgid ""
 "Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
-msgstr ""
-"Tor beklenmedik Å?ekilde sonlandırıldı.\n"
-"\n"
-"Günlük kayıtlarından hata sebebini kontrol edebilirsiniz."
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgstr "Tor beklenmedik Å?ekilde sonlandırıldı.\n\nGünlük kayıtlarından hata sebebini kontrol edebilirsiniz."
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2389,15 +2398,15 @@ msgstr "Yeni günlük mesajlarını otomatik kaydet"
 
 msgctxt "MessageLog"
 msgid "Basic"
-msgstr ""
+msgstr "Temel"
 
 msgctxt "MessageLog"
 msgid "Tor Status"
-msgstr ""
+msgstr "Tor Durumu"
 
 msgctxt "MessageLog"
 msgid "Advanced"
-msgstr ""
+msgstr "GeliÅ?miÅ?"
 
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
@@ -2407,17 +2416,13 @@ msgctxt "MessageLog"
 msgid ""
 "Messages that appear when something has \n"
 "gone very wrong and Tor cannot proceed."
-msgstr ""
-"Bu mesaj büyük bir sorun olduÄ?unda\n"
-"ortaya çıkar ve Tor çalıÅ?maz."
+msgstr "Bu mesaj büyük bir sorun olduÄ?unda\nortaya çıkar ve Tor çalıÅ?maz."
 
 msgctxt "MessageLog"
 msgid ""
 "Messages that only appear when \n"
 "something has gone wrong with Tor."
-msgstr ""
-"Bu mesaj sadece Tor'da \n"
-"sorun olduÄ?unda ortaya çıkar."
+msgstr "Bu mesaj sadece Tor'da \nsorun olduÄ?unda ortaya çıkar."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2425,9 +2430,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"Tor çalıÅ?ırken nadiren oluÅ?an\n"
-"ve hata olarak düÅ?ünülmeyen mesajlarla\\ilgilenmek isteyebilirsiniz."
+msgstr "Tor çalıÅ?ırken nadiren oluÅ?an\nve hata olarak düÅ?ünülmeyen mesajlarla\\ilgilenmek isteyebilirsiniz."
 
 msgctxt "MessageLog"
 msgid ""
@@ -2446,10 +2449,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"%1 dosyasına yazılamadı\n"
-"\n"
-"%2."
+msgstr "%1 dosyasına yazılamadı\n\n%2."
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2556,14 +2556,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Hatalı köprü"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "BelirlediÄ?iniz köprü tanımı geçerli deÄ?il."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Kopyala(Ctrl+C)"
 
@@ -2571,17 +2563,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Ä°nternet baÄ?lanırken proxy kullanmak için IP adresi veya Sunucu ve port "
-"numarası girmeniz gerekiyor."
+msgstr "Ä°nternet baÄ?lanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor."
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Firewall'un Tor aÄ?ına baÄ?lanabilmek için birden fazla port belirlemeniz "
-"gerekiyor."
+msgstr "Firewall'un Tor aÄ?ına baÄ?lanabilmek için birden fazla port belirlemeniz gerekiyor."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2589,9 +2577,7 @@ msgstr "'%1' geçerli bir port numarası deÄ?il."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"EÄ?er internete baÄ?lanmak için bir proxy sunucusuna ihtiyaç duyuyorsa bunu "
-"kontol et."
+msgstr "EÄ?er internete baÄ?lanmak için bir proxy sunucusuna ihtiyaç duyuyorsa bunu kontol et."
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2615,9 +2601,7 @@ msgstr "Port:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Güvenlik duvarı sadece izin verilen portlar üzerinden aktarım izni vermesini"
-" kontrol et"
+msgstr "Güvenlik duvarı sadece izin verilen portlar üzerinden aktarım izni vermesini kontrol et"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2639,9 +2623,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Tor aÄ?ına baÄ?lanmak için  köprü kullan yada Å?ifrelenmiÅ? klasördeki istekleri"
-" kontrol et"
+msgstr "Tor aÄ?ına baÄ?lanmak için  köprü kullan yada Å?ifrelenmiÅ? klasördeki istekleri kontrol et"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2679,9 +2661,7 @@ msgctxt "NetworkPage"
 msgid ""
 "No new bridges are currently available. You can either wait a while and try "
 "again, or try another method of finding new bridges."
-msgstr ""
-"Yeni bir köprü bulunmuyor. Biraz bekleyip tekrar deneyebilirsiniz ya da yeni"
-" köprü bulmak için baÅ?ka bir yöntem deneyebilirsiniz."
+msgstr "Yeni bir köprü bulunmuyor. Biraz bekleyip tekrar deneyebilirsiniz ya da yeni köprü bulmak için baÅ?ka bir yöntem deneyebilirsiniz."
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
@@ -2689,31 +2669,31 @@ msgstr "Yeni köprü bulmanın diÄ?er yöntemlerini görmek için Yardım'a tık
 
 msgctxt "NetworkPage"
 msgid "Address:"
-msgstr ""
+msgstr "Adres:"
 
 msgctxt "NetworkPage"
 msgid "Type:"
-msgstr ""
+msgstr "Tür:"
 
 msgctxt "NetworkPage"
 msgid "You must select the proxy type."
-msgstr ""
+msgstr "Vekil sunucu türünü seçmelisiniz."
 
 msgctxt "NetworkPage"
 msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
 
 msgctxt "NetworkPage"
 msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
+msgid "You must specify one or more bridges."
+msgstr "Bir ya da daha fazla köprü belirtmelisiniz."
 
 msgctxt "Policy"
 msgid "accept"
@@ -2871,9 +2851,7 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Ayarlarınız Tor'u köprü gibi davranmaya zorluyor, ama Å?u anki sürümü "
-"köprülemeyi desteklemiyor."
+msgstr "Ayarlarınız Tor'u köprü gibi davranmaya zorluyor, ama Å?u anki sürümü köprülemeyi desteklemiyor."
 
 msgctxt "ServerPage"
 msgid ""
@@ -2894,10 +2872,6 @@ msgid "Run as a client only"
 msgstr "Sadece kullanıcı olarak çalıÅ?tır"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor aÄ?ının bir parçası olmak istiyorum"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "Aktarım portu:"
 
@@ -3007,9 +2981,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Maximum bantgeniÅ?liÄ?i oranı mevcut bandgeniÅ?lÄ?i ortlamasına büyük veya eÅ?it,"
-" iki deÄ?erde en az 20KB/s olmalı."
+msgstr "Maximum bantgeniÅ?liÄ?i oranı mevcut bandgeniÅ?lÄ?i ortlamasına büyük veya eÅ?it, iki deÄ?erde en az 20KB/s olmalı."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3070,17 +3042,13 @@ msgstr "Ä°zin verilen politikalarla ilgi yardım baÅ?lıklarını göster"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Hangi  internet kaynakları kullanıcılar tarafından sizin üzerinizden "
-"ulaÅ?abilir?"
+msgstr "Hangi  internet kaynakları kullanıcılar tarafından sizin üzerinizden ulaÅ?abilir?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor hala bazı dıÅ?arıya giden mail ve dosya paylaÅ?ım uygulamalarını "
-"varsayılan ayarlara göre spamları azaltmak için engelliyor."
+msgstr "Tor hala bazı dıÅ?arıya giden mail ve dosya paylaÅ?ım uygulamalarını varsayılan ayarlara göre spamları azaltmak için engelliyor."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3111,9 +3079,7 @@ msgctxt "ServerPage"
 msgid ""
 "Leave your relay running so clients have a better chance of finding and "
 "using it."
-msgstr ""
-"Geçidinizi çalıÅ?ır durumda bırakmanız diÄ?er istemcilerin onu bulma ve "
-"kullanma Å?ansını arttıracaktır."
+msgstr "Geçidinizi çalıÅ?ır durumda bırakmanız diÄ?er istemcilerin onu bulma ve kullanma Å?ansını arttıracaktır."
 
 msgctxt "ServerPage"
 msgid "Bridge History"
@@ -3127,9 +3093,7 @@ msgctxt "ServerPage"
 msgid ""
 "Tor returned an improperly formatted response when Vidalia requested your "
 "bridge's usage history."
-msgstr ""
-"Vidalia körünüzün kullanım geçmiÅ?ini sorgularken Tor beklenmedik biçemde bir"
-" yanıt döndürdü."
+msgstr "Vidalia körünüzün kullanım geçmiÅ?ini sorgularken Tor beklenmedik biçemde bir yanıt döndürdü."
 
 msgctxt "ServerPage"
 msgid "The returned response was: %1"
@@ -3137,8 +3101,7 @@ msgstr "Dönen cevap: %1."
 
 msgctxt "ServerPage"
 msgid "Help censored users reach the Tor network"
-msgstr ""
-"Tor aÄ?ına eriÅ?irken yardımı gösterme(Tor 0.2.0.8-alpha yada daha yeni)"
+msgstr "Tor aÄ?ına eriÅ?irken yardımı gösterme(Tor 0.2.0.8-alpha yada daha yeni)"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3146,11 +3109,19 @@ msgstr "<a href=\"bridges.finding\">Nasıl bir köprü bulabilirim?</a>"
 
 msgctxt "ServerPage"
 msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Bu nedir?</a>"
 
 msgctxt "ServerPage"
 msgid "Automatically distribute my bridge address"
-msgstr ""
+msgstr "Köprü adresimi otomatik olarak daÄ?ıt"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Tor aÄ?ının bir parçası(relay) olun. (son sunucu)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Tor aÄ?ının bir parçası(relay) olun. (ara sunucu)"
 
 msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
@@ -3160,9 +3131,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "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."
+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"
@@ -3172,9 +3141,7 @@ 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."
+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"
@@ -3250,26 +3217,26 @@ msgstr "Tor tarafından oluÅ?uturuldu"
 
 msgctxt "StatusEventWidget"
 msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Panoya kopyala."
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Tor yazılımı çalıÅ?ıyor."
 
 msgctxt "StatusEventWidget"
 msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Å?u anda Tor yazılımının \"%1\" versiyonunu kullanmaktasınız."
 
 msgctxt "StatusEventWidget"
 msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Tor yazılımı çalıÅ?mıyor."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
+msgstr "Tor yazılımını yeniden baÅ?latmak için Vidalia Kontrol Panelinde \"Tor'u BaÅ?lat\" a basın. Tor beklenmeden çıktıysa, karÅ?ılaÅ?ılan hatalarla ilgili detaylar için yukardan \"GeliÅ?miÅ?\" tabini seçin."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3277,7 +3244,7 @@ msgid ""
 "longer recommended. Please upgrade to the most recent version of the "
 "software, which may contain important security, reliability and performance "
 "fixes."
-msgstr ""
+msgstr "Tor yazılımının önerilmeyen \"%1\" versiyonunu kullanmaktasınız. Lütfen önemli güvenlik ve performans düzeltmeleri içerebilecek en son versiyona yükseltin."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3285,31 +3252,31 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
+msgstr "Tor yazılımının mevcut Tor aÄ?ıyla çalıÅ?mayan \"%1\" versiyonunu kullanmaktasınız. z. Lütfen önemli güvenlik ve performans düzeltmeleri içerebilecek en son versiyona yükseltin."
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Tor yazılımınızın tarihi geçmiÅ?."
 
 msgctxt "StatusEventWidget"
 msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Tor aÄ?ına baÄ?lanıldı."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "We were able to successfully establish a connection to the Tor network. You "
 "can now configure your applications to use the Internet anonymously."
-msgstr ""
+msgstr "Tor aÄ?ına baÄ?lantıyı baÅ?arıyla gerçekleÅ?tirdik. Å?imdi programlarınızı Internet'i anonim olarak kullanmak uzere ayarlayabilirsiniz."
 
 msgctxt "StatusEventWidget"
 msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor yazılım hatası"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "The Tor software encountered an internal bug. Please report the following "
 "error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
+msgstr "Tor programı bir hatayla karÅ?ılaÅ?tı. Lütfen hata mesajını Tor geliÅ?tiricilerine developers at bugs.torproject.org adresinden bildirin. Hata mesajı: \"%1\""
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3317,7 +3284,7 @@ msgid ""
 "the past compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "Tor bilgisayarınızın saatinin, \"%2\" kaynaÄ?ına göre karÅ?ılaÅ?tırıldıÄ?ında %1 saniye geride olduÄ?unu belirledi. Saatiniz doÄ?ru deÄ?ilse Tor çalıÅ?amayacaktır. Lütfen bilgisayarınızın doÄ?ru saati gösterdiÄ?inden emin olun."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3325,11 +3292,11 @@ msgid ""
 "the future compared to the source \"%2\". If your clock is not correct, Tor "
 "will not be able to function. Please verify your computer displays the "
 "correct time."
-msgstr ""
+msgstr "Tor bilgisayarınızın saatinin, \"%2\" kaynaÄ?ına göre karÅ?ılaÅ?tırıldıÄ?ında %1 saniye geride olduÄ?unu belirledi. Saatiniz doÄ?ru deÄ?ilse Tor çalıÅ?amayacaktır. Lütfen bilgisayarınızın doÄ?ru saati gösterdiÄ?inden emin olun."
 
 msgctxt "StatusEventWidget"
 msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Bilgisayarınızın saati muhtemelen yanlıÅ?."
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3337,18 +3304,18 @@ msgid ""
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended. For your "
 "protection, Tor has automatically closed this connection."
-msgstr ""
+msgstr "Bilgisayarınızdaki uygulamalardan biri Tor üzerinden %1 portuna Å?ifrelenmemiÅ? baÄ?lantı kurmayı denedi. Tor aÄ?ı üzerinden Å?ifrelenmemiÅ? veri göndermek tehlikelidir ve önerilmez. Tor bu baÄ?lantıyı sizin güvenliÄ?iniz için otomatik olarak kesti."
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of the applications on your computer may have attempted to make an "
 "unencrypted connection through Tor to port %1. Sending unencrypted "
 "information over the Tor network is dangerous and not recommended."
-msgstr ""
+msgstr "Bilgisayarınızdaki uygulamalardan biri Tor üzerinden %1 portuna Å?ifrelenmemiÅ? baÄ?lantı kurmayı denedi. Tor aÄ?ı üzerinden Å?ifrelenmemiÅ? veri göndermek tehlikelidir ve önerilmez."
 
 msgctxt "StatusEventWidget"
 msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Olası Tehlikeli BaÄ?lantı!"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3356,44 +3323,44 @@ msgid ""
 "using a protocol that may leak information about your destination. Please "
 "ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
 "remote hostname resolution."
-msgstr ""
+msgstr "Uygulamalarınızdan biri \"%1\"e Tor üzerinden yeriniz hakkında bilgi sızdırabilecek bir baÄ?lantı saÄ?ladı. Lütfen uygulamalarınızın sadece SOCKS4a ya da SOCKS5 kullanmak üzere yapılandırıldıÄ?ından emin olun. "
 
 msgctxt "StatusEventWidget"
 msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "Bilinmeyen SOCKS Protokolü"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor using a"
 " protocol that Tor does not understand. Please ensure you configure your "
 "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
+msgstr "Uygulamalarınızdan biri Tor'un anlamadıÄ?ı bir protokol kullanarak Tor üzerinden baÄ?lantı kurmaya çalıÅ?tı. Lütfen uygulamalarınızın sadece SOCKS4a ya da SOCKS5 kullanmak üzere yapılandırıldıÄ?ından emin olun."
 
 msgctxt "StatusEventWidget"
 msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "Geçersiz Hedef Makine Ismi"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "One of your applications tried to establish a connection through Tor to "
 "\"%1\", which Tor does not recognize as a valid hostname. Please check your "
 "application's configuration."
-msgstr ""
+msgstr "Uygulamalarınızdan biri Tor'un geçerli bir sunucu adı olarak tanımadıÄ?ı \"%1\" sunucusuyla baÄ?lantı kurmaya çalıÅ?tı. Lütfen uygulamanızın yapılandırmasını kontrol edin."
 
 msgctxt "StatusEventWidget"
 msgid "External IP Address Changed"
-msgstr ""
+msgstr "Harici IP Adresi DeÄ?iÅ?ti"
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor has determined your relay's public IP address is currently %1%2. If that"
 " is not correct, please consider setting the 'Address' option in your "
 "relay's configuration."
-msgstr ""
+msgstr "Tor relayinizin IP adresinin %1%2 olduÄ?unu belirledi. DoÄ?ru deÄ?ilse lütfen relayinizin yapılandırmasındaki 'Adres' alanını ayarlayın."
 
 msgctxt "StatusEventWidget"
 msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "DNS Hijackingi Tespit Edildi"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3411,26 +3378,26 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Sunucu Port UlaÅ?ılabilirliÄ?i kontrol ediliyor. "
 
 msgctxt "StatusEventWidget"
 msgid ""
 "Tor is trying to determine if your relay's server port is reachable from the"
 " Tor network by connecting to itself at %1:%2. This test could take several "
 "minutes."
-msgstr ""
+msgstr "Tor, relayinizin Tor aÄ?ından eriÅ?ilebilirliÄ?ini kendisine %1:%2 de baÄ?lanarak kontrol ediyor. Bu test bir kaç dakika alabilir."
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Sunucu Port UlaÅ?ılabilirlik Testi BaÅ?arılı"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "Relayinizin sunucu portu Tor aÄ?ından eriÅ?ilebilir!"
 
 msgctxt "StatusEventWidget"
 msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Sunucu Port UlaÅ?ılabilirlik Testi BaÅ?arısız"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3442,7 +3409,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Dizin Port UlaÅ?ılabilirliÄ?i Kontrol Ediliyor"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3453,15 +3420,15 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Dizin Port UlaÅ?ılabilirliÄ?i Testi BaÅ?arılı"
 
 msgctxt "StatusEventWidget"
 msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "Relayinizin dizin portu Tor aÄ?ından eriÅ?ilebilir!"
 
 msgctxt "StatusEventWidget"
 msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Dizin Port UlaÅ?ılabilirliÄ?i Testi BaÅ?arısız"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3473,7 +3440,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Ayna Açıklaması Reddedildi"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3483,7 +3450,7 @@ msgstr ""
 
 msgctxt "StatusEventWidget"
 msgid "Your Relay is Online"
-msgstr ""
+msgstr "Aynanız �evrimiçi"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3491,7 +3458,7 @@ msgid ""
 "see an increase in network traffic shown by the Bandwidth Graph within a few"
 " hours as more clients learn about your relay. Thank you for contributing to"
 " the Tor network!"
-msgstr ""
+msgstr "Aynanız çevrimiçi ve diÄ?er Tor kullanıcılarına açık. Birkaç saat içinde diÄ?er kullanıcılar aynanızı öÄ?rendikçe aÄ? trafiÄ?indeki artıÅ?ı GeniÅ?bant GrafiÄ?inde görebilirsiniz. Tor aÄ?ına katkıda bulunduÄ?unuz için teÅ?ekkür ederiz!"
 
 msgctxt "Stream"
 msgid "New"
@@ -3547,65 +3514,65 @@ msgstr "Kontrol Å?ifresinin hash kodunda hata oluÅ?tu."
 
 msgctxt "TorrcDialog"
 msgid "Editing torrc"
-msgstr ""
+msgstr "torrc düzenleniyor"
 
 msgctxt "TorrcDialog"
 msgid ""
 "Save settings. If unchecked it will only apply settings to the current Tor "
 "instance."
-msgstr ""
+msgstr "Ayarları kaydet. IÅ?aretlenmezse sadece Å?uanki Tor "
 
 msgctxt "TorrcDialog"
 msgid "Cut"
-msgstr ""
+msgstr "Kes"
 
 msgctxt "TorrcDialog"
 msgid "Copy"
-msgstr ""
+msgstr "Kopyala"
 
 msgctxt "TorrcDialog"
 msgid "Paste"
-msgstr ""
+msgstr "YapıÅ?tır"
 
 msgctxt "TorrcDialog"
 msgid "Undo"
-msgstr ""
+msgstr "Geri al"
 
 msgctxt "TorrcDialog"
 msgid "Redo"
-msgstr ""
+msgstr "Yenile"
 
 msgctxt "TorrcDialog"
 msgid "Select All"
-msgstr ""
+msgstr "Hepsini Seç"
 
 msgctxt "TorrcDialog"
 msgid "Apply all"
-msgstr ""
+msgstr "Hepsini uygula"
 
 msgctxt "TorrcDialog"
 msgid "Apply selection only"
-msgstr ""
+msgstr "Seçimi uygula"
 
 msgctxt "TorrcDialog"
 msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Tor'a baÄ?lantı hatası"
 
 msgctxt "TorrcDialog"
 msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
+msgstr "BoÅ? seçim. Lütfen biraz metin seçin, ya da \"Tümüne uygula\"yı iÅ?aretleyin."
 
 msgctxt "TorrcDialog"
 msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Satır %1 de hata: \"%2\""
 
 msgctxt "TorrcDialog"
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 msgctxt "TorrcDialog"
 msgid "An error ocurred while opening torrc file"
-msgstr ""
+msgstr "torrc dosyasını açarken hata oluÅ?tu"
 
 msgctxt "UPNPControl"
 msgid "Success"
@@ -3667,16 +3634,13 @@ msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because it could "
 "not find '%1'."
-msgstr ""
-"Vidalia yazılımın güncellemesini kontrol edemiyor çünkü %1 bulunamadı."
+msgstr "Vidalia yazılımın güncellemesini kontrol edemiyor çünkü %1 bulunamadı."
 
 msgctxt "UpdateProcess"
 msgid ""
 "Vidalia was unable to check for available software updates because Tor's "
 "update process exited unexpectedly."
-msgstr ""
-"Vidalia yazılımın güncellemesini kontrol edemiyor çünkü Tor'un güncelleme "
-"yazılımı beklenmedik bir Å?ekilde sonuçlandı."
+msgstr "Vidalia yazılımın güncellemesini kontrol edemiyor çünkü Tor'un güncelleme yazılımı beklenmedik bir Å?ekilde sonuçlandı."
 
 msgctxt "UpdateProgressDialog"
 msgid "Checking for available updates..."
@@ -3832,7 +3796,7 @@ msgstr "Günlük dosyası açılamıyor'%1':%2"
 
 msgctxt "Vidalia"
 msgid "Value required for parameter :"
-msgstr ""
+msgstr "Parametre için gereken deÄ?er :"
 
 msgctxt "Vidalia"
 msgid "Invalid language code specified:"
@@ -3851,9 +3815,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"Å?u anda vidalia zaten çalıÅ?ıyor.BaÅ?ka bir vidalia uygulaması baÅ?latmak "
-"istediÄ?inden emin misin?"
+msgstr "Å?u anda vidalia zaten çalıÅ?ıyor.BaÅ?ka bir vidalia uygulaması baÅ?latmak istediÄ?inden emin misin?"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3886,5 +3848,3 @@ msgstr " saat"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 dakika"
-
-
diff --git a/src/vidalia/i18n/po/uk/qt_uk.po b/src/vidalia/i18n/po/uk/qt_uk.po
index d6af17c..2af877f 100644
--- a/src/vidalia/i18n/po/uk/qt_uk.po
+++ b/src/vidalia/i18n/po/uk/qt_uk.po
@@ -1,11 +1,16 @@
-# 
+# Translators:
+# Translators:
+# <demonuk9@xxxxxxxxx>, 2011.
+#   <demonuk9@xxxxxxxxx>, 2011.
+#   <vadim2007@xxxxxxx>, 2012.
+# Ð?миÑ?Ñ?о <demonuk9@xxxxxxxxx>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2012-04-14 16:47+0000\n"
+"Last-Translator: Vadym Stavskyi <vadim2007@xxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,189 +22,189 @@ msgstr ""
 #: qaccessibleobject.cpp:348
 msgctxt "QApplication"
 msgid "Activate"
-msgstr ""
+msgstr "Ð?кÑ?ивÑ?ваÑ?и"
 
 #: qmessagebox.h:319
 msgctxt "QApplication"
 msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr ""
+msgstr "Ð?иконÑ?ванÑ? '%1' поÑ?Ñ?Ñ?бно Qt %2, знайдено Qt %3."
 
 #: qmessagebox.h:321
 msgctxt "QApplication"
 msgid "Incompatible Qt Library Error"
-msgstr ""
+msgstr "Ð?еÑ?Ñ?мÑ?Ñ?на помилка бÑ?блÑ?оÑ?еки Qt"
 
 #: qapplication.cpp:2095
 msgctxt "QApplication"
 msgid "QT_LAYOUT_DIRECTION"
-msgstr ""
+msgstr "QT_LAYOUT_DIRECTION"
 
 #: qaccessibleobject.cpp:350
 msgctxt "QApplication"
 msgid "Activates the program's main window"
-msgstr ""
+msgstr "Ð?кÑ?ивÑ?Ñ? головне вÑ?кно пÑ?огÑ?ами"
 
 #: qmessagebox.cpp:2104
 msgctxt "QDialogButtonBox"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: qdialogbuttonbox.cpp:528
 msgctxt "QDialogButtonBox"
 msgid "Save"
-msgstr ""
+msgstr "Ð?беÑ?егÑ?и"
 
 #: qdialogbuttonbox.cpp:531
 msgctxt "QDialogButtonBox"
 msgid "Open"
-msgstr ""
+msgstr "Ð?Ñ?дкÑ?иÑ?и"
 
 #: qdialogbuttonbox.cpp:534
 msgctxt "QDialogButtonBox"
 msgid "Cancel"
-msgstr ""
+msgstr "СкаÑ?Ñ?ваÑ?и"
 
 #: qdialogbuttonbox.cpp:537
 msgctxt "QDialogButtonBox"
 msgid "Close"
-msgstr ""
+msgstr "Ð?акÑ?иÑ?и"
 
 #: qdialogbuttonbox.cpp:540
 msgctxt "QDialogButtonBox"
 msgid "Apply"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?оÑ?Ñ?ваÑ?и"
 
 #: qdialogbuttonbox.cpp:543
 msgctxt "QDialogButtonBox"
 msgid "Reset"
-msgstr ""
+msgstr "Ð?еÑ?езаванÑ?ажиÑ?и"
 
 #: qdialogbuttonbox.cpp:546
 msgctxt "QDialogButtonBox"
 msgid "Help"
-msgstr ""
+msgstr "Ð?опомога"
 
 #: qdialogbuttonbox.cpp:550
 msgctxt "QDialogButtonBox"
 msgid "Don't Save"
-msgstr ""
+msgstr "Ð?е збеÑ?Ñ?гаÑ?и"
 
 #: qdialogbuttonbox.cpp:554
 msgctxt "QDialogButtonBox"
 msgid "Discard"
-msgstr ""
+msgstr "Ð?Ñ?дÑ?илиÑ?и"
 
 #: qdialogbuttonbox.cpp:557
 msgctxt "QDialogButtonBox"
 msgid "&Yes"
-msgstr ""
+msgstr "Так"
 
 #: qdialogbuttonbox.cpp:560
 msgctxt "QDialogButtonBox"
 msgid "Yes to &All"
-msgstr ""
+msgstr "Так длÑ? вÑ?Ñ?Ñ?"
 
 #: qdialogbuttonbox.cpp:563
 msgctxt "QDialogButtonBox"
 msgid "&No"
-msgstr ""
+msgstr "Ð?Ñ?"
 
 #: qdialogbuttonbox.cpp:566
 msgctxt "QDialogButtonBox"
 msgid "N&o to All"
-msgstr ""
+msgstr "Ð?Ñ? длÑ? вÑ?Ñ?Ñ?"
 
 #: qdialogbuttonbox.cpp:569
 msgctxt "QDialogButtonBox"
 msgid "Save All"
-msgstr ""
+msgstr "Ð?беÑ?егÑ?и вÑ?Ñ?"
 
 #: qdialogbuttonbox.cpp:572
 msgctxt "QDialogButtonBox"
 msgid "Abort"
-msgstr ""
+msgstr "Ð?Ñ?ипиниÑ?и"
 
 #: qdialogbuttonbox.cpp:575
 msgctxt "QDialogButtonBox"
 msgid "Retry"
-msgstr ""
+msgstr "Ð?овÑ?оÑ?иÑ?и"
 
 #: qdialogbuttonbox.cpp:578
 msgctxt "QDialogButtonBox"
 msgid "Ignore"
-msgstr ""
+msgstr "Ð?гноÑ?Ñ?ваÑ?и"
 
 #: qdialogbuttonbox.cpp:581
 msgctxt "QDialogButtonBox"
 msgid "Restore Defaults"
-msgstr ""
+msgstr "Ð?Ñ?дновиÑ?и поÑ?аÑ?ковий Ñ?Ñ?ан"
 
 #: qdialogbuttonbox.cpp:552
 msgctxt "QDialogButtonBox"
 msgid "Close without Saving"
-msgstr ""
+msgstr "Ð?акÑ?иÑ?и без збеÑ?еженнÑ?"
 
 #: qdialogbuttonbox.cpp:525
 msgctxt "QDialogButtonBox"
 msgid "&OK"
-msgstr ""
+msgstr "Ð?обÑ?е"
 
 #: qdirmodel.cpp:423
 msgctxt "QDirModel"
 msgid "Name"
-msgstr ""
+msgstr "Ð?азва"
 
 #: qdirmodel.cpp:424
 msgctxt "QDirModel"
 msgid "Size"
-msgstr ""
+msgstr "РозмÑ?Ñ?"
 
 #: qdirmodel.cpp:427
 msgctxt "QDirModel"
 msgid "Kind"
-msgstr ""
+msgstr "Ð?ид"
 
 #: qdirmodel.cpp:429
 msgctxt "QDirModel"
 msgid "Type"
-msgstr ""
+msgstr "Ñ?ип"
 
 #: qdirmodel.cpp:435
 msgctxt "QDirModel"
 msgid "Date Modified"
-msgstr ""
+msgstr "Ð?аÑ?а змÑ?ни"
 
 #: qfiledialog_win.cpp:126
 msgctxt "QFileDialog"
 msgid "All Files (*)"
-msgstr ""
+msgstr "Ð?Ñ?Ñ? Ñ?айли (*)"
 
 #: qfiledialog.cpp:881
 msgctxt "QFileDialog"
 msgid "Directories"
-msgstr ""
+msgstr "Ð?иÑ?екÑ?оÑ?Ñ?Ñ?"
 
 #: qfiledialog.cpp:2408
 msgctxt "QFileDialog"
 msgid "&Open"
-msgstr ""
+msgstr "Ð?Ñ?дкÑ?иÑ?и"
 
 #: qfiledialog.cpp:919
 msgctxt "QFileDialog"
 msgid "&Save"
-msgstr ""
+msgstr "Ð?беÑ?егÑ?и"
 
 #: qfiledialog.cpp:435
 msgctxt "QFileDialog"
 msgid "Open"
-msgstr ""
+msgstr "Ð?Ñ?дкÑ?иÑ?и"
 
 #: qfiledialog.cpp:1670
 msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
+msgstr "%1 вже Ñ?Ñ?нÑ?Ñ?.\nÐ?и Ñ?оÑ?еÑ?е замÑ?ниÑ?и його?"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -207,57 +212,57 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
+msgstr "%1\nФайл не знайдено.\nÐ?еÑ?евÑ?Ñ?Ñ?е, бÑ?дÑ? лаÑ?ка, коÑ?екÑ?нÑ?Ñ?Ñ?Ñ? вводÑ? Ñ?менÑ? Ñ?айлÑ?."
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
 msgid "My Computer"
-msgstr ""
+msgstr "Ð?Ñ?й Ð?омп'Ñ?Ñ?еÑ?"
 
 #: qfiledialog.cpp:462
 msgctxt "QFileDialog"
 msgid "&Rename"
-msgstr ""
+msgstr "Ð?еÑ?ейменÑ?ваÑ?и"
 
 #: qfiledialog.cpp:463
 msgctxt "QFileDialog"
 msgid "&Delete"
-msgstr ""
+msgstr "Ð?идалиÑ?и"
 
 #: qfiledialog.cpp:464
 msgctxt "QFileDialog"
 msgid "Show &hidden files"
-msgstr ""
+msgstr "Ð?оказаÑ?и/пÑ?иÑ?оваÑ?и Ñ?айли"
 
 #: ui_qfiledialog.h:264
 msgctxt "QFileDialog"
 msgid "Back"
-msgstr ""
+msgstr "Ð?азад"
 
 #: ui_qfiledialog.h:274
 msgctxt "QFileDialog"
 msgid "Parent Directory"
-msgstr ""
+msgstr "Ð?аÑ?Ñ?кÑ?вÑ?Ñ?ка диÑ?екÑ?оÑ?Ñ?Ñ?"
 
 #: ui_qfiledialog.h:284
 msgctxt "QFileDialog"
 msgid "List View"
-msgstr ""
+msgstr "Ð?еÑ?еглÑ?д Ñ?пиÑ?ком"
 
 #: ui_qfiledialog.h:289
 msgctxt "QFileDialog"
 msgid "Detail View"
-msgstr ""
+msgstr "Ð?еÑ?алÑ?ний пеÑ?еглÑ?д"
 
 #: ui_qfiledialog.h:292
 msgctxt "QFileDialog"
 msgid "Files of type:"
-msgstr ""
+msgstr "Тип Ñ?айлÑ?в:"
 
 #: qfiledialog.cpp:883
 msgctxt "QFileDialog"
 msgid "Directory:"
-msgstr ""
+msgstr "Ð?иÑ?екÑ?оÑ?Ñ?Ñ?:"
 
 #: qfiledialog.cpp:2476
 msgctxt "QFileDialog"
@@ -265,168 +270,168 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
+msgstr "%1\nÐ?иÑ?екÑ?оÑ?Ñ?Ñ? не знайдено.\nÐ?еÑ?евÑ?Ñ?Ñ?е, бÑ?дÑ? лаÑ?ка, коÑ?екÑ?нÑ?Ñ?Ñ?Ñ? вводÑ? Ñ?менÑ? диÑ?екÑ?оÑ?Ñ?Ñ?."
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
+msgstr "'%1' заÑ?иÑ?ений вÑ?д запиÑ?Ñ?.\nÐ?Ñ?еодно видалиÑ?и?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
 msgid "Are sure you want to delete '%1'?"
-msgstr ""
+msgstr "Ð?и впевненÑ?, Ñ?о Ñ?оÑ?еÑ?е видалиÑ?и '%1'?"
 
 #: qfiledialog.cpp:2299
 msgctxt "QFileDialog"
 msgid "Could not delete directory."
-msgstr ""
+msgstr "Ð?е вдалоÑ?Ñ? видалиÑ?и диÑ?екÑ?оÑ?Ñ?Ñ?."
 
 #: qfiledialog_win.cpp:128
 msgctxt "QFileDialog"
 msgid "All Files (*.*)"
-msgstr ""
+msgstr "Ð?Ñ?Ñ? Ñ?айли (*.*)"
 
 #: qfiledialog.cpp:437
 msgctxt "QFileDialog"
 msgid "Save As"
-msgstr ""
+msgstr "Ð?беÑ?егÑ?и Ñ?к"
 
 #: qfileiconprovider.cpp:379
 msgctxt "QFileDialog"
 msgid "Drive"
-msgstr ""
+msgstr "Ð?еÑ?Ñ?ваннÑ?"
 
 #: qfileiconprovider.cpp:383
 msgctxt "QFileDialog"
 msgid "File"
-msgstr ""
+msgstr "Файл"
 
 #: qfileiconprovider.cpp:412
 msgctxt "QFileDialog"
 msgid "Unknown"
-msgstr ""
+msgstr "Ð?евÑ?домо"
 
 #: qfiledialog.cpp:439
 msgctxt "QFileDialog"
 msgid "Find Directory"
-msgstr ""
+msgstr "Ð?найÑ?и диÑ?екÑ?оÑ?Ñ?Ñ?"
 
 #: qfiledialog.cpp:458
 msgctxt "QFileDialog"
 msgid "Show "
-msgstr ""
+msgstr "Ð?оказаÑ?и"
 
 #: ui_qfiledialog.h:269
 msgctxt "QFileDialog"
 msgid "Forward"
-msgstr ""
+msgstr "Ð?пеÑ?ед"
 
 #: qfiledialog.cpp:2137
 msgctxt "QFileDialog"
 msgid "New Folder"
-msgstr ""
+msgstr "Ð?ова папка"
 
 #: qfiledialog.cpp:465
 msgctxt "QFileDialog"
 msgid "&New Folder"
-msgstr ""
+msgstr "Ð?ова папка"
 
 #: qfiledialog.cpp:917
 msgctxt "QFileDialog"
 msgid "&Choose"
-msgstr ""
+msgstr "Ð?ибÑ?аÑ?и"
 
 #: qsidebar.cpp:388
 msgctxt "QFileDialog"
 msgid "Remove"
-msgstr ""
+msgstr "Ð?идалиÑ?и"
 
 #: qfiledialog.cpp:886
 msgctxt "QFileDialog"
 msgid "File &name:"
-msgstr ""
+msgstr "Ð?м'Ñ? Ñ?айлÑ?"
 
 #: ui_qfiledialog.h:261
 msgctxt "QFileDialog"
 msgid "Look in:"
-msgstr ""
+msgstr "Ð?одивиÑ?иÑ?Ñ? Ñ?:"
 
 #: ui_qfiledialog.h:279
 msgctxt "QFileDialog"
 msgid "Create New Folder"
-msgstr ""
+msgstr "СÑ?воÑ?иÑ?и новÑ? папкÑ?"
 
 #: qfilesystemmodel.cpp:761
 msgctxt "QFileSystemModel"
 msgid "Invalid filename"
-msgstr ""
+msgstr "Ð?епÑ?ипÑ?Ñ?Ñ?име Ñ?м'Ñ? Ñ?айлÑ?"
 
 #: qfilesystemmodel.cpp:763
 msgctxt "QFileSystemModel"
 msgid ""
 "<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
 " characters or no punctuations marks."
-msgstr ""
+msgstr "<b>Ð?азва \"%1\" не може бÑ?Ñ?и викоÑ?иÑ?Ñ?ана.</b> <p> СпÑ?обÑ?йÑ?е викоÑ?иÑ?Ñ?аÑ?и Ñ?нÑ?е Ñ?м'Ñ?, але з менÑ?оÑ? кÑ?лÑ?кÑ?Ñ?Ñ?Ñ? Ñ?имволÑ?в Ñ?и без знакÑ?в пÑ?нкÑ?Ñ?аÑ?Ñ?Ñ?."
 
 #: qfilesystemmodel.cpp:832
 msgctxt "QFileSystemModel"
 msgid "Name"
-msgstr ""
+msgstr "Ð?м'Ñ?"
 
 #: qfilesystemmodel.cpp:834
 msgctxt "QFileSystemModel"
 msgid "Size"
-msgstr ""
+msgstr "РозмÑ?Ñ?"
 
 #: qfilesystemmodel.cpp:838
 msgctxt "QFileSystemModel"
 msgid "Kind"
-msgstr ""
+msgstr "Ð?ид"
 
 #: qfilesystemmodel.cpp:840
 msgctxt "QFileSystemModel"
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: qfilesystemmodel.cpp:847
 msgctxt "QFileSystemModel"
 msgid "Date Modified"
-msgstr ""
+msgstr "Ð?аÑ?а змÑ?ни"
 
 #: qfilesystemmodel_p.h:198
 msgctxt "QFileSystemModel"
 msgid "My Computer"
-msgstr ""
+msgstr "Ð?Ñ?й комп'Ñ?Ñ?еÑ?"
 
 #: qfilesystemmodel_p.h:200
 msgctxt "QFileSystemModel"
 msgid "Computer"
-msgstr ""
+msgstr "Ð?омп'Ñ?Ñ?еÑ?"
 
 #: qfilesystemmodel.cpp:677
 msgctxt "QFileSystemModel"
 msgid "%1 TB"
-msgstr ""
+msgstr "%1 TB"
 
 #: qfilesystemmodel.cpp:679
 msgctxt "QFileSystemModel"
 msgid "%1 GB"
-msgstr ""
+msgstr "%1 GB"
 
 #: qfilesystemmodel.cpp:681
 msgctxt "QFileSystemModel"
 msgid "%1 MB"
-msgstr ""
+msgstr "%1 MB"
 
 #: qfilesystemmodel.cpp:683
 msgctxt "QFileSystemModel"
 msgid "%1 KB"
-msgstr ""
+msgstr "%1 KB"
 
 #: qfilesystemmodel.cpp:684
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
-msgstr ""
+msgstr "%1 bytes"
diff --git a/src/vidalia/i18n/po/uk/vidalia_uk.po b/src/vidalia/i18n/po/uk/vidalia_uk.po
index fb8f11b..13f946c 100644
--- a/src/vidalia/i18n/po/uk/vidalia_uk.po
+++ b/src/vidalia/i18n/po/uk/vidalia_uk.po
@@ -1,2685 +1,3848 @@
+# 
+# Translators:
+#   <crazysas@xxxxxxxxx>, 2012.
+#   <demonuk9@xxxxxxxxx>, 2011, 2012.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-11-24 15:59+0000\n"
-"PO-Revision-Date: 2009-07-09 20:51+0000\n"
-"Last-Translator: Nestor Z. <nestor@xxxxxxxxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
+"Last-Translator: crazysas26810fe5f9b14183 <crazysas@xxxxxxxxx>\n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Vidalia ts2po 0.2\n"
 
-#: aboutdialog.ui:16
 msgctxt "AboutDialog"
 msgid "About Vidalia"
 msgstr "Ð?Ñ?о Vidalia"
 
-#: aboutdialog.ui:53
 msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-#: aboutdialog.ui:88
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr "Qt"
-
-#: aboutdialog.ui:69
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr "Tor"
-
-#: aboutdialog.cpp:53
-msgctxt "AboutDialog"
-msgid "Unavailable"
-msgstr "Ð?едоÑ?Ñ?Ñ?пний"
-
-#: aboutdialog.cpp:57
-#, fuzzy
-msgctxt "AboutDialog"
-msgid "Not Running"
-msgstr "Ð?е виконÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
-
-#: aboutdialog.ui:81
-msgctxt "AboutDialog"
-msgid "0.2.0"
-msgstr "0.2.0"
-
-#: aboutdialog.ui:106
-msgctxt "AboutDialog"
-msgid "0.2.0.31-alpha-dev (r123456)"
-msgstr "0.2.0.31-alpha-dev (r123456)"
+msgid "License"
+msgstr "Ð?Ñ?Ñ?ензÑ?Ñ?"
 
-#: aboutdialog.ui:131
 msgctxt "AboutDialog"
-msgid "4.4.2"
-msgstr "4.4.2"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia 0.2.0"
 
-#: aboutdialog.ui:107
 msgctxt "AboutDialog"
-msgid "License"
-msgstr "Ð?Ñ?Ñ?ензÑ?Ñ?"
+msgid "Tor 0.2.0.32"
+msgstr "Tor 0.2.0.32"
 
-#: aboutdialog.ui:163
 msgctxt "AboutDialog"
-msgid "version"
-msgstr "веÑ?Ñ?Ñ?Ñ?"
+msgid "Qt 4.4.2"
+msgstr "Qt 4.4.2"
 
-#: advancedpage.cpp:109
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr "'%1' не Ñ? дÑ?йÑ?ноÑ? IP адÑ?еÑ?оÑ?."
 
-#: advancedpage.cpp:120
-#, fuzzy
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
-msgstr "Ð?и вибÑ?али 'Password' аÑ?Ñ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?, але не вказали паÑ?олÑ?."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
+msgstr "Ð?и вибÑ?али аÑ?Ñ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ? за паÑ?олем, але не вказали його."
 
-#: advancedpage.cpp:223
 msgctxt "AdvancedPage"
 msgid "Select Tor Configuration File"
 msgstr "Ð?беÑ?Ñ?Ñ?Ñ? Ñ?айл конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? Tor"
 
-#: advancedpage.cpp:236
 msgctxt "AdvancedPage"
 msgid "File Not Found"
 msgstr "ФайлÑ? не знайдено"
 
-#: advancedpage.cpp:238
 msgctxt "AdvancedPage"
 msgid "%1 does not exist. Would you like to create it?"
 msgstr "%1 не Ñ?Ñ?нÑ?Ñ?. Ð?ажаÑ?Ñ?е його Ñ?Ñ?воÑ?иÑ?и?"
 
-#: advancedpage.cpp:249
 msgctxt "AdvancedPage"
 msgid "Failed to Create File"
 msgstr "Ð?е вдалоÑ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?айлÑ?"
 
-#: advancedpage.cpp:250
 msgctxt "AdvancedPage"
 msgid "Unable to create %1 [%2]"
 msgstr "Ð?еможливо Ñ?Ñ?воÑ?иÑ?и %1 [%2]"
 
-#: advancedpage.cpp:265
 msgctxt "AdvancedPage"
 msgid "Select a Directory to Use for Tor Data"
 msgstr "Ð?беÑ?Ñ?Ñ?Ñ? каÑ?алог длÑ? збеÑ?еженнÑ? даниÑ? Tor"
 
-#: advancedpage.cpp:287
 msgctxt "AdvancedPage"
 msgid "Unable to remove Tor Service"
 msgstr "Ð?еможливо видалиÑ?и Ñ?еÑ?вÑ?Ñ? Tor"
 
-#: advancedpage.cpp:289
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service."
-""
-"You may need to remove it manually."
-msgstr ""
-"Vidalia не вдалоÑ?Ñ? видалиÑ?и Ñ?еÑ?вÑ?Ñ? Tor. Ð?ожливо, Ð?ам доведеÑ?Ñ?Ñ?Ñ? видалиÑ?и "
-"його Ñ?амоÑ?Ñ?Ñ?йно."
-
-#: advancedpage.cpp:298
 msgctxt "AdvancedPage"
 msgid "Unable to install Tor Service"
 msgstr "Ð?еможливо вÑ?Ñ?ановиÑ?и Ñ?еÑ?вÑ?Ñ? Tor"
 
-#: advancedpage.cpp:299
 msgctxt "AdvancedPage"
 msgid "Vidalia was unable to install the Tor service."
 msgstr "Vidalia не вдалоÑ?Ñ? вÑ?Ñ?ановиÑ?и Ñ?еÑ?вÑ?Ñ? Tor"
 
-#: advancedpage.ui:28
-msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr "Ð?оÑ?Ñ? кеÑ?Ñ?ваннÑ?"
-
-#: advancedpage.ui:48
 msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr "Ð?Ñ?Ñ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?:"
 
-#: advancedpage.ui:58
 msgctxt "AdvancedPage"
 msgid "Address:"
 msgstr "Ð?дÑ?еÑ?а:"
 
-#: advancedpage.ui:86
 msgctxt "AdvancedPage"
 msgid "None"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?ого"
 
-#: advancedpage.ui:91
 msgctxt "AdvancedPage"
 msgid "Cookie"
 msgstr "Ð?Ñ?ки"
 
-#: advancedpage.ui:96
 msgctxt "AdvancedPage"
 msgid "Password"
 msgstr "Ð?аÑ?олÑ?"
 
-#: advancedpage.ui:111
 msgctxt "AdvancedPage"
 msgid "Randomly Generate"
-msgstr ""
+msgstr "Ð?енеÑ?Ñ?ваÑ?и випадково"
 
-#: advancedpage.ui:157
 msgctxt "AdvancedPage"
 msgid ":"
 msgstr ":"
 
-#: advancedpage.ui:219
 msgctxt "AdvancedPage"
 msgid "Tor Configuration File"
 msgstr "Файл налаÑ?Ñ?Ñ?ванÑ? Tor"
 
-#: advancedpage.ui:240
 msgctxt "AdvancedPage"
 msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
+msgstr "Ð?апÑ?Ñ?Ñ?иÑ?и пÑ?огÑ?амÑ? Tor з вказаним Ñ?айлом конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? (torrc)"
 
-#: advancedpage.ui:259
 msgctxt "AdvancedPage"
 msgid "Select path to your configuration file"
-msgstr ""
+msgstr "Ð?беÑ?Ñ?Ñ?Ñ? Ñ?лÑ?Ñ? до Ñ?айлÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?"
 
-#: advancedpage.ui:318
 msgctxt "AdvancedPage"
 msgid "Browse"
-msgstr ""
+msgstr "Ð?глÑ?д"
 
-#: advancedpage.ui:275
 msgctxt "AdvancedPage"
 msgid "Data Directory"
-msgstr ""
+msgstr "Ð?апка вÑ?Ñ?ановленнÑ?"
 
-#: advancedpage.ui:296
 msgctxt "AdvancedPage"
 msgid "Store data for the Tor software in the following directory"
-msgstr ""
+msgstr "Ð?беÑ?Ñ?гаÑ?и данÑ? длÑ? пÑ?огÑ?амного забезпеÑ?еннÑ? Tor Ñ? Ñ?Ñ?й диÑ?екÑ?оÑ?Ñ?Ñ?"
 
-#: advancedpage.ui:315
 msgctxt "AdvancedPage"
 msgid "Select the directory used to store data for the Tor software"
+msgstr "Ð?беÑ?Ñ?Ñ?Ñ? диÑ?екÑ?оÑ?Ñ?Ñ? длÑ? збеÑ?еженнÑ? Ñ?айлÑ?в пÑ?огÑ?амного забезпеÑ?еннÑ? Tor"
+
+msgctxt "AdvancedPage"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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Ð?ожливо, вам доведеÑ?Ñ?Ñ?Ñ? зÑ?обиÑ?и Ñ?е Ñ?амоÑ?Ñ?Ñ?йно."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Ð?ова"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Ð?беÑ?Ñ?Ñ?Ñ? мовÑ?, Ñ?о бÑ?де викоÑ?иÑ?Ñ?овÑ?ваÑ?иÑ?Ñ? Ñ? Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "СÑ?илÑ?"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Ð?беÑ?Ñ?Ñ?Ñ? Ñ?Ñ?илÑ? Ñ?нÑ?еÑ?Ñ?ейÑ?Ñ? Vidalia"
+
+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 "Ð?:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ð?Ñ?иÑ?оваÑ?и налаÑ?Ñ?Ñ?ваннÑ?"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Ð?оказаÑ?и налаÑ?Ñ?Ñ?ваннÑ?"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "СкинÑ?Ñ?и"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Ð?авжди повеÑ?Ñ? Ñ?нÑ?иÑ? вÑ?кон"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "СÑ?илÑ?"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Ð?мÑ?на пÑ?озоÑ?оÑ?Ñ?Ñ? гÑ?аÑ?Ñ?кÑ? Ñ?Ñ?аÑ?Ñ?кÑ?"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Ð?Ñ?озоÑ?Ñ?Ñ?Ñ?Ñ?"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Ð?беÑ?егÑ?и"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Ð?Ñ?дмова"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Ð?оÑ?инаÑ?мо HTTPS-запиÑ? моÑ?Ñ?Ñ?..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Ð?Ñ?д'Ñ?днаннÑ? до %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Ð?Ñ?дпÑ?авленнÑ? HTTPS-запиÑ?Ñ?в до моÑ?Ñ?Ñ?в..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Ð?аванÑ?аженнÑ? Ñ?пиÑ?кÑ? моÑ?Ñ?Ñ?в..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Ð?аванÑ?аженнÑ? моÑ?Ñ?Ñ?в"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и моÑ?Ñ?и: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Ð?оÑ?Ñ?оÑ?ний запиÑ? моÑ?Ñ?Ñ?..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Ð?Ñ?аÑ?на"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "Ð?Ñ?лÑ?кÑ?Ñ?Ñ?Ñ? клÑ?Ñ?нÑ?Ñ?в"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Ð?овий"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Ð?Ñ?дкÑ?иÑ?и"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "СÑ?авÑ?Ñ? збÑ?й"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Ð?акÑ?иÑ?ий"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Ð?евÑ?домий"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "Ð?Ñ?Ñ?Ñ?ий Ñ?лÑ?Ñ?"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Ð?'Ñ?днаннÑ?"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "СÑ?аÑ?Ñ?Ñ?"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Ð?Ñ?новнÑ?"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Ð?еÑ?ежа"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "СеÑ?вÑ?Ñ?и"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Ð?овнÑ?Ñ?нÑ?й виглÑ?д"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "РозÑ?иÑ?ено"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ð?опомога"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Ð?омилка збеÑ?еженнÑ? налаÑ?Ñ?Ñ?ванÑ?"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Ð?омилка заÑ?Ñ?оÑ?Ñ?ваннÑ? налаÑ?Ñ?Ñ?ванÑ?"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Ð?алаÑ?Ñ?Ñ?ваннÑ?"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia не змогла пÑ?д'Ñ?днаÑ?иÑ?Ñ? до Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Ð?оÑ?Ñ?Ñ?бно паÑ?олÑ?"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Ð?апам'Ñ?Ñ?аÑ?и паÑ?олÑ?"
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
+msgstr "Vidalia пÑ?д'Ñ?дналаÑ?Ñ? до запÑ?Ñ?еного пÑ?оÑ?еÑ?Ñ? Tor, Ñ?кий вимагаÑ? паÑ?олÑ?. Ð?Ñ?дÑ? лаÑ?ка, введÑ?Ñ?Ñ? паÑ?олÑ?:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Ð?онÑ?Ñ?олÑ?ний Ñ?океÑ? не пÑ?д'Ñ?днано"
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr ""
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr ""
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Хибна конÑ?Ñ?олÑ?на вÑ?дповÑ?дÑ?. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Ð?вганÑ?Ñ?Ñ?ан"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Ð?ндоÑ?Ñ?а"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Ð?нгола"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Ð?Ñ?генÑ?ина"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Ð?Ñ?Ñ?менÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Ð?вÑ?Ñ?Ñ?алÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Ð?зеÑ?байджан"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Ð?агами"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Ð?англадеÑ?"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Ð?Ñ?лоÑ?Ñ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Ð?елÑ?гÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Ð?елÑ?з"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Ð?олÑ?вÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Ð?оÑ?нÑ?Ñ? Ñ? Ð?еÑ?Ñ?оговина"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Ð?Ñ?азилÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Ð?олгаÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Ð?амеÑ?Ñ?н"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Ð?анада"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "ЦенÑ?Ñ?алÑ?на Ð?Ñ?Ñ?иканÑ?Ñ?ка РеÑ?пÑ?блÑ?ка"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Чад"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "ЧилÑ?"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "Ð?иÑ?ай"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Ð?онго"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Cote d�Ivoire"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "ХоÑ?ваÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Ð?Ñ?ба"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Ð?Ñ?пÑ?"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "ЧеÑ?Ñ?ка РеÑ?пÑ?блÑ?ка"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Ð?анÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Ð?жибÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Ð?омÑ?нÑ?ка"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Ð?омÑ?нÑ?канÑ?Ñ?ка РеÑ?пÑ?блÑ?ка"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ð?квадоÑ?"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Ð?гипеÑ?"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "СалÑ?вадоÑ?"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Ð?кваÑ?оÑ?Ñ?алÑ?на Ð?вÑ?неÑ?"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Ð?Ñ?Ñ?онÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "ФÑ?анÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Ð?Ñ?меÑ?Ñ?ина"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Ð?вÑ?неÑ?"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Guyana"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Hong Kong"
+msgstr "Ð?онконг"
+
+msgctxt "CountryInfo"
+msgid "Haiti"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Honduras"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Israel"
+msgstr "Ð?зÑ?аÑ?лÑ?"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Ð?Ñ?алÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Ямайка"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "ЯпонÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Ð?оÑ?данÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Ð?азаÑ?Ñ?Ñ?ан"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Ð?енÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Ð?Ñ?вейÑ?"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Ð?иÑ?гизÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Ð?аÑ?вÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Ð?Ñ?беÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Ð?Ñ?Ñ?Ñ?енÑ?Ñ?ейн"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Ð?иÑ?ва"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Ð?Ñ?кÑ?ембÑ?Ñ?г"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Ð?акедонÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Ð?алÑ?"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Ð?алÑ?Ñ?а"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Ð?олдова"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Ð?онако"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Ð?онголÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Ð?аÑ?окко"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Ð?озамбÑ?к"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Ð?амÑ?бÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Ð?епал"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Ð?Ñ?деÑ?ланди"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Ð?ова Ð?еландÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Ð?Ñ?геÑ?"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Ð?Ñ?геÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Ð?оÑ?вегÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr "Ð?акиÑ?Ñ?ан"
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr "Ð?алеÑ?Ñ?ина"
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr "Ð?анама"
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr "Ð?апÑ?а Ð?ова Ð?вÑ?неÑ?"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Ð?аÑ?агвай"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Ð?еÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "ФÑ?лÑ?ппÑ?ни"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Ð?олÑ?Ñ?а"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Ð?оÑ?Ñ?Ñ?галÑ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "РоÑ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
 msgstr ""
 
-#: appearancepage.ui:22
-msgctxt "AppearancePage"
-msgid "Language"
+msgctxt "CountryInfo"
+msgid "Tanzania"
 msgstr ""
 
-#: appearancepage.ui:37
-msgctxt "AppearancePage"
-msgid "Choose the language used in Vidalia"
+msgctxt "CountryInfo"
+msgid "Thailand"
 msgstr ""
 
-#: appearancepage.ui:75
-msgctxt "AppearancePage"
-msgid "Style"
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
 msgstr ""
 
-#: appearancepage.ui:103
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
+msgctxt "CountryInfo"
+msgid "Togo"
 msgstr ""
 
-#: appearancepage.cpp:67
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
+msgctxt "CountryInfo"
+msgid "Tonga"
 msgstr ""
 
-#: bwgraph.cpp:166
-msgctxt "BandwidthGraph"
-msgid "Since:"
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
 msgstr ""
 
-#: bwgraph.cpp:232
-msgctxt "BandwidthGraph"
-msgid "Hide Settings"
+msgctxt "CountryInfo"
+msgid "Tunisia"
 msgstr ""
 
-#: bwgraph.ui:40
-msgctxt "BandwidthGraph"
-msgid "Show Settings"
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "ТÑ?Ñ?Ñ?Ñ?Ñ?"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "ТÑ?Ñ?кменÑ?Ñ?Ñ?ан"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "ТÑ?валÑ?"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Уганда"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "УкÑ?аÑ?на"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Ð?б'Ñ?днанÑ? Ð?Ñ?абÑ?Ñ?кÑ? Ð?мÑ?Ñ?аÑ?и"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Ð?б'Ñ?днане коÑ?олÑ?вÑ?Ñ?во"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "СШÐ?"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
 msgstr ""
 
-#: bwgraph.ui:16
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
 msgstr ""
 
-#: bwgraph.ui:63
-msgctxt "BandwidthGraph"
-msgid "Reset"
+msgctxt "CountryInfo"
+msgid "Vanuatu"
 msgstr ""
 
-#: bwgraph.ui:151
-msgctxt "BandwidthGraph"
-msgid "Receive Rate"
+msgctxt "CountryInfo"
+msgid "Vatican"
 msgstr ""
 
-#: bwgraph.ui:170
-msgctxt "BandwidthGraph"
-msgid "Send Rate"
+msgctxt "CountryInfo"
+msgid "Venezuela"
 msgstr ""
 
-#: bwgraph.ui:183
-msgctxt "BandwidthGraph"
-msgid "Always on Top"
-msgstr "Ð?авжди повеÑ?Ñ? Ñ?нÑ?иÑ? вÑ?кон"
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr ""
 
-#: bwgraph.ui:234
-msgctxt "BandwidthGraph"
-msgid "Style"
-msgstr "СÑ?илÑ?"
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr ""
 
-#: bwgraph.ui:284
-msgctxt "BandwidthGraph"
-msgid "Changes the transparency of the Bandwidth Graph"
+msgctxt "CountryInfo"
+msgid "Yemen"
 msgstr ""
 
-#: bwgraph.ui:368
-msgctxt "BandwidthGraph"
-msgid "100"
+msgctxt "CountryInfo"
+msgid "Zambia"
 msgstr ""
 
-#: bwgraph.ui:383
-msgctxt "BandwidthGraph"
-msgid "% Opaque"
-msgstr "% Ð?Ñ?озоÑ?Ñ?Ñ?Ñ?Ñ?"
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr ""
 
-#: bwgraph.ui:443
-msgctxt "BandwidthGraph"
-msgid "Save"
-msgstr "Ð?беÑ?егÑ?и"
+msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
 
-#: bwgraph.ui:450
-msgctxt "BandwidthGraph"
-msgid "Cancel"
-msgstr "Ð?Ñ?дмова"
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
 
-#: circuit.cpp:112
-msgctxt "Circuit"
-msgid "New"
-msgstr "Ð?овий"
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
 
-#: circuit.cpp:113
-msgctxt "Circuit"
-msgid "Open"
-msgstr "Ð?Ñ?дкÑ?иÑ?и"
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
 
-#: circuit.cpp:114
-msgctxt "Circuit"
-msgid "Building"
+msgctxt "CountryInfo"
+msgid "Bahrain"
 msgstr ""
 
-#: circuit.cpp:115
-msgctxt "Circuit"
-msgid "Failed"
+msgctxt "CountryInfo"
+msgid "Benin"
 msgstr ""
 
-#: circuit.cpp:116
-msgctxt "Circuit"
-msgid "Closed"
+msgctxt "CountryInfo"
+msgid "Ethiopia"
 msgstr ""
 
-#: circuit.cpp:117
-msgctxt "Circuit"
-msgid "Unknown"
+msgctxt "CountryInfo"
+msgid "Fiji"
 msgstr ""
 
-#: circuititem.cpp:39
-msgctxt "CircuitItem"
-msgid "<Path Empty>"
+msgctxt "CountryInfo"
+msgid "Finland"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
-msgctxt "CircuitListWidget"
-msgid "Connection"
+msgctxt "CountryInfo"
+msgid "Greece"
 msgstr ""
 
-#: circuitlistwidget.cpp:55
-msgctxt "CircuitListWidget"
-msgid "Status"
+msgctxt "CountryInfo"
+msgid "Guam"
 msgstr ""
 
-#: circuitlistwidget.cpp:87
-msgctxt "CircuitListWidget"
-msgid "Zoom to Circuit"
+msgctxt "CountryInfo"
+msgid "Hungary"
 msgstr ""
 
-#: circuitlistwidget.cpp:89
-msgctxt "CircuitListWidget"
-msgid "Close Circuit (Del)"
+msgctxt "CountryInfo"
+msgid "Iceland"
 msgstr ""
 
-#: circuitlistwidget.cpp:110
-msgctxt "CircuitListWidget"
-msgid "Close Stream (Del)"
+msgctxt "CountryInfo"
+msgid "India"
 msgstr ""
 
-#: configdialog.cpp:77
-msgctxt "ConfigDialog"
-msgid "General"
+msgctxt "CountryInfo"
+msgid "Indonesia"
 msgstr ""
 
-#: configdialog.cpp:81
-msgctxt "ConfigDialog"
-msgid "Network"
-msgstr "Ð?еÑ?ежа"
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
 
-#: configdialog.cpp:85
-msgctxt "ConfigDialog"
-msgid "Sharing"
+msgctxt "CountryInfo"
+msgid "Iraq"
 msgstr ""
 
-#: configdialog.cpp:89
-msgctxt "ConfigDialog"
-msgid "Services"
+msgctxt "CountryInfo"
+msgid "Ireland"
 msgstr ""
 
-#: configdialog.cpp:93
-msgctxt "ConfigDialog"
-msgid "Appearance"
+msgctxt "CountryInfo"
+msgid "Korea, North"
 msgstr ""
 
-#: configdialog.cpp:97
-msgctxt "ConfigDialog"
-msgid "Advanced"
+msgctxt "CountryInfo"
+msgid "Korea, South"
 msgstr ""
 
-#: configdialog.cpp:111
-msgctxt "ConfigDialog"
-msgid "Help"
+msgctxt "CountryInfo"
+msgid "Libya"
 msgstr ""
 
-#: configdialog.cpp:196
-msgctxt "ConfigDialog"
-msgid "Error Saving Settings"
+msgctxt "CountryInfo"
+msgid "Maldives"
 msgstr ""
 
-#: configdialog.cpp:198
-msgctxt "ConfigDialog"
-msgid "Vidalia was unable to save your %1 settings."
+msgctxt "CountryInfo"
+msgid "Mexico"
 msgstr ""
 
-#: configdialog.cpp:225
-msgctxt "ConfigDialog"
-msgid "Error Applying Settings"
+msgctxt "CountryInfo"
+msgid "Myanmar"
 msgstr ""
 
-#: configdialog.cpp:227
-msgctxt "ConfigDialog"
-msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgctxt "CountryInfo"
+msgid "Taiwan"
 msgstr ""
 
-#: configdialog.ui:16
-msgctxt "ConfigDialog"
-msgid "Settings"
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
 msgstr ""
 
-#: controlconnection.cpp:134
-msgctxt "ControlConnection"
-msgid "Vidalia was unable to connect to Tor. (%1)"
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
 msgstr ""
 
-#: controlconnection.cpp:331
-msgctxt "ControlConnection"
-msgid "Control socket is not connected."
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:28
-msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:80
-msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
 msgstr ""
 
-#: controlpasswordinputdialog.ui:99
-msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
 msgstr ""
 
-#: controlsocket.cpp:70
-msgctxt "ControlSocket"
-msgid "Control socket is not connected."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-#: controlsocket.cpp:80
-msgctxt "ControlSocket"
-msgid "Error sending control command. [%1]"
+msgctxt "CrashReportDialog"
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 msgstr ""
 
-#: controlsocket.cpp:117
-msgctxt "ControlSocket"
-msgid "Socket disconnected while attempting to read a line of data."
+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 ""
 
-#: controlsocket.cpp:156
-msgctxt "ControlSocket"
-msgid "Invalid control reply. [%1]"
+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 ""
 
-#: generalpage.cpp:62
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
-msgstr ""
+msgstr "Ð?одаÑ?ки (*.exe)"
 
-#: generalpage.cpp:75
 msgctxt "GeneralPage"
 msgid "Select Path to Tor"
-msgstr ""
+msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? Ñ?лÑ?Ñ? до Tor"
 
-#: generalpage.cpp:85
 msgctxt "GeneralPage"
 msgid "Select Proxy Executable"
 msgstr ""
 
-#: generalpage.cpp:98
 msgctxt "GeneralPage"
 msgid "You must specify the name of your Tor executable."
 msgstr ""
 
-#: generalpage.cpp:106
-msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-#: generalpage.ui:28
 msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
-#: generalpage.ui:121
 msgctxt "GeneralPage"
 msgid "Browse"
-msgstr ""
+msgstr "Ð?гÑ?лд"
 
-#: generalpage.ui:57
 msgctxt "GeneralPage"
 msgid "Start the Tor software when Vidalia starts"
 msgstr ""
 
-#: generalpage.ui:51
 msgctxt "GeneralPage"
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
-#: generalpage.ui:93
 msgctxt "GeneralPage"
 msgid "Proxy Application (optional)"
 msgstr ""
 
-#: generalpage.ui:99
 msgctxt "GeneralPage"
 msgid "Start a proxy application when Tor starts"
 msgstr ""
 
-#: generalpage.ui:135
 msgctxt "GeneralPage"
 msgid "Proxy Application Arguments:"
 msgstr ""
 
-#: graphframe.cpp:238
-msgctxt "GraphFrame"
-msgid "Recv: "
+msgctxt "GeneralPage"
+msgid "Software Updates"
 msgstr ""
 
-#: graphframe.cpp:298
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Check Now"
 msgstr ""
 
-#: graphframe.cpp:247
 msgctxt "GraphFrame"
-msgid "Sent: "
+msgid "%1 KB/s"
 msgstr ""
 
-#: graphframe.cpp:259
 msgctxt "GraphFrame"
 msgid "%1 KB"
 msgstr ""
 
-#: graphframe.cpp:262
 msgctxt "GraphFrame"
 msgid "%1 MB"
 msgstr ""
 
-#: graphframe.cpp:265
 msgctxt "GraphFrame"
 msgid "%1 GB"
 msgstr ""
 
-#: helpbrowser.cpp:135
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents: "
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+msgctxt "GraphFrame"
+msgid "Sent:"
 msgstr ""
 
-#: helpbrowser.cpp:147
 msgctxt "HelpBrowser"
 msgid "Supplied XML file is not a valid Contents document."
 msgstr ""
 
-#: helpbrowser.cpp:396
 msgctxt "HelpBrowser"
 msgid "Search reached end of document"
 msgstr ""
 
-#: helpbrowser.cpp:398
 msgctxt "HelpBrowser"
 msgid "Search reached start of document"
 msgstr ""
 
-#: helpbrowser.cpp:400
 msgctxt "HelpBrowser"
 msgid "Text not found in document"
 msgstr ""
 
-#: helpbrowser.cpp:445
 msgctxt "HelpBrowser"
 msgid "Found %1 results"
 msgstr ""
 
-#: helpbrowser.ui:33
 msgctxt "HelpBrowser"
 msgid "Vidalia Help"
 msgstr ""
 
-#: helpbrowser.ui:484
 msgctxt "HelpBrowser"
 msgid "Back"
 msgstr ""
 
-#: helpbrowser.ui:487
 msgctxt "HelpBrowser"
 msgid "Move to previous page (Backspace)"
 msgstr ""
 
-#: helpbrowser.ui:490
 msgctxt "HelpBrowser"
 msgid "Backspace"
 msgstr ""
 
-#: helpbrowser.ui:498
 msgctxt "HelpBrowser"
 msgid "Forward"
 msgstr ""
 
-#: helpbrowser.ui:501
 msgctxt "HelpBrowser"
 msgid "Move to next page (Shift+Backspace)"
 msgstr ""
 
-#: helpbrowser.ui:504
 msgctxt "HelpBrowser"
 msgid "Shift+Backspace"
 msgstr ""
 
-#: helpbrowser.ui:512
 msgctxt "HelpBrowser"
 msgid "Home"
 msgstr ""
 
-#: helpbrowser.ui:515
 msgctxt "HelpBrowser"
 msgid "Move to the Home page (Ctrl+H)"
 msgstr ""
 
-#: helpbrowser.ui:518
 msgctxt "HelpBrowser"
 msgid "Ctrl+H"
 msgstr ""
 
-#: helpbrowser.ui:535
 msgctxt "HelpBrowser"
 msgid "Find"
 msgstr ""
 
-#: helpbrowser.ui:538
 msgctxt "HelpBrowser"
 msgid "Search for a word or phrase on current page (Ctrl+F)"
 msgstr ""
 
-#: helpbrowser.ui:541
 msgctxt "HelpBrowser"
 msgid "Ctrl+F"
 msgstr ""
 
-#: helpbrowser.ui:549
 msgctxt "HelpBrowser"
 msgid "Close"
 msgstr ""
 
-#: helpbrowser.ui:552
 msgctxt "HelpBrowser"
 msgid "Close Vidalia Help"
 msgstr ""
 
-#: helpbrowser.ui:555
 msgctxt "HelpBrowser"
 msgid "Esc"
 msgstr ""
 
-#: helpbrowser.ui:152
 msgctxt "HelpBrowser"
 msgid "Find:"
 msgstr ""
 
-#: helpbrowser.ui:174
 msgctxt "HelpBrowser"
 msgid "Find Previous"
 msgstr ""
 
-#: helpbrowser.ui:187
 msgctxt "HelpBrowser"
 msgid "Find Next"
 msgstr ""
 
-#: helpbrowser.ui:221
 msgctxt "HelpBrowser"
 msgid "Case sensitive"
 msgstr ""
 
-#: helpbrowser.ui:231
 msgctxt "HelpBrowser"
 msgid "Whole words only"
 msgstr ""
 
-#: helpbrowser.ui:305
 msgctxt "HelpBrowser"
 msgid "Help Topics"
 msgstr ""
 
-#: helpbrowser.ui:260
 msgctxt "HelpBrowser"
 msgid "Contents"
 msgstr ""
 
-#: helpbrowser.ui:350
 msgctxt "HelpBrowser"
 msgid "Search"
 msgstr ""
 
-#: helpbrowser.ui:362
 msgctxt "HelpBrowser"
 msgid "Searching for:"
 msgstr ""
 
-#: helpbrowser.ui:405
 msgctxt "HelpBrowser"
 msgid "Found Documents"
 msgstr ""
 
-#: helptextbrowser.cpp:54
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file: "
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
 msgstr ""
 
-#: helptextbrowser.cpp:72
 msgctxt "HelpTextBrowser"
 msgid "Opening External Link"
 msgstr ""
 
-#: helptextbrowser.cpp:76
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
-#: helptextbrowser.cpp:78
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
 msgstr ""
 
-#: helptextbrowser.cpp:88
 msgctxt "HelpTextBrowser"
 msgid "Unable to Open Link"
 msgstr ""
 
-#: helptextbrowser.cpp:90
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
 msgstr ""
 
-#: licensedialog.ui:13
 msgctxt "LicenseDialog"
 msgid "License Information"
 msgstr ""
 
-#: licensedialog.ui:43
 msgctxt "LicenseDialog"
 msgid "License"
 msgstr "Ð?Ñ?Ñ?ензÑ?Ñ?"
 
-#: licensedialog.ui:76
 msgctxt "LicenseDialog"
 msgid "Credits"
 msgstr ""
 
-#: logevent.cpp:57
 msgctxt "LogEvent"
 msgid "Debug"
 msgstr ""
 
-#: logevent.cpp:58
 msgctxt "LogEvent"
 msgid "Info"
 msgstr ""
 
-#: logevent.cpp:59
 msgctxt "LogEvent"
 msgid "Notice"
 msgstr ""
 
-#: logevent.cpp:60
 msgctxt "LogEvent"
 msgid "Warning"
 msgstr ""
 
-#: logevent.cpp:61
 msgctxt "LogEvent"
 msgid "Error"
 msgstr ""
 
-#: logevent.cpp:62
 msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
-#: mainwindow.ui:233
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
 
-#: mainwindow.ui:443
 msgctxt "MainWindow"
 msgid "Exit"
 msgstr ""
 
-#: mainwindow.ui:304
 msgctxt "MainWindow"
 msgid "Bandwidth Graph"
 msgstr ""
 
-#: mainwindow.ui:317
 msgctxt "MainWindow"
 msgid "Message Log"
 msgstr ""
 
-#: mainwindow.cpp:348
 msgctxt "MainWindow"
 msgid "Network Map"
 msgstr ""
 
-#: mainwindow.cpp:354
 msgctxt "MainWindow"
 msgid "Control Panel"
 msgstr ""
 
-#: mainwindow.ui:380
 msgctxt "MainWindow"
 msgid "Settings"
 msgstr ""
 
-#: mainwindow.ui:430
 msgctxt "MainWindow"
 msgid "About"
 msgstr ""
 
-#: mainwindow.ui:367
 msgctxt "MainWindow"
 msgid "Help"
 msgstr ""
 
-#: mainwindow.cpp:1391
 msgctxt "MainWindow"
 msgid "New Identity"
 msgstr ""
 
-#: mainwindow.cpp:437
 msgctxt "MainWindow"
 msgid "Ctrl+T"
 msgstr ""
 
-#: mainwindow.cpp:438
 msgctxt "MainWindow"
 msgid "Ctrl+B"
 msgstr ""
 
-#: mainwindow.cpp:439
 msgctxt "MainWindow"
 msgid "Ctrl+L"
 msgstr ""
 
-#: mainwindow.cpp:440
 msgctxt "MainWindow"
 msgid "Ctrl+N"
 msgstr ""
 
-#: mainwindow.cpp:441
 msgctxt "MainWindow"
 msgid "Ctrl+?"
 msgstr ""
 
-#: mainwindow.cpp:442
 msgctxt "MainWindow"
 msgid "Ctrl+I"
 msgstr ""
 
-#: mainwindow.cpp:443
 msgctxt "MainWindow"
 msgid "Ctrl+P"
 msgstr ""
 
-#: mainwindow.cpp:463
 msgctxt "MainWindow"
 msgid "Tor"
 msgstr "Tor"
 
-#: mainwindow.cpp:468
 msgctxt "MainWindow"
 msgid "View"
 msgstr ""
 
-#: mainwindow.cpp:476
 msgctxt "MainWindow"
 msgid "Vidalia Help"
 msgstr ""
 
-#: mainwindow.cpp:527
 msgctxt "MainWindow"
 msgid "Error starting web browser"
 msgstr ""
 
-#: mainwindow.cpp:528
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured web browser"
 msgstr ""
 
-#: mainwindow.cpp:540
 msgctxt "MainWindow"
 msgid "Error starting IM client"
 msgstr ""
 
-#: mainwindow.cpp:541
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured IM client"
 msgstr ""
 
-#: mainwindow.cpp:562
 msgctxt "MainWindow"
 msgid "Error starting proxy server"
 msgstr ""
 
-#: mainwindow.cpp:563
 msgctxt "MainWindow"
 msgid "Vidalia was unable to start the configured proxy server"
 msgstr ""
 
-#: mainwindow.cpp:579
 msgctxt "MainWindow"
 msgid "Connecting to a relay directory"
 msgstr ""
 
-#: mainwindow.cpp:583
 msgctxt "MainWindow"
 msgid "Establishing an encrypted directory connection"
 msgstr ""
 
-#: mainwindow.cpp:586
 msgctxt "MainWindow"
 msgid "Retrieving network status"
 msgstr ""
 
-#: mainwindow.cpp:589
 msgctxt "MainWindow"
 msgid "Loading network status"
 msgstr ""
 
-#: mainwindow.cpp:592
 msgctxt "MainWindow"
 msgid "Loading authority certificates"
 msgstr ""
 
-#: mainwindow.cpp:595
 msgctxt "MainWindow"
 msgid "Requesting relay information"
 msgstr ""
 
-#: mainwindow.cpp:598
 msgctxt "MainWindow"
 msgid "Loading relay information"
 msgstr ""
 
-#: mainwindow.cpp:1132
 msgctxt "MainWindow"
 msgid "Connecting to the Tor network"
 msgstr ""
 
-#: mainwindow.cpp:605
 msgctxt "MainWindow"
 msgid "Establishing a Tor circuit"
 msgstr ""
 
-#: mainwindow.cpp:1297
 msgctxt "MainWindow"
 msgid "Connected to the Tor network!"
 msgstr ""
 
-#: mainwindow.cpp:612
-msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-#: mainwindow.cpp:619
 msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr ""
 
-#: mainwindow.cpp:622
 msgctxt "MainWindow"
 msgid "identity mismatch"
 msgstr ""
 
-#: mainwindow.cpp:625
 msgctxt "MainWindow"
 msgid "done"
 msgstr ""
 
-#: mainwindow.cpp:628
 msgctxt "MainWindow"
 msgid "connection refused"
 msgstr ""
 
-#: mainwindow.cpp:631
 msgctxt "MainWindow"
 msgid "connection timeout"
 msgstr ""
 
-#: mainwindow.cpp:634
 msgctxt "MainWindow"
 msgid "read/write error"
 msgstr ""
 
-#: mainwindow.cpp:637
 msgctxt "MainWindow"
 msgid "no route to host"
 msgstr ""
 
-#: mainwindow.cpp:640
 msgctxt "MainWindow"
 msgid "insufficient resources"
 msgstr ""
 
-#: mainwindow.cpp:643
 msgctxt "MainWindow"
 msgid "unknown"
 msgstr ""
 
-#: mainwindow.cpp:645
-msgctxt "MainWindow"
-msgid " failed (%1)"
-msgstr ""
-
-#: mainwindow.ui:168
 msgctxt "MainWindow"
 msgid "Tor is not running"
 msgstr ""
 
-#: mainwindow.cpp:686
-msgctxt "MainWindow"
-msgid "Your relay is shutting down."
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-#: mainwindow.cpp:688
 msgctxt "MainWindow"
 msgid "Tor is shutting down"
 msgstr ""
 
-#: mainwindow.cpp:693
 msgctxt "MainWindow"
 msgid "Stop Tor Now"
 msgstr ""
 
-#: mainwindow.cpp:695
 msgctxt "MainWindow"
 msgid "Stop Tor"
 msgstr ""
 
-#: mainwindow.cpp:711
 msgctxt "MainWindow"
 msgid "Starting the Tor software"
 msgstr ""
 
-#: mainwindow.ui:75
 msgctxt "MainWindow"
 msgid "Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:859
 msgctxt "MainWindow"
 msgid "Error Starting Tor"
 msgstr ""
 
-#: mainwindow.cpp:862
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
-#: mainwindow.cpp:896
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
 msgstr ""
 
-#: mainwindow.cpp:906
 msgctxt "MainWindow"
 msgid "Connection Error"
 msgstr ""
 
-#: mainwindow.cpp:938
 msgctxt "MainWindow"
 msgid "Relaying is Enabled"
 msgstr ""
 
-#: mainwindow.cpp:943
-msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
-""
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-
-#: mainwindow.cpp:965
 msgctxt "MainWindow"
 msgid "Error Shutting Down"
 msgstr ""
 
-#: mainwindow.cpp:966
 msgctxt "MainWindow"
 msgid "Vidalia was unable to stop the Tor software."
 msgstr ""
 
-#: mainwindow.cpp:997
 msgctxt "MainWindow"
 msgid "Unexpected Error"
 msgstr ""
 
-#: mainwindow.cpp:1001
-msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly."
-""
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-#: mainwindow.cpp:1055
 msgctxt "MainWindow"
 msgid "Authenticating to Tor"
 msgstr ""
 
-#: mainwindow.cpp:1075
 msgctxt "MainWindow"
 msgid "Cookie Authentication Required"
 msgstr ""
 
-#: mainwindow.cpp:1078
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
-#: mainwindow.cpp:1080
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
 msgstr ""
 
-#: mainwindow.cpp:1087
 msgctxt "MainWindow"
 msgid "Data Directory"
 msgstr ""
 
-#: mainwindow.cpp:1089
 msgctxt "MainWindow"
 msgid "Control Cookie (control_auth_cookie)"
 msgstr ""
 
-#: mainwindow.cpp:1141
 msgctxt "MainWindow"
 msgid "Error Registering for Events"
 msgstr ""
 
-#: mainwindow.cpp:1143
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
-#: mainwindow.cpp:1222
 msgctxt "MainWindow"
 msgid "Authentication Error"
 msgstr ""
 
-#: mainwindow.cpp:1224
 msgctxt "MainWindow"
 msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1226
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
 msgstr ""
 
-#: mainwindow.cpp:1330
 msgctxt "MainWindow"
 msgid "Tor Update Available"
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
-#: mainwindow.cpp:1333
 msgctxt "MainWindow"
 msgid "Tor website: %1"
 msgstr ""
 
-#: mainwindow.cpp:1394
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
-#: mainwindow.cpp:1409
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
 msgstr ""
 
-#: mainwindow.cpp:1458
 msgctxt "MainWindow"
 msgid "Port Forwarding Failed"
 msgstr ""
 
-#: mainwindow.cpp:1459
 msgctxt "MainWindow"
 msgid "Vidalia was unable to configure automatic port forwarding."
 msgstr ""
 
-#: mainwindow.ui:19
 msgctxt "MainWindow"
 msgid "Vidalia Control Panel"
 msgstr ""
 
-#: mainwindow.ui:49
 msgctxt "MainWindow"
 msgid "Status"
 msgstr ""
 
-#: mainwindow.ui:218
 msgctxt "MainWindow"
 msgid "Vidalia Shortcuts"
 msgstr ""
 
-#: mainwindow.ui:243
 msgctxt "MainWindow"
 msgid "Setup Relaying"
 msgstr ""
 
-#: mainwindow.ui:246
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
 msgstr ""
 
-#: mainwindow.ui:256
 msgctxt "MainWindow"
 msgid "View the Network"
 msgstr ""
 
-#: mainwindow.ui:259
 msgctxt "MainWindow"
 msgid "View a map of the Tor network"
 msgstr ""
 
-#: mainwindow.ui:272
 msgctxt "MainWindow"
 msgid "Use a New Identity"
 msgstr ""
 
-#: mainwindow.ui:275
 msgctxt "MainWindow"
 msgid "Make subsequent connections appear new"
 msgstr ""
 
-#: mainwindow.ui:307
 msgctxt "MainWindow"
 msgid "View recent bandwidth usage"
 msgstr ""
 
-#: mainwindow.ui:320
 msgctxt "MainWindow"
 msgid "View log message history"
 msgstr ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
 msgid "View help documentation"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
 msgid "Configure Vidalia"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
 msgid "View version and license information"
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
 msgid "Exit Vidalia"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
 msgid "Show this window on startup"
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
 msgid "Hide"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
 msgid "Hide this window"
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
 msgid "Password Reset Failed"
 msgstr ""
 
-#: mainwindow.cpp:1213
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
 msgstr ""
 
-#: messagelog.cpp:126
-msgctxt "MessageLog"
-msgid "Messages that appear when something has "
-"gone very wrong and Tor cannot proceed."
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: messagelog.cpp:128
-msgctxt "MessageLog"
-msgid "Messages that only appear when "
-"something has gone wrong with Tor."
+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 ""
 
-#: messagelog.cpp:132
-msgctxt "MessageLog"
-msgid "Messages that appear infrequently "
-"during normal Tor operation and are "
-"not considered errors, but you may "
-"care about."
+msgctxt "MainWindow"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+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?"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:189
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
 
-#: messagelog.cpp:190
 msgctxt "MessageLog"
 msgid "Vidalia was unable to register for Tor's log events."
 msgstr ""
 
-#: messagelog.cpp:205
 msgctxt "MessageLog"
 msgid "Error Opening Log File"
 msgstr ""
 
-#: messagelog.cpp:206
 msgctxt "MessageLog"
 msgid "Vidalia was unable to open the specified log file."
 msgstr ""
 
-#: messagelog.cpp:227
 msgctxt "MessageLog"
 msgid "Log Filename Required"
 msgstr ""
 
-#: messagelog.cpp:229
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
 msgstr ""
 
-#: messagelog.cpp:280
 msgctxt "MessageLog"
 msgid "Select Log File"
 msgstr ""
 
-#: messagelog.cpp:297
 msgctxt "MessageLog"
 msgid "Save Log Messages"
 msgstr ""
 
-#: messagelog.cpp:300
 msgctxt "MessageLog"
 msgid "Text Files (*.txt)"
 msgstr ""
 
-#: messagelog.cpp:309
 msgctxt "MessageLog"
 msgid "Vidalia"
 msgstr "Vidalia"
 
-#: messagelog.cpp:310
-msgctxt "MessageLog"
-msgid "Cannot write file %1"
-""
-"%2."
-msgstr ""
-
-#: messagelog.cpp:360
 msgctxt "MessageLog"
 msgid "Find in Message Log"
 msgstr ""
 
-#: messagelog.cpp:361
 msgctxt "MessageLog"
 msgid "Find:"
 msgstr ""
 
-#: messagelog.cpp:367
 msgctxt "MessageLog"
 msgid "Not Found"
 msgstr ""
 
-#: messagelog.cpp:368
 msgctxt "MessageLog"
 msgid "Search found 0 matches."
 msgstr ""
 
-#: messagelog.ui:19
 msgctxt "MessageLog"
 msgid "Message Log"
 msgstr ""
 
-#: messagelog.ui:452
 msgctxt "MessageLog"
 msgid "Message Filters..."
 msgstr ""
 
-#: messagelog.ui:455
 msgctxt "MessageLog"
 msgid "Set message filters"
 msgstr ""
 
-#: messagelog.ui:463
 msgctxt "MessageLog"
 msgid "History Size..."
 msgstr ""
 
-#: messagelog.ui:466
 msgctxt "MessageLog"
 msgid "Set maximum number of messages to display"
 msgstr ""
 
-#: messagelog.ui:477
 msgctxt "MessageLog"
 msgid "Clear"
 msgstr ""
 
-#: messagelog.ui:480
 msgctxt "MessageLog"
 msgid "Clear all messages from the Message Log (Ctrl+E)"
 msgstr ""
 
-#: messagelog.ui:483
 msgctxt "MessageLog"
 msgid "Ctrl+E"
 msgstr ""
 
-#: messagelog.ui:497
 msgctxt "MessageLog"
 msgid "Copy"
 msgstr ""
 
-#: messagelog.ui:500
 msgctxt "MessageLog"
 msgid "Copy the selected messages to the clipboard (Ctrl+C)"
 msgstr ""
 
-#: messagelog.ui:503
 msgctxt "MessageLog"
 msgid "Ctrl+C"
 msgstr ""
 
-#: messagelog.ui:514
 msgctxt "MessageLog"
 msgid "Select All"
 msgstr ""
 
-#: messagelog.ui:517
 msgctxt "MessageLog"
 msgid "Select all messages (Ctrl+A)"
 msgstr ""
 
-#: messagelog.ui:520
 msgctxt "MessageLog"
 msgid "Ctrl+A"
 msgstr ""
 
-#: messagelog.ui:528
 msgctxt "MessageLog"
 msgid "Save All"
 msgstr ""
 
-#: messagelog.ui:531
 msgctxt "MessageLog"
 msgid "Save all messages to a file"
 msgstr ""
 
-#: messagelog.ui:539
 msgctxt "MessageLog"
 msgid "Save Selected"
 msgstr ""
 
-#: messagelog.ui:542
 msgctxt "MessageLog"
 msgid "Save selected messages to a file"
 msgstr ""
 
-#: messagelog.ui:553
 msgctxt "MessageLog"
 msgid "Settings"
 msgstr ""
 
-#: messagelog.ui:556
 msgctxt "MessageLog"
 msgid "Adjust Message Log Settings"
 msgstr ""
 
-#: messagelog.ui:559
 msgctxt "MessageLog"
 msgid "Ctrl+T"
 msgstr ""
 
-#: messagelog.ui:567
 msgctxt "MessageLog"
 msgid "Help"
 msgstr ""
 
-#: messagelog.ui:570
 msgctxt "MessageLog"
 msgid "Show the help browser"
 msgstr ""
 
-#: messagelog.ui:573
 msgctxt "MessageLog"
 msgid "F1"
 msgstr ""
 
-#: messagelog.ui:581
 msgctxt "MessageLog"
 msgid "Close"
 msgstr ""
 
-#: messagelog.ui:584
 msgctxt "MessageLog"
 msgid "Close the Message Log"
 msgstr ""
 
-#: messagelog.ui:587
 msgctxt "MessageLog"
 msgid "Esc"
 msgstr ""
 
-#: messagelog.ui:598
 msgctxt "MessageLog"
 msgid "Find"
 msgstr ""
 
-#: messagelog.ui:601
 msgctxt "MessageLog"
 msgid "Find all messages containing the search text (Ctrl+F)"
 msgstr ""
 
-#: messagelog.ui:604
 msgctxt "MessageLog"
 msgid "Ctrl+F"
 msgstr ""
 
-#: messagelog.ui:66
 msgctxt "MessageLog"
 msgid "Time"
 msgstr ""
 
-#: messagelog.ui:71
 msgctxt "MessageLog"
 msgid "Type"
 msgstr ""
 
-#: messagelog.ui:76
 msgctxt "MessageLog"
 msgid "Message"
 msgstr ""
 
-#: messagelog.ui:160
 msgctxt "MessageLog"
 msgid "Saves the current Message Log settings"
 msgstr ""
 
-#: messagelog.ui:163
 msgctxt "MessageLog"
 msgid "Save Settings"
 msgstr ""
 
-#: messagelog.ui:179
 msgctxt "MessageLog"
 msgid "Cancels changes made to settings"
 msgstr ""
 
-#: messagelog.ui:182
 msgctxt "MessageLog"
 msgid "Cancel"
 msgstr ""
 
-#: messagelog.ui:196
 msgctxt "MessageLog"
 msgid "Message Filter"
 msgstr ""
 
-#: messagelog.ui:217
 msgctxt "MessageLog"
 msgid "Error"
 msgstr ""
 
-#: messagelog.ui:233
 msgctxt "MessageLog"
 msgid "Warning"
 msgstr ""
 
-#: messagelog.ui:249
 msgctxt "MessageLog"
 msgid "Notice"
 msgstr ""
 
-#: messagelog.ui:265
 msgctxt "MessageLog"
 msgid "Info"
 msgstr ""
 
-#: messagelog.ui:281
 msgctxt "MessageLog"
 msgid "Debug"
 msgstr ""
 
-#: messagelog.ui:297
 msgctxt "MessageLog"
 msgid "Message Log History"
 msgstr ""
 
-#: messagelog.ui:318
 msgctxt "MessageLog"
 msgid "Number of messages to display in the message log window"
 msgstr ""
 
-#: messagelog.ui:337
 msgctxt "MessageLog"
 msgid "messages"
 msgstr ""
 
-#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
 msgctxt "MessageLog"
 msgid "Always Save New Log Messages"
 msgstr ""
 
-#: messagelog.ui:371
 msgctxt "MessageLog"
-msgid "Browse"
+msgid ""
+"Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
 msgstr ""
 
-#: messagelog.ui:394
 msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
+msgid ""
+"Messages that only appear when \n"
+"something has gone wrong with Tor."
 msgstr ""
 
-#: messagelog.ui:397
 msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
+msgid ""
+"Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid ""
+"Cannot write file %1\n"
+"\n"
+"%2."
 msgstr ""
 
-#: netviewer.ui:24
 msgctxt "NetViewer"
 msgid "Tor Network Map"
 msgstr ""
 
-#: netviewer.ui:239
 msgctxt "NetViewer"
 msgid "Refresh"
 msgstr ""
 
-#: netviewer.ui:245
 msgctxt "NetViewer"
 msgid "Refresh the list of Tor relays and connections"
 msgstr ""
 
-#: netviewer.ui:248
 msgctxt "NetViewer"
 msgid "Ctrl+R"
 msgstr ""
 
-#: netviewer.ui:256
 msgctxt "NetViewer"
 msgid "Help"
 msgstr ""
 
-#: netviewer.ui:259
 msgctxt "NetViewer"
 msgid "Show the network map help"
 msgstr ""
 
-#: netviewer.ui:262
 msgctxt "NetViewer"
 msgid "Show network map help"
 msgstr ""
 
-#: netviewer.ui:265
 msgctxt "NetViewer"
 msgid "F1"
 msgstr ""
 
-#: netviewer.ui:273
 msgctxt "NetViewer"
 msgid "Close"
 msgstr ""
 
-#: netviewer.ui:279
 msgctxt "NetViewer"
 msgid "Close the network map"
 msgstr ""
 
-#: netviewer.ui:282
 msgctxt "NetViewer"
 msgid "Esc"
 msgstr ""
 
-#: netviewer.ui:290
 msgctxt "NetViewer"
 msgid "Zoom In"
 msgstr ""
 
-#: netviewer.ui:296
 msgctxt "NetViewer"
 msgid "Zoom in on the network map"
 msgstr ""
 
-#: netviewer.ui:299
 msgctxt "NetViewer"
 msgid "+"
 msgstr ""
 
-#: netviewer.ui:307
 msgctxt "NetViewer"
 msgid "Zoom Out"
 msgstr ""
 
-#: netviewer.ui:313
 msgctxt "NetViewer"
 msgid "Zoom out on the network map"
 msgstr ""
 
-#: netviewer.ui:316
 msgctxt "NetViewer"
 msgid "-"
 msgstr ""
 
-#: netviewer.ui:324
 msgctxt "NetViewer"
 msgid "Zoom To Fit"
 msgstr ""
 
-#: netviewer.ui:330
 msgctxt "NetViewer"
 msgid "Zooms to fit all currently displayed circuits"
 msgstr ""
 
-#: netviewer.ui:333
 msgctxt "NetViewer"
 msgid "Ctrl+Z"
 msgstr ""
 
-#: networkpage.cpp:193
-msgctxt "NetworkPage"
-msgid "Invalid Bridge"
+msgctxt "NetViewer"
+msgid "Relay Not Found"
 msgstr ""
 
-#: networkpage.cpp:194
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
 msgstr ""
 
-#: networkpage.cpp:241
 msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr ""
 
-#: networkpage.cpp:272
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
-#: networkpage.cpp:278
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
-#: networkpage.cpp:314
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
 msgstr ""
 
-#: networkpage.ui:25
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:28
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
 msgstr ""
 
-#: networkpage.ui:58
 msgctxt "NetworkPage"
 msgid "Proxy Settings"
 msgstr ""
 
-#: networkpage.ui:70
-msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-#: networkpage.ui:80
 msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
-#: networkpage.ui:90
-msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-#: networkpage.ui:108
 msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
-#: networkpage.ui:135
 msgctxt "NetworkPage"
 msgid "Port:"
 msgstr ""
 
-#: networkpage.ui:176
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
 msgstr ""
 
-#: networkpage.ui:179
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
 msgstr ""
 
-#: networkpage.ui:203
 msgctxt "NetworkPage"
 msgid "Firewall Settings"
 msgstr ""
 
-#: networkpage.ui:215
 msgctxt "NetworkPage"
 msgid "Allowed Ports:"
 msgstr ""
 
-#: networkpage.ui:225
 msgctxt "NetworkPage"
 msgid "80, 443"
 msgstr ""
 
-#: networkpage.ui:235
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
-#: networkpage.ui:238
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
 msgstr ""
 
-#: networkpage.ui:262
 msgctxt "NetworkPage"
 msgid "Bridge Settings"
 msgstr ""
 
-#: networkpage.ui:274
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgid "Add a Bridge:"
 msgstr ""
 
-#: networkpage.ui:295
 msgctxt "NetworkPage"
-msgid "Add a Bridge:"
+msgid "Remove the selected bridges from the list"
 msgstr ""
 
-#: networkpage.ui:318
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgid "Copy the selected bridges to the clipboard"
 msgstr ""
 
-#: networkpage.ui:383
 msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
+msgid "Find Bridges Now"
 msgstr ""
 
-#: networkpage.ui:399
 msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
 
-#: policy.cpp:167
 msgctxt "Policy"
 msgid "reject"
 msgstr ""
 
-#: routerdescriptor.cpp:76
 msgctxt "RouterDescriptor"
 msgid "Online"
 msgstr ""
 
-#: routerdescriptor.cpp:78
 msgctxt "RouterDescriptor"
 msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptor.cpp:80
 msgctxt "RouterDescriptor"
 msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:139
 msgctxt "RouterDescriptorView"
 msgid "Location:"
 msgstr ""
 
-#: routerdescriptorview.cpp:143
 msgctxt "RouterDescriptorView"
 msgid "IP Address:"
 msgstr ""
 
-#: routerdescriptorview.cpp:144
 msgctxt "RouterDescriptorView"
 msgid "Platform:"
 msgstr ""
 
-#: routerdescriptorview.cpp:148
 msgctxt "RouterDescriptorView"
 msgid "Bandwidth:"
 msgstr ""
 
-#: routerdescriptorview.cpp:150
 msgctxt "RouterDescriptorView"
 msgid "Uptime:"
 msgstr ""
 
-#: routerdescriptorview.cpp:156
 msgctxt "RouterDescriptorView"
 msgid "Last Updated:"
 msgstr ""
 
-#: routerdescriptorview.cpp:100
 msgctxt "RouterDescriptorView"
-msgid "%1 days "
+msgid "Copy"
 msgstr ""
 
-#: routerdescriptorview.cpp:103
-msgctxt "RouterDescriptorView"
-msgid "%1 hours "
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
 msgstr ""
 
-#: routerdescriptorview.cpp:106
-msgctxt "RouterDescriptorView"
-msgid "%1 mins "
+msgctxt "RouterInfoDialog"
+msgid "Online"
 msgstr ""
 
-#: routerdescriptorview.cpp:109
-msgctxt "RouterDescriptorView"
-msgid "%1 secs"
+msgctxt "RouterInfoDialog"
+msgid "Offline"
 msgstr ""
 
-#: routerdescriptorview.cpp:48
-msgctxt "RouterDescriptorView"
-msgid "Copy"
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
 msgstr ""
 
-#: routerlistitem.cpp:67
 msgctxt "RouterListItem"
 msgid "Offline"
 msgstr ""
 
-#: routerlistitem.cpp:71
 msgctxt "RouterListItem"
 msgid "Hibernating"
 msgstr ""
 
-#: routerlistitem.cpp:83
 msgctxt "RouterListItem"
 msgid "%1 KB/s"
 msgstr ""
 
-#: routerlistwidget.cpp:49
 msgctxt "RouterListWidget"
 msgid "Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:74
 msgctxt "RouterListWidget"
 msgid "Zoom to Relay"
 msgstr ""
 
-#: routerlistwidget.cpp:220
 msgctxt "RouterListWidget"
 msgid "%1 relays online"
 msgstr ""
 
-#: routerlistwidget.cpp:67
 msgctxt "RouterListWidget"
 msgid "Copy"
 msgstr ""
 
-#: routerlistwidget.cpp:68
 msgctxt "RouterListWidget"
 msgid "Nickname"
 msgstr ""
 
-#: routerlistwidget.cpp:71
 msgctxt "RouterListWidget"
 msgid "Fingerprint"
 msgstr ""
 
-#: serverpage.cpp:140
 msgctxt "ServerPage"
 msgid "Bridge Support Unavailable"
 msgstr ""
 
-#: serverpage.cpp:143
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
-#: serverpage.cpp:145
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
-#: serverpage.cpp:199
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
 msgstr ""
 
-#: serverpage.cpp:263
 msgctxt "ServerPage"
 msgid "You must specify at least a relay nickname and port."
 msgstr ""
 
-#: serverpage.ui:25
 msgctxt "ServerPage"
 msgid "Run as a client only"
 msgstr ""
 
-#: serverpage.ui:32
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-#: serverpage.ui:39
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
-msgstr ""
-
-#: serverpage.ui:91
 msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr ""
 
-#: serverpage.ui:110
 msgctxt "ServerPage"
 msgid "Enable to mirror the relay directory"
 msgstr ""
 
-#: serverpage.ui:113
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory "
-msgstr ""
-
-#: serverpage.ui:139
 msgctxt "ServerPage"
 msgid "Attempt to automatically configure port forwarding"
 msgstr ""
 
-#: serverpage.ui:154
 msgctxt "ServerPage"
 msgid "Test"
 msgstr ""
 
-#: serverpage.ui:164
 msgctxt "ServerPage"
 msgid "Show help topic on port forwarding"
 msgstr ""
 
-#: serverpage.ui:204
-msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-
-#: serverpage.ui:234
 msgctxt "ServerPage"
 msgid "Directory Port:"
 msgstr ""
 
-#: serverpage.ui:267
 msgctxt "ServerPage"
 msgid "Directory Port Number"
 msgstr ""
 
-#: serverpage.ui:279
 msgctxt "ServerPage"
 msgid "Contact Info:"
 msgstr ""
 
-#: serverpage.ui:337
 msgctxt "ServerPage"
 msgid "Name of your relay"
 msgstr ""
 
-#: serverpage.ui:370
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
 msgstr ""
 
-#: serverpage.ui:380
 msgctxt "ServerPage"
 msgid "Nickname:"
 msgstr ""
 
-#: serverpage.ui:76
 msgctxt "ServerPage"
 msgid "Basic Settings"
 msgstr ""
 
-#: serverpage.ui:435
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
-#: serverpage.ui:466
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
 msgstr ""
 
-#: serverpage.ui:471
 msgctxt "ServerPage"
 msgid "Cable/DSL 512 Kbps"
 msgstr ""
 
-#: serverpage.ui:476
 msgctxt "ServerPage"
 msgid "Cable/DSL 768 Kbps"
 msgstr ""
 
-#: serverpage.ui:481
 msgctxt "ServerPage"
 msgid "T1/Cable/DSL 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:486
 msgctxt "ServerPage"
 msgid "> 1.5 Mbps"
 msgstr ""
 
-#: serverpage.ui:491
 msgctxt "ServerPage"
 msgid "Custom"
 msgstr ""
 
-#: serverpage.ui:456
 msgctxt "ServerPage"
-msgid "Select the entry that most closely resembles your Internet connection"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
 msgstr ""
 
-#: serverpage.ui:502
 msgctxt "ServerPage"
-msgid "Show help topic on bandwidth rate limits"
+msgid "Instant Messaging (IM)"
 msgstr ""
 
-#: serverpage.ui:591
 msgctxt "ServerPage"
-msgid "Average Rate"
+msgid "Port 443"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+msgid "Secure Websites (SSL)"
 msgstr ""
 
-#: serverpage.ui:708
 msgctxt "ServerPage"
-msgid "KB/s"
+msgid "Port 80"
 msgstr ""
 
-#: serverpage.ui:666
 msgctxt "ServerPage"
-msgid "Maximum Rate"
+msgid "Websites"
 msgstr ""
 
-#: serverpage.ui:695
 msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
+msgid "Show help topic on exit policies"
 msgstr ""
 
-#: serverpage.ui:737
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
-#: serverpage.ui:400
 msgctxt "ServerPage"
-msgid "Bandwidth Limits"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
-#: serverpage.ui:802
 msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
+msgid "Exit Policies"
 msgstr ""
 
-#: serverpage.ui:805
 msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
+msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
-#: serverpage.ui:815
 msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
-#: serverpage.ui:818
 msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
+msgid "Copy your bridge relay's identity to the clipboard"
 msgstr ""
 
-#: serverpage.ui:828
 msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
+msgid "No Recent Usage"
 msgstr ""
 
-#: serverpage.ui:831
 msgctxt "ServerPage"
-msgid "Misc Other Services"
+msgid "No clients have used your relay recently."
 msgstr ""
 
-#: serverpage.ui:841
 msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
-#: serverpage.ui:844
 msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Bridge History"
 msgstr ""
 
-#: serverpage.ui:854
 msgctxt "ServerPage"
-msgid "Port 443"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:857
 msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
-#: serverpage.ui:867
 msgctxt "ServerPage"
-msgid "Port 80"
+msgid "The returned response was: %1"
 msgstr ""
 
-#: serverpage.ui:870
 msgctxt "ServerPage"
-msgid "Websites"
+msgid "Help censored users reach the Tor network"
 msgstr ""
 
-#: serverpage.ui:896
 msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
-#: serverpage.ui:969
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
 msgstr ""
 
-#: serverpage.ui:979
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid "Automatically distribute my bridge address"
 msgstr ""
 
-#: serverpage.ui:764
 msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Relay traffic for the Tor network (exit relay)"
 msgstr ""
 
-#: serverpage.ui:1015
 msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
 msgstr ""
 
-#: serverpage.ui:1039
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid "Mirror the Relay Directory"
 msgstr ""
 
-#: serverpage.ui:1061
 msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
-#: servicepage.cpp:116
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
 msgstr ""
 
-#: servicepage.cpp:123
 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."
+msgid ""
+"Please configure at least a service directory and a virtual port for each "
+"service you want to save. Remove the other ones."
 msgstr ""
 
-#: servicepage.cpp:597
 msgctxt "ServicePage"
 msgid "Error"
 msgstr ""
 
-#: servicepage.cpp:452
 msgctxt "ServicePage"
 msgid "Please select a Service."
 msgstr ""
 
-#: servicepage.cpp:458
 msgctxt "ServicePage"
 msgid "Select Service Directory"
 msgstr ""
 
-#: servicepage.cpp:547
 msgctxt "ServicePage"
 msgid "Virtual Port may only contain valid port numbers [1..65535]."
 msgstr ""
 
-#: servicepage.cpp:578
 msgctxt "ServicePage"
 msgid "Target may only contain address:port, address, or port."
 msgstr ""
 
-#: servicepage.cpp:598
 msgctxt "ServicePage"
 msgid "Directory already in use by another service."
 msgstr ""
 
-#: servicepage.ui:19
 msgctxt "ServicePage"
 msgid "Form"
 msgstr ""
 
-#: servicepage.ui:31
 msgctxt "ServicePage"
 msgid "Provided Hidden Services"
 msgstr ""
 
-#: servicepage.ui:56
 msgctxt "ServicePage"
 msgid "Onion Address"
 msgstr ""
 
-#: servicepage.ui:61
 msgctxt "ServicePage"
 msgid "Virtual Port"
 msgstr ""
 
-#: servicepage.ui:66
 msgctxt "ServicePage"
 msgid "Target"
 msgstr ""
 
-#: servicepage.ui:71
 msgctxt "ServicePage"
 msgid "Directory Path"
 msgstr ""
 
-#: servicepage.ui:76
 msgctxt "ServicePage"
 msgid "Enabled"
 msgstr ""
 
-#: servicepage.ui:84
 msgctxt "ServicePage"
 msgid "Add new service to list"
 msgstr ""
 
-#: servicepage.ui:97
 msgctxt "ServicePage"
 msgid "Remove selected service from list"
 msgstr ""
 
-#: servicepage.ui:110
 msgctxt "ServicePage"
 msgid "Copy onion address of selected service to clipboard"
 msgstr ""
 
-#: servicepage.ui:123
 msgctxt "ServicePage"
 msgid "Browse in local file system and choose directory for selected service"
 msgstr ""
 
-#: servicepage.cpp:384
 msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
-#: stream.cpp:131
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr "Ð?овий"
 
-#: stream.cpp:133
 msgctxt "Stream"
 msgid "Resolving"
 msgstr ""
 
-#: stream.cpp:134
 msgctxt "Stream"
 msgid "Connecting"
 msgstr ""
 
-#: stream.cpp:135
 msgctxt "Stream"
 msgid "Open"
 msgstr "Ð?Ñ?дкÑ?иÑ?и"
 
-#: stream.cpp:136
 msgctxt "Stream"
 msgid "Failed"
 msgstr ""
 
-#: stream.cpp:137
 msgctxt "Stream"
 msgid "Closed"
 msgstr ""
 
-#: stream.cpp:138
 msgctxt "Stream"
 msgid "Retrying"
 msgstr ""
 
-#: stream.cpp:139
 msgctxt "Stream"
 msgid "Remapped"
 msgstr ""
 
-#: stream.cpp:140
 msgctxt "Stream"
 msgid "Unknown"
 msgstr ""
 
-#: torprocess.cpp:107
 msgctxt "TorProcess"
 msgid "Process %1 failed to stop. [%2]"
 msgstr ""
 
-#: torservice.cpp:143
 msgctxt "TorService"
 msgid "The Tor service is not installed."
 msgstr ""
 
-#: torservice.cpp:161
 msgctxt "TorService"
 msgid "Unable to start the Tor service."
 msgstr ""
 
-#: torsettings.cpp:103
 msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
-#: upnpcontrol.cpp:139
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
 
-#: upnpcontrol.cpp:141
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:143
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
 msgstr ""
 
-#: upnpcontrol.cpp:145
 msgctxt "UPNPControl"
 msgid "WSAStartup failed"
 msgstr ""
 
-#: upnpcontrol.cpp:147
 msgctxt "UPNPControl"
 msgid "Failed to add a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:149
 msgctxt "UPNPControl"
 msgid "Failed to retrieve a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:151
 msgctxt "UPNPControl"
 msgid "Failed to remove a port mapping"
 msgstr ""
 
-#: upnpcontrol.cpp:153
 msgctxt "UPNPControl"
 msgid "Unknown error"
 msgstr ""
 
-#: upnptestdialog.cpp:112
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
 msgstr ""
 
-#: upnptestdialog.cpp:117
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:122
 msgctxt "UPNPTestDialog"
 msgid "Updating relay port mapping"
 msgstr ""
 
-#: upnptestdialog.cpp:127
 msgctxt "UPNPTestDialog"
 msgid "Test completed successfully!"
 msgstr ""
 
-#: upnptestdialog.ui:13
 msgctxt "UPNPTestDialog"
 msgid "Testing UPnP Support"
 msgstr ""
 
-#: upnptestdialog.ui:92
 msgctxt "UPNPTestDialog"
 msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
-#: vmessagebox.cpp:77
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
+msgstr ""
+
+msgctxt "UpdateProcess"
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
 msgctxt "VMessageBox"
 msgid "OK"
 msgstr ""
 
-#: vmessagebox.cpp:78
 msgctxt "VMessageBox"
 msgid "Cancel"
 msgstr "Ð?Ñ?дмова"
 
-#: vmessagebox.cpp:79
 msgctxt "VMessageBox"
 msgid "Yes"
 msgstr ""
 
-#: vmessagebox.cpp:80
 msgctxt "VMessageBox"
 msgid "No"
 msgstr ""
 
-#: vmessagebox.cpp:81
 msgctxt "VMessageBox"
 msgid "Help"
 msgstr ""
 
-#: vmessagebox.cpp:82
 msgctxt "VMessageBox"
 msgid "Retry"
 msgstr ""
 
-#: vmessagebox.cpp:83
 msgctxt "VMessageBox"
 msgid "Show Log"
 msgstr ""
 
-#: vmessagebox.cpp:84
 msgctxt "VMessageBox"
 msgid "Show Settings"
 msgstr ""
 
-#: vmessagebox.cpp:85
 msgctxt "VMessageBox"
 msgid "Continue"
 msgstr ""
 
-#: vmessagebox.cpp:86
 msgctxt "VMessageBox"
 msgid "Quit"
 msgstr ""
 
-#: vmessagebox.cpp:87
 msgctxt "VMessageBox"
 msgid "Browse"
 msgstr ""
 
-#: main.cpp:75
 msgctxt "Vidalia"
 msgid "Invalid Argument"
 msgstr ""
 
-#: main.cpp:89
 msgctxt "Vidalia"
 msgid "Vidalia is already running"
 msgstr ""
 
-#: main.cpp:95
-msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
-""
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-#: vidalia.cpp:169
 msgctxt "Vidalia"
 msgid "Displays this usage message and exits."
 msgstr ""
 
-#: vidalia.cpp:171
 msgctxt "Vidalia"
 msgid "Resets ALL stored Vidalia settings."
 msgstr ""
 
-#: vidalia.cpp:173
 msgctxt "Vidalia"
 msgid "Sets the directory Vidalia uses for data files."
 msgstr ""
 
-#: vidalia.cpp:175
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's pidfile."
 msgstr ""
 
-#: vidalia.cpp:177
 msgctxt "Vidalia"
 msgid "Sets the name and location of Vidalia's logfile."
 msgstr ""
 
-#: vidalia.cpp:180
 msgctxt "Vidalia"
 msgid "Sets the verbosity of Vidalia's logging."
 msgstr ""
 
-#: vidalia.cpp:183
 msgctxt "Vidalia"
 msgid "Sets Vidalia's interface style."
 msgstr ""
 
-#: vidalia.cpp:186
 msgctxt "Vidalia"
 msgid "Sets Vidalia's language."
 msgstr ""
 
-#: vidalia.cpp:190
 msgctxt "Vidalia"
 msgid "Vidalia Usage Information"
 msgstr ""
 
-#: vidalia.cpp:238
 msgctxt "Vidalia"
-msgid "Invalid language code specified: "
+msgid "Unable to open log file '%1': %2"
 msgstr ""
 
-#: vidalia.cpp:245
 msgctxt "Vidalia"
-msgid "Invalid GUI style specified: "
+msgid "Value required for parameter :"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
 msgstr ""
diff --git a/src/vidalia/i18n/po/ur/qt_ur.po b/src/vidalia/i18n/po/ur/qt_ur.po
index f36d98e..37486cb 100644
--- a/src/vidalia/i18n/po/ur/qt_ur.po
+++ b/src/vidalia/i18n/po/ur/qt_ur.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ur/vidalia_ur.po b/src/vidalia/i18n/po/ur/vidalia_ur.po
index 49d5f5f..7ae0e45 100644
--- a/src/vidalia/i18n/po/ur/vidalia_ur.po
+++ b/src/vidalia/i18n/po/ur/vidalia_ur.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/ve/qt_ve.po b/src/vidalia/i18n/po/ve/qt_ve.po
index 50cdcbb..c9b23af 100644
--- a/src/vidalia/i18n/po/ve/qt_ve.po
+++ b/src/vidalia/i18n/po/ve/qt_ve.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ve/vidalia_ve.po b/src/vidalia/i18n/po/ve/vidalia_ve.po
index ff3e342..5f4d7a6 100644
--- a/src/vidalia/i18n/po/ve/vidalia_ve.po
+++ b/src/vidalia/i18n/po/ve/vidalia_ve.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/vi/qt_vi.po b/src/vidalia/i18n/po/vi/qt_vi.po
index 678ff54..0e29a97 100644
--- a/src/vidalia/i18n/po/vi/qt_vi.po
+++ b/src/vidalia/i18n/po/vi/qt_vi.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/vi/vidalia_vi.po b/src/vidalia/i18n/po/vi/vidalia_vi.po
index c1711fa..76a7276 100755
--- a/src/vidalia/i18n/po/vi/vidalia_vi.po
+++ b/src/vidalia/i18n/po/vi/vidalia_vi.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -193,6 +194,17 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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"
@@ -219,6 +231,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia không thá»? nạp phiên dá»?ch ngôn ngữ Ä?ã Ä?ược chá»?n."
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "K� từ:"
@@ -1262,24 +1291,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 ""
 
@@ -1297,16 +1308,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -1526,10 +1548,7 @@ msgid ""
 "Vidalia can open the link you selected in your default Web browser. If your "
 "browser is not currently configured to use Tor then the request will not be "
 "anonymous."
-msgstr ""
-"Vidalia có thá»? má»? các liên kết mà bạn Ä?ã chá»?n trong trình duyá»?t web mặc Ä?á»?nh"
-" của bạn. Nếu trình duyá»?t của bạn hiá»?n không có cấu hình Ä?á»? sá»­ dụng Tor thì "
-"yêu cầu sẽ không Ä?ược ẩn danh."
+msgstr "Vidalia có thá»? má»? các liên kết mà bạn Ä?ã chá»?n trong trình duyá»?t web mặc Ä?á»?nh của bạn. Nếu trình duyá»?t của bạn hiá»?n không có cấu hình Ä?á»? sá»­ dụng Tor thì yêu cầu sẽ không Ä?ược ẩn danh."
 
 msgctxt "HelpTextBrowser"
 msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1543,9 +1562,7 @@ msgctxt "HelpTextBrowser"
 msgid ""
 "Vidalia was unable to open the selected link in your Web browser. You can "
 "still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia không thá»? má»? liên kết Ä?ược lá»±a chá»?n trong trình duyá»?t web của bạn. "
-"Bạn vẫn có th� sao chép URL và dán nó vào trình duy�t của bạn."
+msgstr "Vidalia không thá»? má»? liên kết Ä?ược lá»±a chá»?n trong trình duyá»?t web của bạn. Bạn vẫn có thá»? sao chép URL và dán nó vào trình duyá»?t của bạn."
 
 msgctxt "HelpTextBrowser"
 msgid "Error opening help file:"
@@ -1756,10 +1773,6 @@ msgid "Connected to the Tor network!"
 msgstr "Kết n�i v�i mạng Tor!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "Tình trạng khá»?i Ä?á»?ng không Ä?ược công nhận"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "hôÌ?n hÆ¡Ì£p"
 
@@ -1827,9 +1840,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to start Tor. Check your settings to ensure the correct "
 "name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia không thá»? bắt Ä?ầu Tor. Kiá»?m tra các thiết lập của bạn Ä?á»? Ä?ảm bảo "
-"Ä?úng tên và vá»? trí của Tor thá»±c thi Ä?ược chá»? Ä?á»?nh của bạn."
+msgstr "Vidalia không thá»? bắt Ä?ầu Tor. Kiá»?m tra các thiết lập của bạn Ä?á»? Ä?ảm bảo Ä?úng tên và vá»? trí của Tor thá»±c thi Ä?ược chá»? Ä?á»?nh của bạn."
 
 msgctxt "MainWindow"
 msgid "Connecting to Tor"
@@ -1867,9 +1878,7 @@ msgctxt "MainWindow"
 msgid ""
 "The Tor software requires Vidalia to send the contents of an authentication "
 "cookie, but Vidalia was unable to find one."
-msgstr ""
-"Các phần má»?m Tor Ä?òi há»?i Vidalia gá»­i yêu cầu vá»? ná»?i dung của má»?t cookie xác "
-"thá»±c, nhÆ°ng Vidalia Ä?ã không thá»? tìm thấy má»?t cookie."
+msgstr "Các phần má»?m Tor Ä?òi há»?i Vidalia gá»­i yêu cầu vá»? ná»?i dung của má»?t cookie xác thá»±c, nhÆ°ng Vidalia Ä?ã không thá»? tìm thấy má»?t cookie."
 
 msgctxt "MainWindow"
 msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1891,9 +1900,7 @@ msgctxt "MainWindow"
 msgid ""
 "Vidalia was unable to register for some events. Many of Vidalia's features "
 "may be unavailable."
-msgstr ""
-"Vidalia không thá»? Ä?Ä?ng ghi cho má»?t sá»? sá»± kiá»?n. Nhiá»?u trong sá»? các tính nÄ?ng "
-"của Vidalia có th� không có sẵn."
+msgstr "Vidalia không thá»? Ä?Ä?ng ghi cho má»?t sá»? sá»± kiá»?n. Nhiá»?u trong sá»? các tính nÄ?ng của Vidalia có thá»? không có sẵn."
 
 msgctxt "MainWindow"
 msgid "Authentication Error"
@@ -1905,8 +1912,7 @@ msgstr "Vidalia không th� xác nhận phần m�m Tor. (% 1)"
 
 msgctxt "MainWindow"
 msgid "Please check your control port authentication settings."
-msgstr ""
-"Vui lòng kiá»?m tra các thiết lập xác thá»±c cá»?ng truy nhập Ä?iá»?u khiá»?n của bạn."
+msgstr "Vui lòng kiá»?m tra các thiết lập xác thá»±c cá»?ng truy nhập Ä?iá»?u khiá»?n của bạn."
 
 msgctxt "MainWindow"
 msgid "Tor Update Available"
@@ -1916,9 +1922,7 @@ msgctxt "MainWindow"
 msgid ""
 "The currently installed version of Tor is out of date or no longer "
 "recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Phiên bản cài Ä?ặt hiá»?n thá»?i của Tor hết hạn hoặc không còn Ä?ược Ä?á»? nghá»?. Xin"
-" vui lòng truy cập vào trang web Tor Ä?á»? tải phiên bản má»?i nhất."
+msgstr "Phiên bản cài Ä?ặt hiá»?n thá»?i của Tor hết hạn hoặc không còn Ä?ược Ä?á»? nghá»?. Xin vui lòng truy cập vào trang web Tor Ä?á»? tải phiên bản má»?i nhất."
 
 msgctxt "MainWindow"
 msgid "Tor website: %1"
@@ -1928,8 +1932,7 @@ msgctxt "MainWindow"
 msgid ""
 "All subsequent connections will appear to be different than your old "
 "connections."
-msgstr ""
-"Tất cả các kết n�i tiếp theo sẽ xuất hi�n khác v�i các kết n�i cũ của bạn."
+msgstr "Tất cả các kết n�i tiếp theo sẽ xuất hi�n khác v�i các kết n�i cũ của bạn."
 
 msgctxt "MainWindow"
 msgid "Failed to Create New Identity"
@@ -2024,10 +2027,7 @@ msgid ""
 "Vidalia tried to reset Tor's control password, but was not able to restart "
 "the Tor software. Please check your Task Manager to ensure there are no "
 "other Tor processes running."
-msgstr ""
-"Vidalia Ä?ã thu*? Ä?ặt lại mật khẩu Ä?iá»?u khiá»?n Tor, nhÆ°ng Ä?ã không thá»? khá»?i "
-"Ä?á»?ng lại phần má»?m Tor. Vui lòng kiá»?m tra quản lý công viá»?c của bạn Ä?á»? Ä?ảm "
-"bảo không có tiến trình Tor khác Ä?ang chạy."
+msgstr "Vidalia Ä?ã thu*? Ä?ặt lại mật khẩu Ä?iá»?u khiá»?n Tor, nhÆ°ng Ä?ã không thá»? khá»?i Ä?á»?ng lại phần má»?m Tor. Vui lòng kiá»?m tra quản lý công viá»?c của bạn Ä?á»? Ä?ảm bảo không có tiến trình Tor khác Ä?ang chạy."
 
 msgctxt "MainWindow"
 msgid ""
@@ -2078,15 +2078,27 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -2101,24 +2113,31 @@ msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"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 ", probably Telnet,"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2143,9 +2162,7 @@ msgstr "Tên Tập tin Ä?Ä?ng nhập bắt buá»?c"
 
 msgctxt "MessageLog"
 msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Bạn phải nhập má»?t tên tập tin Ä?á»? có thá»? lÆ°u các tin nhắn Ä?Ä?ng nhập vào má»?t "
-"tập tin."
+msgstr "Bạn phải nhập má»?t tên tập tin Ä?á»? có thá»? lÆ°u các tin nhắn Ä?Ä?ng nhập vào má»?t tập tin."
 
 msgctxt "MessageLog"
 msgid "Select Log File"
@@ -2369,9 +2386,7 @@ msgstr "Trình duy�t"
 
 msgctxt "MessageLog"
 msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Kích hoạt tính nÄ?ng Æ°u tá»± Ä?á»?ng ltất cả các tin nhắn Ä?Ä?ng nhập má»?i vào má»?t "
-"tập tin"
+msgstr "Kích hoạt tính nÄ?ng Æ°u tá»± Ä?á»?ng ltất cả các tin nhắn Ä?Ä?ng nhập má»?i vào má»?t tập tin"
 
 msgctxt "MessageLog"
 msgid "Automatically save new log messages to a file"
@@ -2537,14 +2552,6 @@ msgid "Ctrl+F"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "Cầu không hợp l�"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "Su*. Ä?á»?nh danh cây cầu Ä?ược chá»? Ä?á»?nh là không hợp lá»?."
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "Sao chép (Ctrl+C)"
 
@@ -2552,17 +2559,13 @@ msgctxt "NetworkPage"
 msgid ""
 "You must specify both an IP address or hostname and a port number to "
 "configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Bạn phải xác Ä?á»?nh cả hai má»?t Ä?á»?a chá»? IP hay tên máy và sá»? cá»?ng Ä?á»? cấu hình "
-"Tor Ä?á»? sá»­ dụng má»?t proxy ủy quyá»?n truy cập vào  Liên mạng"
+msgstr "Bạn phải xác Ä?á»?nh cả hai má»?t Ä?á»?a chá»? IP hay tên máy và sá»? cá»?ng Ä?á»? cấu hình Tor Ä?á»? sá»­ dụng má»?t proxy ủy quyá»?n truy cập vào  Liên mạng"
 
 msgctxt "NetworkPage"
 msgid ""
 "You must specify one or more ports to which your firewall allows you to "
 "connect."
-msgstr ""
-"Bạn phải chá»? Ä?á»?nh má»?t hoặc nhiá»?u cá»?ng Ä?á»?  firewall của bạn cho phép bạn kết "
-"ná»?i."
+msgstr "Bạn phải chá»? Ä?á»?nh má»?t hoặc nhiá»?u cá»?ng Ä?á»?  firewall của bạn cho phép bạn kết ná»?i."
 
 msgctxt "NetworkPage"
 msgid "'%1' is not a valid port number."
@@ -2570,9 +2573,7 @@ msgstr "'% 1' không phải là m�t s� c�ng hợp l�."
 
 msgctxt "NetworkPage"
 msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Kiá»?m tra nếu mạng Ä?iÌ£a phÆ°Æ¡ng của bạn yêu cầu má»?t máy ủy quyá»?n proxy Ä?á»? truy"
-" cập  Liên mạng"
+msgstr "Kiá»?m tra nếu mạng Ä?iÌ£a phÆ°Æ¡ng của bạn yêu cầu má»?t máy ủy quyá»?n proxy Ä?á»? truy cập  Liên mạng"
 
 msgctxt "NetworkPage"
 msgid "I use a proxy to access the Internet"
@@ -2596,9 +2597,7 @@ msgstr "Cá»?ng:"
 
 msgctxt "NetworkPage"
 msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kiá»?m tra chá»? kết ná»?i vá»?i những tiếp sức sá»­ dụng cá»?ng Ä?ược cho phép bá»?i tÆ°á»?ng"
-" lửa của bạn"
+msgstr "Kiá»?m tra chá»? kết ná»?i vá»?i những tiếp sức sá»­ dụng cá»?ng Ä?ược cho phép bá»?i tÆ°á»?ng lá»­a của bạn"
 
 msgctxt "NetworkPage"
 msgid "My firewall only lets me connect to certain ports"
@@ -2620,9 +2619,7 @@ msgctxt "NetworkPage"
 msgid ""
 "Check to encrypt directory requests and, optionally, use bridge relays to "
 "access the Tor network"
-msgstr ""
-"Kiá»?m tra Ä?á»? mã hóa các yêu cầu thÆ° mục và, mo^.t ca'ch tùy chá»?n, sá»­ dụng "
-"những tiếp sức cầu Ä?á»? truy cập vào mạng Tor"
+msgstr "Kiá»?m tra Ä?á»? mã hóa các yêu cầu thÆ° mục và, mo^.t ca'ch tùy chá»?n, sá»­ dụng những tiếp sức cầu Ä?á»? truy cập vào mạng Tor"
 
 msgctxt "NetworkPage"
 msgid "My ISP blocks connections to the Tor network"
@@ -2687,11 +2684,11 @@ msgid "SOCKS 5"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "HTTP / HTTPS"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "You must specify one or more bridges."
 msgstr ""
 
 msgctxt "Policy"
@@ -2850,17 +2847,13 @@ msgctxt "ServerPage"
 msgid ""
 "You have configured Tor to act as a bridge relay for censored users, but "
 "your version of Tor does not support bridges."
-msgstr ""
-"Bạn Ä?ã cấu hình Tor Ä?á»? hoạt Ä?á»?ng nhÆ° má»?t cầu ná»?i tiếp sức cho ngÆ°á»?i sá»­ dụng "
-"ki�m duy�t, nhưng phiên bản Tor của bạn không h� trợ cầu."
+msgstr "Bạn Ä?ã cấu hình Tor Ä?á»? hoạt Ä?á»?ng nhÆ° má»?t cầu ná»?i tiếp sức cho ngÆ°á»?i sá»­ dụng kiá»?m duyá»?t, nhÆ°ng phiên bản Tor của bạn không há»? trợ cầu."
 
 msgctxt "ServerPage"
 msgid ""
 "Please upgrade your Tor software or configure Tor to act as a normal Tor "
 "relay."
-msgstr ""
-"Xin vui lòng nâng cấp phần má»?m Tor của bạn hoặc cấu hình Tor Ä?á»? hành Ä?á»?ng "
-"như là m�t Tor tiếp sức bình thư�ng."
+msgstr "Xin vui lòng nâng cấp phần má»?m Tor của bạn hoặc cấu hình Tor Ä?á»? hành Ä?á»?ng nhÆ° là má»?t Tor tiếp sức bình thÆ°á»?ng."
 
 msgctxt "ServerPage"
 msgid "Your bridge relay is not running."
@@ -2875,10 +2868,6 @@ msgid "Run as a client only"
 msgstr "Chạy chi? như m�t khách hàng"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tiếp sức giao thông cho mạng Tor"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "C�ng tiếp sức:"
 
@@ -2916,9 +2905,7 @@ msgstr "Tên tiếp sức của bạn"
 
 msgctxt "ServerPage"
 msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"C�ng mà ngư�i sử dụng và những chuy�n tiếp khác có th� giao tiếp v�i tiếp "
-"sức của bạn"
+msgstr "C�ng mà ngư�i sử dụng và những chuy�n tiếp khác có th� giao tiếp v�i tiếp sức của bạn"
 
 msgctxt "ServerPage"
 msgid "Nickname:"
@@ -2932,9 +2919,7 @@ msgctxt "ServerPage"
 msgid ""
 "For Internet connections with fast download speed but slow upload, please "
 "list your upload speed here."
-msgstr ""
-"Cho các kết ná»?i Liên mạng vá»?i tá»?c Ä?á»? tải xuá»?ng nhanh, nhÆ°ng nạp lên chậm, "
-"xin ghi vào danh sách tá»?c Ä?á»? nạp lên của bạn á»? Ä?ây."
+msgstr "Cho các kết ná»?i Liên mạng vá»?i tá»?c Ä?á»? tải xuá»?ng nhanh, nhÆ°ng nạp lên chậm, xin ghi vào danh sách tá»?c Ä?á»? nạp lên của bạn á»? Ä?ây."
 
 msgctxt "ServerPage"
 msgid "Cable/DSL 256 Kbps"
@@ -2992,9 +2977,7 @@ msgctxt "ServerPage"
 msgid ""
 "Your maximum bandwidth rate must be greater than or equal to your average "
 "bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Tá»· lá»? bÄ?ng thông tá»?i Ä?a của bạn phải lá»?n hÆ¡n hoặc bằng mức bÄ?ng thông trung "
-"bình của bạn. Cả hai giá tr� phải có ít nhất 20 kB / s."
+msgstr "Tá»· lá»? bÄ?ng thông tá»?i Ä?a của bạn phải lá»?n hÆ¡n hoặc bằng mức bÄ?ng thông trung bình của bạn. Cả hai giá trá»? phải có ít nhất 20 kB / s."
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
@@ -3055,17 +3038,13 @@ msgstr "Hiá»?n thá»? chủ Ä?á»? vá»? các chính sách trợ giúp thoát"
 msgctxt "ServerPage"
 msgid ""
 "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"NgÆ°á»?i sá»­ dụng những nguôÍ?n nÄ?ng lÆ°Ì£c Liên mạng gì sẽ có thá»? truy nhập từ "
-"tiếp sức của bạn?"
+msgstr "NgÆ°á»?i sá»­ dụng những nguôÍ?n nÄ?ng lÆ°Ì£c Liên mạng gì sẽ có thá»? truy nhập từ tiếp sức của bạn?"
 
 msgctxt "ServerPage"
 msgid ""
 "Tor will still block some outgoing mail and file sharing applications by "
 "default to reduce spam and other abuse."
-msgstr ""
-"Tor vẫn sẽ chặn má»?t sá»? thÆ° gá»­i Ä?i và chia sẻ tập tin ứng dụng mặc Ä?á»?nh Ä?á»? "
-"giảm thư rác và lạm dụng khác."
+msgstr "Tor vẫn sẽ chặn má»?t sá»? thÆ° gá»­i Ä?i và chia sẻ tập tin ứng dụng mặc Ä?á»?nh Ä?á»? giảm thÆ° rác và lạm dụng khác."
 
 msgctxt "ServerPage"
 msgid "Exit Policies"
@@ -3073,15 +3052,12 @@ msgstr "Chính sách xuất cảnh"
 
 msgctxt "ServerPage"
 msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Hãy Ä?á»? những ngÆ°á»?i khác tiếp cận cầu của bạn bằng cách cho há»? dòng này:"
+msgstr "Hãy Ä?á»? những ngÆ°á»?i khác tiếp cận cầu của bạn bằng cách cho há»? dòng này:"
 
 msgctxt "ServerPage"
 msgid ""
 "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Ä?ây là danh tính của cầu tiếp sức của bạn mà bạn có thá»? cung cấp cho ngÆ°á»?i "
-"khác"
+msgstr "Ä?ây là danh tính của cầu tiếp sức của bạn mà bạn có thá»? cung cấp cho ngÆ°á»?i khác"
 
 msgctxt "ServerPage"
 msgid "Copy your bridge relay's identity to the clipboard"
@@ -3136,6 +3112,14 @@ msgid "Automatically distribute my bridge address"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
@@ -3153,9 +3137,7 @@ 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."
+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"
@@ -3223,9 +3205,7 @@ msgstr "Sao laÌ£i Ä?á»?a chá»? onion của dá»?ch vụ Ä?ược chá»?n vào bá»?
 
 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"
+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 "ServicePage"
 msgid "Created by Tor"
@@ -3718,14 +3698,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"
@@ -3819,6 +3791,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 ""
 
@@ -3868,5 +3844,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/wa/qt_wa.po b/src/vidalia/i18n/po/wa/qt_wa.po
index a1a50ff..8257c11 100644
--- a/src/vidalia/i18n/po/wa/qt_wa.po
+++ b/src/vidalia/i18n/po/wa/qt_wa.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/wa/vidalia_wa.po b/src/vidalia/i18n/po/wa/vidalia_wa.po
index 22b0f4e..1036dbb 100644
--- a/src/vidalia/i18n/po/wa/vidalia_wa.po
+++ b/src/vidalia/i18n/po/wa/vidalia_wa.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: wa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/wo/qt_wo.po b/src/vidalia/i18n/po/wo/qt_wo.po
index 59d4df4..88893b5 100644
--- a/src/vidalia/i18n/po/wo/qt_wo.po
+++ b/src/vidalia/i18n/po/wo/qt_wo.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/wo/vidalia_wo.po b/src/vidalia/i18n/po/wo/vidalia_wo.po
index 22b0f4e..5118413 100644
--- a/src/vidalia/i18n/po/wo/vidalia_wo.po
+++ b/src/vidalia/i18n/po/wo/vidalia_wo.po
@@ -1,15 +1,18 @@
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +35,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr ""
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr ""
 
 msgctxt "AdvancedPage"
@@ -93,10 +81,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +137,68 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +440,9 @@ msgid "Remember my password"
 msgstr ""
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -1111,6 +1158,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1257,55 @@ msgctxt "CountryInfo"
 msgid "Taiwan"
 msgstr ""
 
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1323,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr ""
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1519,10 @@ msgid "Opening External Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1534,9 @@ msgid "Unable to Open Link"
 msgstr ""
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1579,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr ""
@@ -1691,7 +1816,9 @@ msgid "Error Starting Tor"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1727,7 +1854,9 @@ msgid "Cookie Authentication Required"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1876,9 @@ msgid "Error Registering for Events"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1898,9 @@ msgid "Tor Update Available"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1775,7 +1908,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1867,15 +2002,21 @@ msgid "Password Reset Failed"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2024,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2038,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2056,52 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-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?"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Bootstrapping torrc from %1 to %2"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Home"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2345,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2357,56 @@ msgid "Automatically save new log messages to a file"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2369,11 +2528,15 @@ msgid "Copy (Ctrl+C)"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2393,18 +2556,10 @@ msgid "Proxy Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr ""
 
@@ -2433,7 +2588,9 @@ msgid "80, 443"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2602,10 @@ msgid "Bridge Settings"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr ""
 
@@ -2477,13 +2626,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr ""
@@ -2637,11 +2816,15 @@ msgid "Bridge Support Unavailable"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2709,7 +2892,9 @@ msgid "Basic Settings"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2765,7 +2950,9 @@ msgid "Peak bandwidth rate limit"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2825,11 +3012,14 @@ msgid "Show help topic on exit policies"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2841,7 +3031,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3048,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3062,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3080,20 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr ""
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3102,9 @@ 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."
+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"
@@ -2973,6 +3179,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr ""
@@ -3025,6 +3476,68 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr ""
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr ""
@@ -3082,11 +3595,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3759,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 ""
 
@@ -3254,7 +3775,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,3 +3812,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po b/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po
index ce8a3aa..2b5509a 100644
--- a/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po
+++ b/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 # John  <dragonandghost@xxxxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-09-25 13:55+0000\n"
-"Last-Translator: killdragonno1 <dragonandghost@xxxxxxxxx>\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"Last-Translator: John <dragonandghost@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -210,9 +210,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"æ??件 %1 没æ??æ?¾å?°ã??\n"
-"请核å®?å·²ç»?å®?正确æ??件å??ã??"
+msgstr "æ??件 %1 没æ??æ?¾å?°ã??\n请核å®?å·²ç»?å®?正确æ??件å??ã??"
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -270,18 +268,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"ç?®å½?%1 没æ??æ?¾å?°ã??\n"
-"请核å®?å·²ç»?å®?正确ç?®å½?å??ã??"
+msgstr "ç?®å½?%1 没æ??æ?¾å?°ã??\n请核å®?å·²ç»?å®?正确ç?®å½?å??ã??"
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"â??%1â?? å?ªè¯»ã??\n"
-"你��������"
+msgstr "â??%1â?? å?ªè¯»ã??\nä½ è¿?æ?¯æ?³å? é?¤å®?ä¹?ï¼?"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -439,5 +433,3 @@ msgstr "%1å??å­?è??"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1å­?è??"
-
-
diff --git a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
index 861920d..4eebe23 100644
--- a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
+++ b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
@@ -7,9 +7,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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-12-02 13:11+0000\n"
-"Last-Translator: szescxz <szescxz@xxxxxxx>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: Kevin Chen <szescxz@xxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -201,13 +201,17 @@ 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"
-"ä½ é??è¦?æ??å·¥å°?å?¶å? é?¤ã??"
+msgstr "Vidalia æ? æ³?å? é?¤ Tor æ??å?¡ã??\n\nä½ é??è¦?æ??å·¥å°?å?¶å? é?¤ã??"
 
 msgctxt "AppearancePage"
 msgid "Language"
@@ -229,6 +233,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia æ? æ³?è½½å?¥é??中ç??语è¨?ã??"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "起���:"
@@ -1297,9 +1318,7 @@ 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>"
+msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\";>https://trac.torproject.org/projects/tor/newticket</a>"
 
 msgctxt "CrashReportDialog"
 msgid ""
@@ -1756,10 +1775,6 @@ msgid "Connected to the Tor network!"
 msgstr "Tor ��已����"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr "æ?ªç?¥ç??å?¯å?¨ç?¶æ??"
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "æ??项"
 
@@ -2071,54 +2086,61 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "失败�%1�"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "(probably Telnet)"
 msgstr ""
-"æ­£å?¨å?³é?­æ?¨ç??中继æ??å?¡ã??\n"
-"å??次å??å?»'å??æ­¢'ç«?å?»å?³é?­ä¸­ç»§ã??"
 
 msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
 msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
-"æ?¨ç?®å??æ­£å?¨è¿?è¡?中继æ??å?¡ã??中æ?­ä¸­ç»§å°?æ??å¤?中æ?­å?¶ä¸?å??客æ?·ç«¯é?´ç??è¿?æ?¥ã??\n"
-"\n"
-"æ?¨æ?¯å?¦æ?³å»¶è¿?å?³é?­ä»¥ä¾¿ç»?ä¸?æ?¨ç??客æ?·ç«¯æ?¶é?´è½¬ç§»è?³æ?°ç??中继ï¼?"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "失败�%1�"
 
 msgctxt "MainWindow"
 msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "æ­£å?¨å?³é?­æ?¨ç??中继æ??å?¡ã??\nå??次å??å?»'å??æ­¢'ç«?å?»å?³é?­ä¸­ç»§ã??"
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
 "\n"
-"Please check the message log for recent warning or error messages."
+"Here's the last error message:\n"
+"%2"
 msgstr ""
-"Vidaliaæ£?æµ?å?°Tor软件æ??å¤?é??å?ºã??\n"
-"\n"
-"请æ£?æ?¥æ¶?æ?¯æ?¥å¿?è?·å??æ??è¿?ç??è­¦å??å??é??误信æ?¯ã??"
 
 msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ""
+"It seems Tor has stopped running since Vidalia started it.\n"
+"\n"
+"See the Advanced Message Log for more information."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "æ?¨ç?®å??æ­£å?¨è¿?è¡?中继æ??å?¡ã??中æ?­ä¸­ç»§å°?æ??å¤?中æ?­å?¶ä¸?å??客æ?·ç«¯é?´ç??è¿?æ?¥ã??\n\næ?¨æ?¯å?¦æ?³å»¶è¿?å?³é?­ä»¥ä¾¿ç»?ä¸?æ?¨ç??客æ?·ç«¯æ?¶é?´è½¬ç§»è?³æ?°ç??中继ï¼?"
 
 msgctxt "MainWindow"
 msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr "Vidaliaæ£?æµ?å?°Tor软件æ??å¤?é??å?ºã??\n\n请æ£?æ?¥æ¶?æ?¯æ?¥å¿?è?·å??æ??è¿?ç??è­¦å??å??é??误信æ?¯ã??"
 
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
@@ -2406,9 +2428,7 @@ msgid ""
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
-msgstr ""
-"此类���Tor�������\n"
-"并é??é??误ä½?å?¯è?½é??è¦?å?³æ³¨ã??"
+msgstr "此类æ¶?æ?¯å?¨Torè¿?è¡?æ?¶å?¶å°?å?ºç?°\n并é??é??误ä½?å?¯è?½é??è¦?å?³æ³¨ã??"
 
 msgctxt "MessageLog"
 msgid ""
@@ -2427,10 +2447,7 @@ msgid ""
 "Cannot write file %1\n"
 "\n"
 "%2."
-msgstr ""
-"æ? æ³?å??å?¥æ??件%1\n"
-"\n"
-"%2ã??"
+msgstr "æ? æ³?å??å?¥æ??件%1\n\n%2ã??"
 
 msgctxt "NetViewer"
 msgid "Tor Network Map"
@@ -2537,14 +2554,6 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "æ? æ??ç½?æ¡¥"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "æ??å®?ç½?æ¡¥è¯?å?«æ? æ??"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "��(Ctrl+C)"
 
@@ -2677,13 +2686,13 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
 msgid "HTTP / HTTPS"
 msgstr "HTTP / HTTPS"
 
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "æ?¥å??"
@@ -2861,10 +2870,6 @@ msgid "Run as a client only"
 msgstr "ä»?è¿?è¡?客æ?·ç«¯å??è?½"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor ��中继"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "中继端�:"
 
@@ -3006,9 +3011,7 @@ msgstr "å?¶å®?æ??å?¡"
 
 msgctxt "ServerPage"
 msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"端å?£è??å?´: 706,1863,5050,5190,5222,8300 å?? 8888 {706, 1863, 5050, 5190, 5222, "
-"5223, 8300 ?}"
+msgstr "端å?£è??å?´: 706,1863,5050,5190,5222,8300 å?? 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
 
 msgctxt "ServerPage"
 msgid "Instant Messaging (IM)"
@@ -3111,6 +3114,14 @@ msgid "Automatically distribute my bridge address"
 msgstr "è?ªå?¨å??å¸?æ??ç??ç½?æ¡¥å?°å??"
 
 msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr "é??å??中继ç?®å½?"
 
@@ -3118,9 +3129,7 @@ msgctxt "ServerPage"
 msgid ""
 "Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"中继æ??é??æ?¶è??ç³»æ?¨ç??Emailå?°å??\n"
-"æ?¨è¿?å?¯ä»¥å??æ?¶æ??ä¾?æ?¨ç??PGP/GPGæ??纹ã??"
+msgstr "中继æ??é??æ?¶è??ç³»æ?¨ç??Emailå?°å??\næ?¨è¿?å?¯ä»¥å??æ?¶æ??ä¾?æ?¨ç??PGP/GPGæ??纹ã??"
 
 msgctxt "ServicePage"
 msgid "Error while trying to unpublish all services"
@@ -3225,8 +3234,7 @@ msgid ""
 "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
 "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
 "details about any errors encountered."
-msgstr ""
-"å??å?»ä½?äº? Vidalia æ?§å?¶é?¢æ?¿ç??â??å?¯å?¨ Torâ??以é??å?¯ Tor 软件ã??å¦?æ?? Tor æ??å¤?é??å?ºï¼?é??中顶端ç??â??é«?级â??é??项å?¡ä»¥æ?¥ç??æ??é??å?°ç??é??误ç??ä¿¡æ?¯ã??"
+msgstr "å??å?»ä½?äº? Vidalia æ?§å?¶é?¢æ?¿ç??â??å?¯å?¨ Torâ??以é??å?¯ Tor 软件ã??å¦?æ?? Tor æ??å¤?é??å?ºï¼?é??中顶端ç??â??é«?级â??é??项å?¡ä»¥æ?¥ç??æ??é??å?°ç??é??误ç??ä¿¡æ?¯ã??"
 
 msgctxt "StatusEventWidget"
 msgid ""
@@ -3242,8 +3250,7 @@ msgid ""
 "longer work with the current Tor network. Please upgrade to the most recent "
 "version of the software, which may contain important security, reliability "
 "and performance fixes."
-msgstr ""
-"æ?¨æ­£å?¨è¿?è¡?ç??æ?¬ä¸º %1 ç?? Tor 软件ï¼?ä¸?æ­¤ç??æ?¬å·²ä¸?å??æ?¯æ??ç?°å?¨ç?? Tor ç½?ç»?ã??请å??级å?°æ??æ?°ç??ç??æ?¬ï¼?å®?å?¯ä»¥æ??å??é??è¦?ç??å®?å?¨æ?§ã??å?¯é? æ?§ä¸?æ?§è?½ã??"
+msgstr "æ?¨æ­£å?¨è¿?è¡?ç??æ?¬ä¸º %1 ç?? Tor 软件ï¼?ä¸?æ­¤ç??æ?¬å·²ä¸?å??æ?¯æ??ç?°å?¨ç?? Tor ç½?ç»?ã??请å??级å?°æ??æ?°ç??ç??æ?¬ï¼?å®?å?¯ä»¥æ??å??é??è¦?ç??å®?å?¨æ?§ã??å?¯é? æ?§ä¸?æ?§è?½ã??"
 
 msgctxt "StatusEventWidget"
 msgid "Your Tor Software is Out-of-date"
@@ -3806,10 +3813,7 @@ msgid ""
 "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
-msgstr ""
-"ä¼¼ä¹?å?¦ä¸?个Vidaliaè¿?ç¨?å·²ç»?è¿?è¡?ã??å¦?æ??没æ??å?¶ä»?ç??Vidaliaè¿?ç¨?è¿?è¡?ï¼?æ?¨å?¯ä»¥é??æ?©ç»§ç»­ã??\n"
-"\n"
-"æ?¨è¦?å?¯å?¨Vidaliaå???"
+msgstr "ä¼¼ä¹?å?¦ä¸?个Vidaliaè¿?ç¨?å·²ç»?è¿?è¡?ã??å¦?æ??没æ??å?¶ä»?ç??Vidaliaè¿?ç¨?è¿?è¡?ï¼?æ?¨å?¯ä»¥é??æ?©ç»§ç»­ã??\n\næ?¨è¦?å?¯å?¨Vidaliaå???"
 
 msgctxt "stringutil.h"
 msgid "%1 secs"
@@ -3842,5 +3846,3 @@ msgstr "%1 å°?æ?¶"
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr "%1 å??"
-
-
diff --git a/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po b/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po
index d9a1ae8..809b8b4 100644
--- a/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po
+++ b/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
index 093bf99..b52b4e0 100755
--- a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
+++ b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po b/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po
index 888f88c..854ecd9 100644
--- a/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po
+++ b/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po
@@ -1,4 +1,4 @@
-# 
+# Translators:
 # Translators:
 #   <random3098@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-01-18 02:48+0000\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
 "Last-Translator: whyme <random3098@xxxxxxxxx>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -203,9 +203,7 @@ msgctxt "QFileDialog"
 msgid ""
 "%1 already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"%1 å·²ç¶?å­?å?¨ã??\n"
-"ä½ è¦?å??代å??ä¾?ç??å???"
+msgstr "%1 å·²ç¶?å­?å?¨ã??\nä½ è¦?å??代å??ä¾?ç??å???"
 
 #: qfiledialog.cpp:1690
 msgctxt "QFileDialog"
@@ -213,10 +211,7 @@ msgid ""
 "%1\n"
 "File not found.\n"
 "Please verify the correct file name was given."
-msgstr ""
-"%1\n"
-"æª?æ¡?ä¸?å­?å?¨ã??\n"
-"è«?確èª?æª?å??ç?¡èª¤ã??"
+msgstr "%1\næª?æ¡?ä¸?å­?å?¨ã??\nè«?確èª?æª?å??ç?¡èª¤ã??"
 
 #: qdirmodel.cpp:833
 msgctxt "QFileDialog"
@@ -274,19 +269,14 @@ msgid ""
 "%1\n"
 "Directory not found.\n"
 "Please verify the correct directory name was given."
-msgstr ""
-"%1\n"
-"æ?¾ä¸?å?°ç?®é??ã??\n"
-"è«?確èª?æ?¨è¼¸å?¥æ­£ç¢ºç??ç?®é??å??ã??"
+msgstr "%1\næ?¾ä¸?å?°ç?®é??ã??\nè«?確èª?æ?¨è¼¸å?¥æ­£ç¢ºç??ç?®é??å??ã??"
 
 #: qfiledialog.cpp:2281
 msgctxt "QFileDialog"
 msgid ""
 "'%1' is write protected.\n"
 "Do you want to delete it anyway?"
-msgstr ""
-"%1' æ??é?²å¯«ä¿?è­·ã??\n"
-"æ?¨ä»?è??è¦?å?ªé?¤å®?å???"
+msgstr "%1' æ??é?²å¯«ä¿?è­·ã??\næ?¨ä»?è??è¦?å?ªé?¤å®?å???"
 
 #: qfiledialog.cpp:2286
 msgctxt "QFileDialog"
@@ -444,5 +434,3 @@ msgstr "%1 KB"
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr "%1 ä½?å??çµ?"
-
-
diff --git a/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po b/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po
index bf8de77..f2632c7 100644
--- a/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po
+++ b/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po
@@ -1,15 +1,20 @@
+# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# tylerlin <msn@xxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-05-19 23:56+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: tylerlin <msn@xxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Vidalia ts2po 0.2\n"
 
 msgctxt "AboutDialog"
@@ -32,28 +37,13 @@ msgctxt "AboutDialog"
 msgid "Qt 4.4.2"
 msgstr "4.4.2"
 
-msgctxt "AboutDialog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-msgctxt "AboutDialog"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "AboutDialog"
-msgid "Qt"
-msgstr ""
-
-msgctxt "AboutDialog"
-msgid "version"
-msgstr ""
-
 msgctxt "AdvancedPage"
 msgid "'%1' is not a valid IP address."
 msgstr "'%1' 並é??æ??æ?? IP å?°å??."
 
 msgctxt "AdvancedPage"
-msgid "You selected 'Password' authentication, but did not specify a password."
+msgid ""
+"You selected 'Password' authentication, but did not specify a password."
 msgstr "ä½ é?¸æ??äº? 'å¯?碼' é©?è­?æ?¹å¼?,ä½?æ?¯ä½ ä¸¦æ?ªæ??å®?å¯?碼ã??"
 
 msgctxt "AdvancedPage"
@@ -93,10 +83,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr "Vidalia ç?¡æ³?å®?è£? Tor æ??å??ã??"
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr "�����"
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr "é©?è­?:"
 
@@ -153,7 +139,75 @@ msgid "Select the directory used to store data for the Tor software"
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Vidalia was unable to remove the Tor service.\n"
+msgid "Tor Control"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use TCP connection (ControlPort)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Path:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Use Unix domain socket (ControlSocket)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Edit current torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "NOTE: this will edit the currently loaded torrc"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "ControlSocket path doesn't exist."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor configuration file location contains characters that "
+"cannot be represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ""
+"The specified Tor data directory location contains characters that cannot be"
+" represented in your system's current 8-bit character encoding."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Warning"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "You changed torrc path, would you like to restart Tor?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a file to use for Tor socket path"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+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 ""
@@ -178,6 +232,23 @@ msgctxt "AppearancePage"
 msgid "Vidalia was unable to load the selected language translation."
 msgstr "Vidalia ç?¡æ³?è¼?å?¥æ??å®?ç??èª?è¨?ã??"
 
+msgctxt "AppearancePage"
+msgid ""
+"System Icon Preferences (changes will take effect when you restart Vidalia)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Show the Tray Icon and Dock Icon (default)"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Tray Icon"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Hide the Dock Icon"
+msgstr ""
+
 msgctxt "BandwidthGraph"
 msgid "Since:"
 msgstr "èµ·å§?æ??é??:"
@@ -395,7 +466,9 @@ msgid "Remember my password"
 msgstr "è¨?ä½?æ??輸å?¥ç??å¯?碼"
 
 msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
 msgstr ""
 
 msgctxt "ControlSocket"
@@ -536,7 +609,7 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "China"
-msgstr ""
+msgstr "中å??"
 
 msgctxt "CountryInfo"
 msgid "Colombia"
@@ -844,7 +917,7 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Norway"
-msgstr "å¾?å¾?"
+msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Oman"
@@ -888,7 +961,7 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Portugal"
-msgstr "���:"
+msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Qatar"
@@ -1111,6 +1184,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1204,6 +1281,55 @@ msgstr ""
 
 msgctxt "CountryInfo"
 msgid "Taiwan"
+msgstr "å?°ç?£"
+
+msgctxt "CrashReportDialog"
+msgid "Submit a Crash Report"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Vidalia encountered an error and needed to close"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+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 "GeneralPage"
@@ -1223,10 +1349,6 @@ msgid "You must specify the name of your Tor executable."
 msgstr "ä½ å¿?é ?ç?ºä½ ç?? Tor å?·è¡?æª?å?½å??"
 
 msgctxt "GeneralPage"
-msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
-
-msgctxt "GeneralPage"
 msgid "Start Vidalia when my system starts"
 msgstr ""
 
@@ -1423,7 +1545,10 @@ msgid "Opening External Link"
 msgstr "æ­£å?¨é??å??å¤?é?¨é?£çµ?"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgid ""
+"Vidalia can open the link you selected in your default Web browser. If your "
+"browser is not currently configured to use Tor then the request will not be "
+"anonymous."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1435,7 +1560,9 @@ msgid "Unable to Open Link"
 msgstr "ç?¡æ³?é??å??é?£çµ?"
 
 msgctxt "HelpTextBrowser"
-msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
 msgstr ""
 
 msgctxt "HelpTextBrowser"
@@ -1478,6 +1605,30 @@ msgctxt "LogEvent"
 msgid "Unknown"
 msgstr "��"
 
+msgctxt "LogTreeItem"
+msgid "Debug"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Info"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Notice"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Warning"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Error"
+msgstr ""
+
+msgctxt "LogTreeItem"
+msgid "Unknown"
+msgstr ""
+
 msgctxt "MainWindow"
 msgid "Start Tor"
 msgstr "å??å?? Tor"
@@ -1623,10 +1774,6 @@ msgid "Connected to the Tor network!"
 msgstr "已��� Tor 網路!"
 
 msgctxt "MainWindow"
-msgid "Unrecognized startup status"
-msgstr ""
-
-msgctxt "MainWindow"
 msgid "miscellaneous"
 msgstr "é??é ?"
 
@@ -1691,7 +1838,9 @@ msgid "Error Starting Tor"
 msgstr "å??å?? Tor æ??ç?¼ç??é?¯èª¤"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgid ""
+"Vidalia was unable to start Tor. Check your settings to ensure the correct "
+"name and location of your Tor executable is specified."
 msgstr "Vidalia ç?¡æ³?å??å?? Tor.è«?檢æ?¥ Tor å?¯å?·è¡?ç¨?åº?ç??è·¯å¾?以å??設å®?æ?¯å?¦æ­£ç¢º."
 
 msgctxt "MainWindow"
@@ -1727,7 +1876,9 @@ msgid "Cookie Authentication Required"
 msgstr "é??è¦? Cookie é©?è­?"
 
 msgctxt "MainWindow"
-msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgid ""
+"The Tor software requires Vidalia to send the contents of an authentication "
+"cookie, but Vidalia was unable to find one."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1747,7 +1898,9 @@ msgid "Error Registering for Events"
 msgstr "äº?件è¨?é??é?¯èª¤"
 
 msgctxt "MainWindow"
-msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgid ""
+"Vidalia was unable to register for some events. Many of Vidalia's features "
+"may be unavailable."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1767,7 +1920,9 @@ msgid "Tor Update Available"
 msgstr "Tor æ??æ?°ç??æ?¬"
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended. Please visit the Tor website to download the latest version."
 msgstr "ä½ ç?®å??å®?è£?ç??ç??æ?¬å·²é??æ??ï¼?æ??æ?¯å®?æ?¹ä¸?å??建議你使ç?¨ã??è«?å??訪 Tor ç??å®?網ï¼?ä¸?è¼?æ??æ?°ç??æ?¬ã??"
 
 msgctxt "MainWindow"
@@ -1775,7 +1930,9 @@ msgid "Tor website: %1"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "All subsequent connections will appear to be different than your old connections."
+msgid ""
+"All subsequent connections will appear to be different than your old "
+"connections."
 msgstr "æ??æ??æ?¥ä¸?ä¾?ç??é?£æ?¥å°?æ??ä¸?å??æ?¼ä¹?å??ç??é?£æ?¥."
 
 msgctxt "MainWindow"
@@ -1804,7 +1961,7 @@ msgstr "Vidalia 快���"
 
 msgctxt "MainWindow"
 msgid "Setup Relaying"
-msgstr "設置中繼æ??å??å?¨"
+msgstr "設置中繼æ??å??å?¨\n"
 
 msgctxt "MainWindow"
 msgid "Set up a relay and help the network grow"
@@ -1867,15 +2024,21 @@ msgid "Password Reset Failed"
 msgstr "é??設å¯?碼失æ??"
 
 msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
 msgstr "ä½ ç?®å??å®?è£?ç??ç??æ?¬å·²é??æ??ï¼?æ??æ?¯å®?æ?¹ä¸?å??建議你使ç?¨ã??è«?å??訪 Tor ç??å®?網ï¼?ä¸?è¼?æ??æ?°ç??æ?¬ã??"
 
 msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1883,11 +2046,9 @@ msgid "Potentially Unsafe Connection"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1899,7 +2060,9 @@ msgid "Your software is up to date"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
 msgctxt "MainWindow"
@@ -1915,52 +2078,67 @@ msgid "The following error occurred:"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "failed (%1)"
+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."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Bootstrapping torrc from %1 to %2"
 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?"
+msgid "(probably Telnet)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr "Vidalia"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
 
 msgctxt "MainWindow"
-msgid "File"
+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 "About Vidalia"
-msgstr "é??æ?¼ Vidalia"
+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 "Home"
-msgstr "主�"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
 
 msgctxt "MainWindow"
-msgid "Check For Updates"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -2204,10 +2382,6 @@ msgid "messages"
 msgstr "��"
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "總������"
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr "ç??覽"
 
@@ -2220,34 +2394,56 @@ msgid "Automatically save new log messages to a file"
 msgstr "è?ªå??ä¿?å­?æ?°ç??æ¶?æ?¯å?§å®¹è?³æ??件"
 
 msgctxt "MessageLog"
-msgid "Messages that appear when something has \n"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+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."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that only appear when \n"
+msgid ""
+"Messages that only appear when \n"
 "something has gone wrong with Tor."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear infrequently \n"
+msgid ""
+"Messages that appear infrequently \n"
 "during normal Tor operation and are \n"
 "not considered errors, but you may \n"
 "care about."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Messages that appear frequently \n"
+msgid ""
+"Messages that appear frequently \n"
 "during normal Tor operation."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of \n"
+msgid ""
+"Hyper-verbose messages primarily of \n"
 "interest to Tor developers."
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Cannot write file %1\n"
+msgid ""
+"Cannot write file %1\n"
 "\n"
 "%2."
 msgstr ""
@@ -2357,23 +2553,19 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 msgctxt "NetworkPage"
-msgid "Invalid Bridge"
-msgstr "ç?¡æ??網æ©?"
-
-msgctxt "NetworkPage"
-msgid "The specified bridge identifier is not valid."
-msgstr "æ??å®?網æ©?è­?å?¥ç?¡æ??"
-
-msgctxt "NetworkPage"
 msgid "Copy (Ctrl+C)"
 msgstr "�製(Ctrl+C)"
 
 msgctxt "NetworkPage"
-msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
 msgstr "ä½ å¿?é ?æ??å®? Tor ç?¨æ?¼è¨ªå??網絡ç?? IP å?°å??æ??主æ©?å??,以å??端å?£."
 
 msgctxt "NetworkPage"
-msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
 msgstr "ä½ å¿?é ?æ??å®?ä¸?å??æ??å¤?å??端å?£ç?¨æ?¼é?£æ?¥é?²ç?«ç??."
 
 msgctxt "NetworkPage"
@@ -2393,18 +2585,10 @@ msgid "Proxy Settings"
 msgstr "代ç??設å®?"
 
 msgctxt "NetworkPage"
-msgid "HTTP Proxy:"
-msgstr "HTTP 代ç??:"
-
-msgctxt "NetworkPage"
 msgid "Username:"
 msgstr "ç?¨æ?¶å??"
 
 msgctxt "NetworkPage"
-msgid "Use this proxy for HTTPS also"
-msgstr "å°?此代ç??å??樣æ??ç?¨æ?¼ HTTPS"
-
-msgctxt "NetworkPage"
 msgid "Password:"
 msgstr "�碼:"
 
@@ -2433,7 +2617,9 @@ msgid "80, 443"
 msgstr "80, 443"
 
 msgctxt "NetworkPage"
-msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
 msgstr ""
 
 msgctxt "NetworkPage"
@@ -2445,18 +2631,10 @@ msgid "Bridge Settings"
 msgstr "��設�"
 
 msgctxt "NetworkPage"
-msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
-msgstr ""
-
-msgctxt "NetworkPage"
 msgid "Add a Bridge:"
 msgstr "æ?°å¢?ä¸?å??æ©?æ?¥å?¨ï¼?"
 
 msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr "æ??è¦?å¦?ä½?æ?¾å?°æ©?æ?¥?"
-
-msgctxt "NetworkPage"
 msgid "Remove the selected bridges from the list"
 msgstr "å¾?å??表中移é?¤é?¸ä¸­ç??網æ©?"
 
@@ -2477,13 +2655,43 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
 msgstr ""
 
 msgctxt "NetworkPage"
-msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgid ""
+"No new bridges are currently available. You can either wait a while and try "
+"again, or try another method of finding new bridges."
 msgstr ""
 
 msgctxt "NetworkPage"
 msgid "Click Help to see other methods of finding new bridges."
 msgstr ""
 
+msgctxt "NetworkPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Type:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must select the proxy type."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 4"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "SOCKS 5"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP / HTTPS"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more bridges."
+msgstr ""
+
 msgctxt "Policy"
 msgid "accept"
 msgstr "æ?¥å??"
@@ -2637,11 +2845,15 @@ msgid "Bridge Support Unavailable"
 msgstr "網æ©?å??è?½ä¸?å?¯ç?¨"
 
 msgctxt "ServerPage"
-msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgid ""
+"You have configured Tor to act as a bridge relay for censored users, but "
+"your version of Tor does not support bridges."
 msgstr "ä½ å·²å°? Tor 設å®?ç?ºç¶²æ©?中繼æ??å??å?¨,ç?¶è??ä½ ç?? Tor ç??æ?¬ä¸¦ä¸?æ?¯æ??æ­¤å??è?½."
 
 msgctxt "ServerPage"
-msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgid ""
+"Please upgrade your Tor software or configure Tor to act as a normal Tor "
+"relay."
 msgstr "è«?å??ç´?ä½ ç?? Tor è»?件æ??è??å°? Tor 設å®?ç?ºæ?®é??中繼æ??å??å?¨."
 
 msgctxt "ServerPage"
@@ -2657,10 +2869,6 @@ msgid "Run as a client only"
 msgstr "æ??å?ªæ?³ç?¶ç?¨æ?¶ç«¯"
 
 msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor 網絡中繼"
-
-msgctxt "ServerPage"
 msgid "Relay Port:"
 msgstr "中繼���:"
 
@@ -2709,7 +2917,9 @@ msgid "Basic Settings"
 msgstr "��設�"
 
 msgctxt "ServerPage"
-msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgid ""
+"For Internet connections with fast download speed but slow upload, please "
+"list your upload speed here."
 msgstr "å¦?網絡é?£æ?¥ç??ä¸?è¡?é??ç??è¼?大,è??ä¸?è¡?é??度è¼?æ?¢,è«?é?¸æ??é?©ç?¨ç??網絡é?£æ?¥é¡?å??(主è¦?é?©ç?¨æ?¼ DSL ç?¨æ?¶)"
 
 msgctxt "ServerPage"
@@ -2765,12 +2975,14 @@ msgid "Peak bandwidth rate limit"
 msgstr "å³°å?¼å¸¶å¯¬é??ç??é??å?¶"
 
 msgctxt "ServerPage"
-msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgid ""
+"Your maximum bandwidth rate must be greater than or equal to your average "
+"bandwidth rate. Both values must be at least 20 KB/s."
 msgstr "ä½ ç??æ??大帶寬é??ç??å¿?é ?大æ?¼æ??ç­?æ?¼ä½ ç??å¹³å??帶寬é??ç??.å?©å??æ?¸å?¼å¿?é ?è?³å°? 20KB/s"
 
 msgctxt "ServerPage"
 msgid "Bandwidth Limits"
-msgstr "帶寬é??å?¶"
+msgstr "頻寬é??å?¶"
 
 msgctxt "ServerPage"
 msgid "Ports 6660 - 6669 and 6697"
@@ -2806,7 +3018,7 @@ msgstr "å?³æ??é??è¨?æ??å??(IM)"
 
 msgctxt "ServerPage"
 msgid "Port 443"
-msgstr "端�: 443"
+msgstr "��� 443"
 
 msgctxt "ServerPage"
 msgid "Secure Websites (SSL)"
@@ -2825,11 +3037,14 @@ msgid "Show help topic on exit policies"
 msgstr "顯示é??æ?¼æ??å??ç­?ç?¥ç??ç?¸é??幫å?©ä¸»é¡?"
 
 msgctxt "ServerPage"
-msgid "What Internet resources should users be able to access from your relay?"
+msgid ""
+"What Internet resources should users be able to access from your relay?"
 msgstr "ä½ è¦?è®?å?¶ä»?使ç?¨è??å¾?ä½ ç?? relay 使ç?¨ä½?種網路è³?æº??"
 
 msgctxt "ServerPage"
-msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
 msgstr "é ?設æ??æ³?ä¸?ï¼?Tor ä»?ç?¶æ??é?»æ??æ??äº?å¤?é??é?µä»¶è??æª?æ¡?å??享è»?é«?ï¼?以å??é?­å?°æ¿«ç?¨ã??"
 
 msgctxt "ServerPage"
@@ -2841,7 +3056,8 @@ msgid "Let others access your bridge by giving them this line:"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "This is the identity of your bridge relay that you can give to other people"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2857,7 +3073,9 @@ msgid "No clients have used your relay recently."
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2869,7 +3087,9 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
 msgstr "Vidalia ç?¡æ³?ä¿?å­?ä½ ç?? %1 設å®?."
 
 msgctxt "ServerPage"
-msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
 msgstr ""
 
 msgctxt "ServerPage"
@@ -2885,11 +3105,28 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
 msgstr "æ??è¦?å¦?ä½?æ?¾å?°æ©?æ?¥?"
 
 msgctxt "ServerPage"
+msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Automatically distribute my bridge address"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
 msgid "Mirror the Relay Directory"
 msgstr ""
 
 msgctxt "ServerPage"
-msgid "Email address at which you may be reached if there is a\n"
+msgid ""
+"Email address at which you may be reached if there is a\n"
 "problem with your relay. You might also include your PGP or GPG fingerprint."
 msgstr ""
 
@@ -2898,7 +3135,9 @@ 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."
+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"
@@ -2973,6 +3212,251 @@ msgctxt "ServicePage"
 msgid "Created by Tor"
 msgstr ""
 
+msgctxt "StatusEventWidget"
+msgid "Copy to Clipboard"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "You are currently running version \"%1\" of the Tor software."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "The Tor Software is not Running"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
+"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
+"details about any errors encountered."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which is no "
+"longer recommended. Please upgrade to the most recent version of the "
+"software, which may contain important security, reliability and performance "
+"fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"You are currently running version \"%1\" of the Tor software, which may no "
+"longer work with the current Tor network. Please upgrade to the most recent "
+"version of the software, which may contain important security, reliability "
+"and performance fixes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Tor Software is Out-of-date"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Connected to the Tor Network"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"We were able to successfully establish a connection to the Tor network. You "
+"can now configure your applications to use the Internet anonymously."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Tor Software Error"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"The Tor software encountered an internal bug. Please report the following "
+"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the past compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined that your computer's clock may be set to %1 seconds in "
+"the future compared to the source \"%2\". If your clock is not correct, Tor "
+"will not be able to function. Please verify your computer displays the "
+"correct time."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Potentially Dangerous Connection!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications established a connection through Tor to \"%1\" "
+"using a protocol that may leak information about your destination. Please "
+"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
+"remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Unknown SOCKS Protocol"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor using a"
+" protocol that Tor does not understand. Please ensure you configure your "
+"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Invalid Destination Hostname"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"One of your applications tried to establish a connection through Tor to "
+"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
+"application's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "External IP Address Changed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor has determined your relay's public IP address is currently %1%2. If that"
+" is not correct, please consider setting the 'Address' option in your "
+"relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "DNS Hijacking Detected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for domains"
+" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
+"known to do this in order to display their own search or advertising pages."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor detected that your DNS provider is providing false responses for well "
+"known domains. Since clients rely on Tor network relays to provide accurate "
+"DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Server Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's server port is reachable from the"
+" Tor network by connecting to itself at %1:%2. This test could take several "
+"minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's server port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Server Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's server port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and server port, "
+"please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Checking Directory Port Reachability"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Tor is trying to determine if your relay's directory port is reachable from "
+"the Tor network by connecting to itself at %1:%2. This test could take "
+"several minutes."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Successful!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Directory Port Reachability Test Failed"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's directory port is not reachable by other Tor clients. This can "
+"happen if you are behind a router or firewall that requires you to set up "
+"port forwarding. If %1:%2 is not your correct IP address and directory port,"
+" please check your relay's configuration."
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Relay Descriptor Rejected"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay's descriptor, which enables clients to connect to your relay, was"
+" rejected by the directory server at %1:%2. The reason given was: %3"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid "Your Relay is Online"
+msgstr ""
+
+msgctxt "StatusEventWidget"
+msgid ""
+"Your relay is now online and available for Tor clients to use. You should "
+"see an increase in network traffic shown by the Bandwidth Graph within a few"
+" hours as more clients learn about your relay. Thank you for contributing to"
+" the Tor network!"
+msgstr ""
+
 msgctxt "Stream"
 msgid "New"
 msgstr "�建"
@@ -3025,13 +3509,75 @@ msgctxt "TorSettings"
 msgid "Failed to hash the control password."
 msgstr "ç?¡æ³?å??細主å¯?碼ã??"
 
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Paste"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Undo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Redo"
+msgstr ""
+
+msgctxt "TorrcDialog"
+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 ""
+
+msgctxt "TorrcDialog"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
+
 msgctxt "UPNPControl"
 msgid "Success"
 msgstr "æ??å??"
 
 msgctxt "UPNPControl"
 msgid "No UPnP-enabled devices found"
-msgstr "æ²?æ?¾å?°å??ç?¨ UPnPç??è£?ç½®"
+msgstr "æ²?æ?¾å?°ä½¿ç?¨ UPnP ç??è£?ç½®"
 
 msgctxt "UPNPControl"
 msgid "No valid UPnP-enabled Internet gateway devices found"
@@ -3059,7 +3605,7 @@ msgstr "æ?ªç?¥ç??é?¯èª¤"
 
 msgctxt "UPNPTestDialog"
 msgid "Discovering UPnP-enabled devices"
-msgstr "æ­£å?¨å°?æ?¾å??ç?¨ UPnPç??è£?ç½®"
+msgstr "æ­£å?¨å°?æ?¾ä½¿ç?¨ UPnP ç??è£?ç½®"
 
 msgctxt "UPNPTestDialog"
 msgid "Updating directory port mapping"
@@ -3082,11 +3628,15 @@ msgid "Testing Universal Plug & Play Support"
 msgstr "正�測試 UPnP ����"
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgid ""
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
 msgstr ""
 
 msgctxt "UpdateProcess"
-msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgid ""
+"Vidalia was unable to check for available software updates because Tor's "
+"update process exited unexpectedly."
 msgstr ""
 
 msgctxt "UpdateProgressDialog"
@@ -3242,6 +3792,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 ""
 
@@ -3254,7 +3808,8 @@ msgid "Invalid log level specified:"
 msgstr ""
 
 msgctxt "Vidalia"
-msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid ""
+"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
 "\n"
 "Would you like to continue starting Vidalia?"
 msgstr ""
@@ -3290,4 +3845,3 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
-
diff --git a/src/vidalia/i18n/po/zu/qt_zu.po b/src/vidalia/i18n/po/zu/qt_zu.po
index da31ae8..aedebb9 100644
--- a/src/vidalia/i18n/po/zu/qt_zu.po
+++ b/src/vidalia/i18n/po/zu/qt_zu.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +431,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/zu/vidalia_zu.po b/src/vidalia/i18n/po/zu/vidalia_zu.po
index 2da7607..1d680ee 100644
--- a/src/vidalia/i18n/po/zu/vidalia_zu.po
+++ b/src/vidalia/i18n/po/zu/vidalia_zu.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-09-07 14:40+0000\n"
+"PO-Revision-Date: 2010-12-05 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
@@ -192,6 +193,10 @@ msgid "Select a file to use for Tor socket path"
 msgstr ""
 
 msgctxt "AdvancedPage"
+msgid "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
 msgid ""
 "Vidalia was unable to remove the Tor service.\n"
 "\n"
@@ -1261,24 +1266,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 ""
 
@@ -1296,16 +1283,27 @@ msgid ""
 "manually."
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Connecting..."
+msgctxt "CrashReportDialog"
+msgid "Please fill a ticket in:"
 msgstr ""
 
-msgctxt "CrashReportUploader"
-msgid "Sending crash report..."
+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..."
+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 "GeneralPage"
@@ -2059,12 +2057,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."
@@ -2081,6 +2073,10 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
+
+msgctxt "MainWindow"
 msgid ""
 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
 "\n"
@@ -2095,11 +2091,17 @@ msgid ""
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "(probably Telnet)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "(probably an email client)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"One of your applications %1 appears to be making a potentially unencrypted "
+"and unsafe connection to port %2."
 msgstr ""
 
 msgctxt "MessageLog"
@@ -3664,14 +3666,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 ""
@@ -3765,6 +3759,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 ""
 



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