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

chiiph at torproject.org chiiph at torproject.org
Sun May 13 22:32:32 UTC 2012


commit fabd43768c07cd89dc17f017f44bc13de54ea46b
Author: Tomás Touceda <chiiph at torproject.org>
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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gnu.org>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at gnu.org>\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 at hotmail.ca>, 2012.
+# Ahmad Mohammad <>, 2012.
 # IBRAHIM <mradonadiego at hotmail.fr>, 2011.
 #   <manmacdeath at gmail.com>, 2011.
 #   <moazbaghdadi at gmail.com>, 2011.
@@ -8,12 +9,13 @@
 # Mohammed Al-Doub <voulnet at gmail.com>, 2012.
 # OsamaK <osamak at gnu.org>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
+# Yehia Badawy <the1legend_2010 at yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 "إذا كان فيداليا غير قادر على إيقاف تور, سوف يقوم فيداليا بعرض رسالة خطأ تخبرك عن الخطأ الذي حدث. يمكنك أيضا إلقاء نظرة على <a href=\"log.html\">سجل الاحداث</a> لمعرفة ما إذا قام تور بإصدار المزيد من المعلومات حول ما الخطأ الذي حدث."
 
 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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at gmail.com>, 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 at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at hotmail.co.uk>, 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 at hotmail.co.uk>\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 at hotmail.co.uk>, 2011.
+#   <demonuk9 at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: cymro <markives at hotmail.co.uk>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:52+0000\n"
+"Last-Translator: PoopZemli <demonuk9 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "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 at gmail.com>, 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 at detfalskested.dk>, 2012.
 # Aputsiaq Janussen <aputtu at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
 #   <theoliver at live.co.uk>, 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 at live.co.uk>\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 at detfalskested.dk>\n"
 "Language-Team: translations at vidalia-project.net\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 at gnome.org>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at googlemail.com>, 2011.
 # cosimacosa <leccefv at libero.it>, 2011.
+#   <f.schima at googlemail.com>, 2012.
 # Hendrik Richter <hendrikr at gnome.org>, 2011.
+#   <koloman375 at gmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 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 at T-Online.de>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 # Γιάννης  <yannanth at gmail.com>, 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 at gmail.com>\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 at hotmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at googlemail.com>, 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 at googlemail.com>\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 at googlemail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-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 at googlemail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 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 at gmail.com>, 2011.
 #   <lenazun at gmail.com>, 2011.
+#   <mavtra724 at gmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
 #   <santiagotorresarias at hotmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-22 19:54+0000\n"
-"Last-Translator: lenazun <lenazun at gmail.com>\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 at gmail.com>\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 at vidalia-project.net\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 at euskalerria.org>, 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 at euskalerria.org>\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 at euskalerria.org>, 2012.
+#   <baldarra at euskalerria.org>, 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 at euskalerria.org>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 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 at gmail.com>, 2011.
 # martin luther king <sabztunnel at gmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
+#   <slander_mo at hotmail.com>, 2012.
+#   <s.sampad at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-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 at redteam.io>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 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 at rppkn.com>, 2012.
 #   <debris at riseup.net>, 2012.
 #   <jukka.mieskonen at gmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: torre <c168298 at rppkn.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at hotmail.fr>, 2012.
 # runasand <runa.sandvik at gmail.com>, 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 at hotmail.fr>\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 at gmail.com>, 2012.
 # mehditaileb <mehditaileb at liberte-info.net>, 2011.
 # Pierre Antoine <pierre.antoine at ieee.org>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at ieee.org>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2012-02-14 09:47+0000\n"
+"Last-Translator: Amichay P. K. <am1chay.p.k at gmail.com>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: mayurchanakya <mayurchanakya at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 #   <viktor.varga at gmail.com>, 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 at gmail.com>\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 at gmail.com>, 2011.
-#   <viktor.varga at gmail.com>, 2011.
+#   <viktor.varga at gmail.com>, 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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at gmail.com>, 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 at yahoo.com>, 2011.
+#   <deni.komputer at gmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
 #   <thedaweng at yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: daweng <thedaweng at yahoo.com>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 2011.
 #   <tru74368 at yahoo.com>, 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 at yahoo.com>\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 at gmail.com>\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 at gmail.com>, 2012.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\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 at gmail.com>, 2012.
+# Eshin Kunishima <kaoru at mikosu.ddo.jp>, 2012.
+#   <kaoru at mikosu.ddo.jp>, 2012.
+#   <pentive at gmail.com>, 2012.
+# runasand <runa.sandvik at gmail.com>, 2011.
+# siomiz  <>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at computer.org>\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 at mikosu.ddo.jp>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at naver.com>, 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 at naver.com>\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 at naver.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 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 at hotmail.no>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 # Shondoit Walker <shondoit+transifex at gmail.com>, 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 at gmail.com>\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 at online.be>, 2011.
 #   <louisboy at msn.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
-# Shondoit Walker <shondoit+transifex at gmail.com>, 2011.
+# Shondoit Walker <shondoit+transifex at gmail.com>, 2011, 2012.
 #   <zero.point.transifex at tweebs.nl>, 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 at tweebs.nl>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 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 at hush.ai>, 2012.
+#   <ipjsdfpojsdf at mailinator.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\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 at hush.ai>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at netcabo.pt>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at netcabo.pt>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at live.co.uk>, 2011.
 # Filipe  <nfscp at walla.com>, 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 at walla.com>\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 at live.co.uk>, 2011.
 # daniel  <>, 2012.
+# Erick de Oliveira Leal <>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
 # Sérgio  <theparish2 at yahoo.com>, 2012.
+#   <viniciusandrade at estadao.com.br>, 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 at gmail.com>\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 at vidalia-project.net\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 at gmail.com>, 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 at yahoo.com>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: Florin Putura <puturaflorin at yahoo.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "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 at gmail.com>, 2011.
 # Андрей Костенко <andrey at kostenko.name>, 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 at gmail.com>\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 at vidalia-project.net\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 at gmail.com>, 2012.
 #   <martin.strucel at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-01 11:29+0000\n"
-"Last-Translator: martinstrucel <martin.strucel at gmail.com>\n"
+"PO-Revision-Date: 2012-03-01 18:33+0000\n"
+"Last-Translator: K0L0M4N <koloman375 at gmail.com>\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 at gmail.com>, 2012.
+#   <koloman375 at gmail.com>, 2012.
+#   <martin.strucel at gmail.com>, 2012.
+# runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at post.sk>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 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 at gmail.com>, 2012.
+#   <mahavidyas at gmail.com>, 2012.
+#   <portalscg at gmail.com>, 2012.
+# runasand <runa.sandvik at gmail.com>, 2011.
+#   <sdpuls at gmail.com>, 2011.
+# Vanja  <medjutim at yahoo.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at googlemail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\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 at gmail.com>, 2012.
+#   <lars.edman at bredband.net>, 2012.
 #   <marta.leffler at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: mle <marta.leffler at gmail.com>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: Larse <lars.edman at bredband.net>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 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 at ulkuderner.net>, 2012.
+#   <cannuhlar at hotmail.com>, 2012.
+# Deniz  <>, 2012.
 # runasand <runa.sandvik at gmail.com>, 2011.
+#   <zahmetr at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at gmail.com>, 2011.
+#   <demonuk9 at gmail.com>, 2011.
+#   <vadim2007 at ukr.net>, 2012.
+# Дмитро <demonuk9 at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 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 at ukr.net>\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 at gmail.com>, 2012.
+#   <demonuk9 at gmail.com>, 2011, 2012.
+# runasand <runa.sandvik at gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at linuxmail.org>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 at vidalia-project.net\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 at gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-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 at gmail.com>\n"
 "Language-Team: translations at vidalia-project.net\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 đị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 đị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 lạ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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at vidalia-project.net\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 at gmail.com>, 2011.
 # runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2012-02-14 09:46+0000\n"
+"Last-Translator: John <dragonandghost at gmail.com>\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 at 126.com>\n"
+"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"PO-Revision-Date: 2012-03-22 08:51+0000\n"
+"Last-Translator: Kevin Chen <szescxz at 126.com>\n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "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 at vidalia-project.net\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 at gmail.com>, 2012.
 # runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\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 at gmail.com>, 2011.
+# tylerlin <msn at tylerlin.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at tylerlin.com>\n"
 "Language-Team: translations at vidalia-project.net\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 at vidalia-project.net\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 ""
 





More information about the tor-commits mailing list