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

translation at torproject.org translation at torproject.org
Sat Sep 3 14:56:51 UTC 2011


commit ef1589b527e90abad8fa3666740622dd4032fd65
Author: Translation commit bot <translation at torproject.org>
Date:   Sat Sep 3 13:21:28 2011 +0000

    Update translations for vidalia
---
 af/qt_af.po            |    4 +-
 af/vidalia_af.po       |    2 +-
 ak/qt_ak.po            |    4 +-
 ak/vidalia_ak.po       |    2 +-
 am/qt_am.po            |    4 +-
 am/vidalia_am.po       |    2 +-
 arn/qt_arn.po          |    4 +-
 arn/vidalia_arn.po     |    2 +-
 ast/qt_ast.po          |    4 +-
 ast/vidalia_ast.po     |    2 +-
 az/qt_az.po            |    4 +-
 az/vidalia_az.po       |    2 +-
 be/qt_be.po            |    4 +-
 be/vidalia_be.po       |  760 +++++++++++--
 bg/qt_bg.po            |    4 +-
 bn/qt_bn.po            |    4 +-
 bn/vidalia_bn.po       |  760 +++++++++++--
 bn_IN/qt_bn_IN.po      |    4 +-
 bn_IN/vidalia_bn_IN.po |    2 +-
 bo/qt_bo.po            |    4 +-
 bo/vidalia_bo.po       | 2888 +++++++++++++++++++++++++++++++++---------------
 br/qt_br.po            |    4 +-
 br/vidalia_br.po       |  760 +++++++++++--
 bs/qt_bs.po            |    4 +-
 bs/vidalia_bs.po       |  760 +++++++++++--
 ca/vidalia_ca.po       |    2 +-
 csb/qt_csb.po          |    4 +-
 csb/vidalia_csb.po     |    2 +-
 de_CH/qt_de_CH.po      |    4 +-
 de_CH/vidalia_de_CH.po |    2 +-
 de_DE/qt_de_DE.po      |    4 +-
 de_DE/vidalia_de_DE.po | 2888 +++++++++++++++++++++++++++++++++---------------
 dz/qt_dz.po            |    4 +-
 dz/vidalia_dz.po       |    2 +-
 et/qt_et.po            |    4 +-
 et/vidalia_et.po       |    2 +-
 eu/qt_eu.po            |    4 +-
 eu/vidalia_eu.po       |    2 +-
 fil/qt_fil.po          |    4 +-
 fil/vidalia_fil.po     |    2 +-
 fo/qt_fo.po            |    4 +-
 fo/vidalia_fo.po       |  760 +++++++++++--
 fur/qt_fur.po          |    4 +-
 fur/vidalia_fur.po     |    2 +-
 fy/qt_fy.po            |    4 +-
 fy/vidalia_fy.po       |  760 +++++++++++--
 ga/qt_ga.po            |    4 +-
 ga/vidalia_ga.po       |    2 +-
 gl/qt_gl.po            |    4 +-
 gl/vidalia_gl.po       |    2 +-
 gun/qt_gun.po          |    4 +-
 gun/vidalia_gun.po     |    2 +-
 ha/qt_ha.po            |    4 +-
 ha/vidalia_ha.po       |    2 +-
 hi/qt_hi.po            |    4 +-
 hr/qt_hr.po            |    4 +-
 hr/vidalia_hr.po       |    2 +-
 ht/qt_ht.po            |    4 +-
 ht/vidalia_ht.po       |    2 +-
 hy/qt_hy.po            |    4 +-
 hy/vidalia_hy.po       |  760 +++++++++++--
 is/qt_is.po            |    4 +-
 jv/qt_jv.po            |    4 +-
 jv/vidalia_jv.po       |  760 +++++++++++--
 ka/qt_ka.po            |    4 +-
 ka/vidalia_ka.po       | 2888 +++++++++++++++++++++++++++++++++---------------
 km/qt_km.po            |    4 +-
 km/vidalia_km.po       | 2888 +++++++++++++++++++++++++++++++++---------------
 kn/qt_kn.po            |    4 +-
 kn/vidalia_kn.po       |    2 +-
 ku/qt_ku.po            |    4 +-
 ku/vidalia_ku.po       | 2888 +++++++++++++++++++++++++++++++++---------------
 kw/qt_kw.po            |    4 +-
 kw/vidalia_kw.po       |  760 +++++++++++--
 ky/qt_ky.po            |    4 +-
 ky/vidalia_ky.po       |  760 +++++++++++--
 lb/qt_lb.po            |    4 +-
 lb/vidalia_lb.po       |    2 +-
 ln/qt_ln.po            |    4 +-
 ln/vidalia_ln.po       |    2 +-
 lo/qt_lo.po            |    4 +-
 lo/vidalia_lo.po       |    2 +-
 lt/qt_lt.po            |    4 +-
 lt/vidalia_lt.po       |    2 +-
 lv/qt_lv.po            |    4 +-
 lv/vidalia_lv.po       |    2 +-
 mg/qt_mg.po            |    4 +-
 mg/vidalia_mg.po       |    2 +-
 mi/qt_mi.po            |    4 +-
 mi/vidalia_mi.po       |    2 +-
 mk/qt_mk.po            |    4 +-
 mk/vidalia_mk.po       |    2 +-
 ml/qt_ml.po            |    4 +-
 ml/vidalia_ml.po       |    2 +-
 mn/qt_mn.po            |    4 +-
 mn/vidalia_mn.po       |    2 +-
 mr/qt_mr.po            |    4 +-
 mr/vidalia_mr.po       |    2 +-
 ms/qt_ms.po            |    4 +-
 ms/vidalia_ms.po       |    2 +-
 mt/qt_mt.po            |    4 +-
 mt/vidalia_mt.po       |    2 +-
 nah/qt_nah.po          |    4 +-
 nah/vidalia_nah.po     |    2 +-
 nap/qt_nap.po          |    4 +-
 nap/vidalia_nap.po     |    2 +-
 ne/qt_ne.po            |    4 +-
 ne/vidalia_ne.po       |    2 +-
 nn/qt_nn.po            |    4 +-
 nn/vidalia_nn.po       |    2 +-
 nso/qt_nso.po          |    4 +-
 nso/vidalia_nso.po     |    2 +-
 oc/qt_oc.po            |    4 +-
 oc/vidalia_oc.po       |    2 +-
 or/qt_or.po            |    4 +-
 or/vidalia_or.po       |  760 +++++++++++--
 pa/qt_pa.po            |    4 +-
 pa/vidalia_pa.po       |    2 +-
 pap/qt_pap.po          |    4 +-
 pap/vidalia_pap.po     |    2 +-
 pms/qt_pms.po          |    4 +-
 pms/vidalia_pms.po     |    2 +-
 ps/qt_ps.po            |    4 +-
 ps/vidalia_ps.po       |    2 +-
 sco/qt_sco.po          |    4 +-
 sco/vidalia_sco.po     |    2 +-
 sk/qt_sk.po            |    4 +-
 sl/vidalia_sl.po       | 1821 +++++++++++++-----------------
 so/qt_so.po            |    4 +-
 so/vidalia_so.po       |  760 +++++++++++--
 son/qt_son.po          |    4 +-
 son/vidalia_son.po     |    2 +-
 st/qt_st.po            |    4 +-
 st/vidalia_st.po       |  760 +++++++++++--
 su/qt_su.po            |    4 +-
 su/vidalia_su.po       |    2 +-
 sw/qt_sw.po            |    4 +-
 sw/vidalia_sw.po       |    2 +-
 ta/qt_ta.po            |    4 +-
 ta/vidalia_ta.po       |    2 +-
 te/qt_te.po            |    4 +-
 te/vidalia_te.po       |    2 +-
 tg/qt_tg.po            |    4 +-
 tg/vidalia_tg.po       |    2 +-
 th/qt_th.po            |    4 +-
 ti/qt_ti.po            |    4 +-
 ti/vidalia_ti.po       |    2 +-
 tk/qt_tk.po            |    4 +-
 tk/vidalia_tk.po       |    2 +-
 ur/qt_ur.po            |    4 +-
 ur/vidalia_ur.po       |    2 +-
 ve/qt_ve.po            |    4 +-
 ve/vidalia_ve.po       |    2 +-
 vi/qt_vi.po            |    4 +-
 wa/qt_wa.po            |    4 +-
 wa/vidalia_wa.po       |  760 +++++++++++--
 wo/qt_wo.po            |    4 +-
 wo/vidalia_wo.po       |  760 +++++++++++--
 zh_HK/qt_zh_HK.po      |    4 +-
 zh_HK/vidalia_zh_HK.po |    2 +-
 zu/qt_zu.po            |    4 +-
 zu/vidalia_zu.po       |    2 +-
 162 files changed, 20800 insertions(+), 7309 deletions(-)

diff --git a/af/qt_af.po b/af/qt_af.po
index 2ab4636..09a241b 100644
--- a/af/qt_af.po
+++ b/af/qt_af.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/af/vidalia_af.po b/af/vidalia_af.po
index 45de586..148bf10 100755
--- a/af/vidalia_af.po
+++ b/af/vidalia_af.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ak/qt_ak.po b/ak/qt_ak.po
index 1c3c55f..9d23aa4 100644
--- a/ak/qt_ak.po
+++ b/ak/qt_ak.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ak/vidalia_ak.po b/ak/vidalia_ak.po
index db2787a..9ee6424 100644
--- a/ak/vidalia_ak.po
+++ b/ak/vidalia_ak.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/am/qt_am.po b/am/qt_am.po
index 2fdc094..1febe14 100644
--- a/am/qt_am.po
+++ b/am/qt_am.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/am/vidalia_am.po b/am/vidalia_am.po
index 4412f57..3e4ddd3 100644
--- a/am/vidalia_am.po
+++ b/am/vidalia_am.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/arn/qt_arn.po b/arn/qt_arn.po
index a92ebb7..f8cddda 100644
--- a/arn/qt_arn.po
+++ b/arn/qt_arn.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/arn/vidalia_arn.po b/arn/vidalia_arn.po
index 927f71e..1a614b9 100644
--- a/arn/vidalia_arn.po
+++ b/arn/vidalia_arn.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ast/qt_ast.po b/ast/qt_ast.po
index a5d7b07..f0a179a 100644
--- a/ast/qt_ast.po
+++ b/ast/qt_ast.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ast/vidalia_ast.po b/ast/vidalia_ast.po
index df60ef5..dd1bac8 100644
--- a/ast/vidalia_ast.po
+++ b/ast/vidalia_ast.po
@@ -4,7 +4,7 @@ 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-09-03 12:39+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/az/qt_az.po b/az/qt_az.po
index 919fbbd..1fac854 100644
--- a/az/qt_az.po
+++ b/az/qt_az.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/az/vidalia_az.po b/az/vidalia_az.po
index 5f3ff6b..1cee0ab 100644
--- a/az/vidalia_az.po
+++ b/az/vidalia_az.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/be/qt_be.po b/be/qt_be.po
index 5df13a3..32f7ad2 100644
--- a/be/qt_be.po
+++ b/be/qt_be.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/be/vidalia_be.po b/be/vidalia_be.po
index 22b0f4e..9c5eef9 100644
--- a/be/vidalia_be.po
+++ b/be/vidalia_be.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/bg/qt_bg.po b/bg/qt_bg.po
index e87f075..3eba690 100644
--- a/bg/qt_bg.po
+++ b/bg/qt_bg.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/bn/qt_bn.po b/bn/qt_bn.po
index 8b90f23..8abdb31 100644
--- a/bn/qt_bn.po
+++ b/bn/qt_bn.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/bn/vidalia_bn.po b/bn/vidalia_bn.po
index 22b0f4e..5503ae8 100644
--- a/bn/vidalia_bn.po
+++ b/bn/vidalia_bn.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/bn_IN/qt_bn_IN.po b/bn_IN/qt_bn_IN.po
index e7479c1..7036b91 100644
--- a/bn_IN/qt_bn_IN.po
+++ b/bn_IN/qt_bn_IN.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/bn_IN/vidalia_bn_IN.po b/bn_IN/vidalia_bn_IN.po
index 85e9374..2ac8c77 100644
--- a/bn_IN/vidalia_bn_IN.po
+++ b/bn_IN/vidalia_bn_IN.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/bo/qt_bo.po b/bo/qt_bo.po
index 4311227..3371523 100644
--- a/bo/qt_bo.po
+++ b/bo/qt_bo.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/bo/vidalia_bo.po b/bo/vidalia_bo.po
index cd31a6d..205db86 100755
--- a/bo/vidalia_bo.po
+++ b/bo/vidalia_bo.po
@@ -1,2682 +1,3818 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 ""
+"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 ""
 
-#: mainwindow.cpp:440
-msgctxt "MainWindow"
-msgid "Ctrl+N"
+msgctxt "CountryInfo"
+msgid "Lesotho"
 msgstr ""
 
-#: mainwindow.cpp:441
-msgctxt "MainWindow"
+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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+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 ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"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.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 "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 ""
+"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: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 ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ", probably an email client,"
 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"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+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 ""
+
+msgctxt "ServerPage"
+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 "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+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 "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid GUI style specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+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/br/qt_br.po b/br/qt_br.po
index 68f542b..009b73d 100644
--- a/br/qt_br.po
+++ b/br/qt_br.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/br/vidalia_br.po b/br/vidalia_br.po
index 22b0f4e..452bb82 100644
--- a/br/vidalia_br.po
+++ b/br/vidalia_br.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/bs/qt_bs.po b/bs/qt_bs.po
index 910b85a..0331ae8 100644
--- a/bs/qt_bs.po
+++ b/bs/qt_bs.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/bs/vidalia_bs.po b/bs/vidalia_bs.po
index 22b0f4e..76148ff 100644
--- a/bs/vidalia_bs.po
+++ b/bs/vidalia_bs.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po
index 71f73b9..af175ad 100755
--- a/ca/vidalia_ca.po
+++ b/ca/vidalia_ca.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:12+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/csb/qt_csb.po b/csb/qt_csb.po
index f2a2ae6..6098f52 100644
--- a/csb/qt_csb.po
+++ b/csb/qt_csb.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/csb/vidalia_csb.po b/csb/vidalia_csb.po
index c32af78..1aca03a 100644
--- a/csb/vidalia_csb.po
+++ b/csb/vidalia_csb.po
@@ -4,7 +4,7 @@ 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-09-03 12:39+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/de_CH/qt_de_CH.po b/de_CH/qt_de_CH.po
index 65a6e3b..865c1fe 100644
--- a/de_CH/qt_de_CH.po
+++ b/de_CH/qt_de_CH.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/de_CH/vidalia_de_CH.po b/de_CH/vidalia_de_CH.po
index b59163b..5a1156d 100755
--- a/de_CH/vidalia_de_CH.po
+++ b/de_CH/vidalia_de_CH.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/de_DE/qt_de_DE.po b/de_DE/qt_de_DE.po
index 65e9f5d..6dd347b 100644
--- a/de_DE/qt_de_DE.po
+++ b/de_DE/qt_de_DE.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/de_DE/vidalia_de_DE.po b/de_DE/vidalia_de_DE.po
index cd31a6d..b743465 100755
--- a/de_DE/vidalia_de_DE.po
+++ b/de_DE/vidalia_de_DE.po
@@ -1,2682 +1,3818 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 ""
+"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 ""
 
-#: mainwindow.cpp:440
-msgctxt "MainWindow"
-msgid "Ctrl+N"
+msgctxt "CountryInfo"
+msgid "Lesotho"
 msgstr ""
 
-#: mainwindow.cpp:441
-msgctxt "MainWindow"
+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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+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 ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"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.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 "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 ""
+"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: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 ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ", probably an email client,"
 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"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+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 ""
+
+msgctxt "ServerPage"
+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 "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+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 "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid GUI style specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+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/dz/qt_dz.po b/dz/qt_dz.po
index 3404096..9b03d5d 100644
--- a/dz/qt_dz.po
+++ b/dz/qt_dz.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/dz/vidalia_dz.po b/dz/vidalia_dz.po
index e0bb15e..541a5fa 100644
--- a/dz/vidalia_dz.po
+++ b/dz/vidalia_dz.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/et/qt_et.po b/et/qt_et.po
index 101a83f..dd1ee67 100644
--- a/et/qt_et.po
+++ b/et/qt_et.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/et/vidalia_et.po b/et/vidalia_et.po
index d9dad81..5ba7aae 100644
--- a/et/vidalia_et.po
+++ b/et/vidalia_et.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/eu/qt_eu.po b/eu/qt_eu.po
index a9e3a0a..2c80e9a 100644
--- a/eu/qt_eu.po
+++ b/eu/qt_eu.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po
index 0079765..99d4cae 100755
--- a/eu/vidalia_eu.po
+++ b/eu/vidalia_eu.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/fil/qt_fil.po b/fil/qt_fil.po
index f32a87f..175c88f 100644
--- a/fil/qt_fil.po
+++ b/fil/qt_fil.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/fil/vidalia_fil.po b/fil/vidalia_fil.po
index e74e8c8..cd01ff1 100644
--- a/fil/vidalia_fil.po
+++ b/fil/vidalia_fil.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/fo/qt_fo.po b/fo/qt_fo.po
index 18ad62a..309a6ab 100644
--- a/fo/qt_fo.po
+++ b/fo/qt_fo.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/fo/vidalia_fo.po b/fo/vidalia_fo.po
index 22b0f4e..f498336 100644
--- a/fo/vidalia_fo.po
+++ b/fo/vidalia_fo.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/fur/qt_fur.po b/fur/qt_fur.po
index 0eb6c13..a284aa9 100644
--- a/fur/qt_fur.po
+++ b/fur/qt_fur.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/fur/vidalia_fur.po b/fur/vidalia_fur.po
index 04d9c45..960519f 100755
--- a/fur/vidalia_fur.po
+++ b/fur/vidalia_fur.po
@@ -4,7 +4,7 @@ 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-09-03 12:48+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/fy/qt_fy.po b/fy/qt_fy.po
index f31a58b..b852d84 100644
--- a/fy/qt_fy.po
+++ b/fy/qt_fy.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/fy/vidalia_fy.po b/fy/vidalia_fy.po
index 22b0f4e..75b7660 100644
--- a/fy/vidalia_fy.po
+++ b/fy/vidalia_fy.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/ga/qt_ga.po b/ga/qt_ga.po
index d408691..8fa7aa8 100644
--- a/ga/qt_ga.po
+++ b/ga/qt_ga.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ga/vidalia_ga.po b/ga/vidalia_ga.po
index 9d36a4b..e6f2fbb 100644
--- a/ga/vidalia_ga.po
+++ b/ga/vidalia_ga.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/gl/qt_gl.po b/gl/qt_gl.po
index cf67d75..28fdb00 100644
--- a/gl/qt_gl.po
+++ b/gl/qt_gl.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/gl/vidalia_gl.po b/gl/vidalia_gl.po
index 2ea4a0f..7f32e93 100755
--- a/gl/vidalia_gl.po
+++ b/gl/vidalia_gl.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/gun/qt_gun.po b/gun/qt_gun.po
index 7439ef0..27d7e0f 100644
--- a/gun/qt_gun.po
+++ b/gun/qt_gun.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/gun/vidalia_gun.po b/gun/vidalia_gun.po
index aef02ab..d886e7b 100644
--- a/gun/vidalia_gun.po
+++ b/gun/vidalia_gun.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ha/qt_ha.po b/ha/qt_ha.po
index b7a61cd..ff979fb 100644
--- a/ha/qt_ha.po
+++ b/ha/qt_ha.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ha/vidalia_ha.po b/ha/vidalia_ha.po
index 5dccaff..9f91a22 100644
--- a/ha/vidalia_ha.po
+++ b/ha/vidalia_ha.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/hi/qt_hi.po b/hi/qt_hi.po
index 9e761e3..e08988c 100644
--- a/hi/qt_hi.po
+++ b/hi/qt_hi.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/hr/qt_hr.po b/hr/qt_hr.po
index 5f5c70e..878d0a2 100644
--- a/hr/qt_hr.po
+++ b/hr/qt_hr.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/hr/vidalia_hr.po b/hr/vidalia_hr.po
index a7de0fc..bb5ced2 100755
--- a/hr/vidalia_hr.po
+++ b/hr/vidalia_hr.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ht/qt_ht.po b/ht/qt_ht.po
index 6de105d..462a20a 100644
--- a/ht/qt_ht.po
+++ b/ht/qt_ht.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ht/vidalia_ht.po b/ht/vidalia_ht.po
index 3f2907d..1ca6bc8 100644
--- a/ht/vidalia_ht.po
+++ b/ht/vidalia_ht.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/hy/qt_hy.po b/hy/qt_hy.po
index 6de81fe..7f2789f 100644
--- a/hy/qt_hy.po
+++ b/hy/qt_hy.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/hy/vidalia_hy.po b/hy/vidalia_hy.po
index 22b0f4e..59bcb1d 100644
--- a/hy/vidalia_hy.po
+++ b/hy/vidalia_hy.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/is/qt_is.po b/is/qt_is.po
index 9a8b15a..1f77932 100644
--- a/is/qt_is.po
+++ b/is/qt_is.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/jv/qt_jv.po b/jv/qt_jv.po
index 625a6e3..e0a7471 100644
--- a/jv/qt_jv.po
+++ b/jv/qt_jv.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/jv/vidalia_jv.po b/jv/vidalia_jv.po
index 22b0f4e..dfeb46f 100644
--- a/jv/vidalia_jv.po
+++ b/jv/vidalia_jv.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/ka/qt_ka.po b/ka/qt_ka.po
index 0304b2e..eb321ab 100644
--- a/ka/qt_ka.po
+++ b/ka/qt_ka.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ka/vidalia_ka.po b/ka/vidalia_ka.po
index cd31a6d..ae41bd5 100755
--- a/ka/vidalia_ka.po
+++ b/ka/vidalia_ka.po
@@ -1,2682 +1,3818 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 ""
+"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 ""
 
-#: mainwindow.cpp:440
-msgctxt "MainWindow"
-msgid "Ctrl+N"
+msgctxt "CountryInfo"
+msgid "Lesotho"
 msgstr ""
 
-#: mainwindow.cpp:441
-msgctxt "MainWindow"
+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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+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 ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"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.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 "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 ""
+"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: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 ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ", probably an email client,"
 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"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+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 ""
+
+msgctxt "ServerPage"
+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 "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+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 "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid GUI style specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+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/km/qt_km.po b/km/qt_km.po
index ef3663a..4cdf96e 100644
--- a/km/qt_km.po
+++ b/km/qt_km.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/km/vidalia_km.po b/km/vidalia_km.po
index cd31a6d..411ea91 100755
--- a/km/vidalia_km.po
+++ b/km/vidalia_km.po
@@ -1,2682 +1,3818 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 ""
+"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 ""
 
-#: mainwindow.cpp:440
-msgctxt "MainWindow"
-msgid "Ctrl+N"
+msgctxt "CountryInfo"
+msgid "Lesotho"
 msgstr ""
 
-#: mainwindow.cpp:441
-msgctxt "MainWindow"
+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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+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 ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"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.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 "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 ""
+"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: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 ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ", probably an email client,"
 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"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+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 ""
+
+msgctxt "ServerPage"
+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 "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+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 "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid GUI style specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+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/kn/qt_kn.po b/kn/qt_kn.po
index 9b47f9e..57a0bf3 100644
--- a/kn/qt_kn.po
+++ b/kn/qt_kn.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/kn/vidalia_kn.po b/kn/vidalia_kn.po
index a9aea27..5e67548 100644
--- a/kn/vidalia_kn.po
+++ b/kn/vidalia_kn.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ku/qt_ku.po b/ku/qt_ku.po
index 0aae6a6..82ec143 100644
--- a/ku/qt_ku.po
+++ b/ku/qt_ku.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ku/vidalia_ku.po b/ku/vidalia_ku.po
index cd31a6d..8c81199 100755
--- a/ku/vidalia_ku.po
+++ b/ku/vidalia_ku.po
@@ -1,2682 +1,3818 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 ""
+"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 ""
 
-#: mainwindow.cpp:440
-msgctxt "MainWindow"
-msgid "Ctrl+N"
+msgctxt "CountryInfo"
+msgid "Lesotho"
 msgstr ""
 
-#: mainwindow.cpp:441
-msgctxt "MainWindow"
+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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+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 ""
 
-#: mainwindow.ui:370
 msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Update Failed"
 msgstr ""
 
-#: mainwindow.ui:383
 msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Your software is up to date"
 msgstr ""
 
-#: mainwindow.ui:433
 msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
 msgstr ""
 
-#: mainwindow.ui:446
 msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Installation Failed"
 msgstr ""
 
-#: mainwindow.ui:498
 msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Vidalia was unable to install your software updates."
 msgstr ""
 
-#: mainwindow.ui:517
 msgctxt "MainWindow"
-msgid "Hide"
+msgid "The following error occurred:"
 msgstr ""
 
-#: mainwindow.ui:520
 msgctxt "MainWindow"
-msgid "Hide this window"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
 msgstr ""
 
-#: mainwindow.cpp:1210
 msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid ""
+"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.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 "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 ""
+"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: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 ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: messagelog.cpp:134
-msgctxt "MessageLog"
-msgid "Messages that appear frequently "
-"during normal Tor operation."
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
 msgstr ""
 
-#: messagelog.cpp:136
-msgctxt "MessageLog"
-msgid "Hyper-verbose messages primarily of "
-"interest to Tor developers."
+msgctxt "MainWindow"
+msgid ", probably an email client,"
 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"
 msgstr ""
 
-#: serverpage.ui:620
 msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
+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 ""
+
+msgctxt "ServerPage"
+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 "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+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 "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:251
 msgctxt "Vidalia"
-msgid "Invalid log level specified: "
+msgid "Invalid GUI style specified:"
 msgstr ""
 
-#: vidalia.cpp:257
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+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/kw/qt_kw.po b/kw/qt_kw.po
index 9239778..36697d5 100644
--- a/kw/qt_kw.po
+++ b/kw/qt_kw.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/kw/vidalia_kw.po b/kw/vidalia_kw.po
index 22b0f4e..e853fe3 100644
--- a/kw/vidalia_kw.po
+++ b/kw/vidalia_kw.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/ky/qt_ky.po b/ky/qt_ky.po
index 63743eb..8f83db0 100644
--- a/ky/qt_ky.po
+++ b/ky/qt_ky.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ky/vidalia_ky.po b/ky/vidalia_ky.po
index 22b0f4e..ea65dd1 100644
--- a/ky/vidalia_ky.po
+++ b/ky/vidalia_ky.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/lb/qt_lb.po b/lb/qt_lb.po
index 93cf944..eff8d4d 100644
--- a/lb/qt_lb.po
+++ b/lb/qt_lb.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/lb/vidalia_lb.po b/lb/vidalia_lb.po
index 819f576..aa2edc1 100644
--- a/lb/vidalia_lb.po
+++ b/lb/vidalia_lb.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ln/qt_ln.po b/ln/qt_ln.po
index 78550cf..47ab033 100644
--- a/ln/qt_ln.po
+++ b/ln/qt_ln.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ln/vidalia_ln.po b/ln/vidalia_ln.po
index 206c9e0..6130960 100644
--- a/ln/vidalia_ln.po
+++ b/ln/vidalia_ln.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/lo/qt_lo.po b/lo/qt_lo.po
index e58abb9..2c13739 100644
--- a/lo/qt_lo.po
+++ b/lo/qt_lo.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/lo/vidalia_lo.po b/lo/vidalia_lo.po
index cb14cc5..daa1428 100644
--- a/lo/vidalia_lo.po
+++ b/lo/vidalia_lo.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/lt/qt_lt.po b/lt/qt_lt.po
index fe5958c..787ed71 100644
--- a/lt/qt_lt.po
+++ b/lt/qt_lt.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/lt/vidalia_lt.po b/lt/vidalia_lt.po
index a49f83d..17b797c 100644
--- a/lt/vidalia_lt.po
+++ b/lt/vidalia_lt.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/lv/qt_lv.po b/lv/qt_lv.po
index 8640954..f22a7e4 100644
--- a/lv/qt_lv.po
+++ b/lv/qt_lv.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po
index f7fb024..407a0b1 100644
--- a/lv/vidalia_lv.po
+++ b/lv/vidalia_lv.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/mg/qt_mg.po b/mg/qt_mg.po
index 10c72ad..30ff0c8 100644
--- a/mg/qt_mg.po
+++ b/mg/qt_mg.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/mg/vidalia_mg.po b/mg/vidalia_mg.po
index 3318df2..62dadb4 100644
--- a/mg/vidalia_mg.po
+++ b/mg/vidalia_mg.po
@@ -4,7 +4,7 @@ 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-09-03 12:48+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/mi/qt_mi.po b/mi/qt_mi.po
index 8fce8b0..4ba6cf7 100644
--- a/mi/qt_mi.po
+++ b/mi/qt_mi.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/mi/vidalia_mi.po b/mi/vidalia_mi.po
index 64191d6..afc316e 100644
--- a/mi/vidalia_mi.po
+++ b/mi/vidalia_mi.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/mk/qt_mk.po b/mk/qt_mk.po
index 4ca8c1a..ab63396 100644
--- a/mk/qt_mk.po
+++ b/mk/qt_mk.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/mk/vidalia_mk.po b/mk/vidalia_mk.po
index eb6f193..566c7d4 100644
--- a/mk/vidalia_mk.po
+++ b/mk/vidalia_mk.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ml/qt_ml.po b/ml/qt_ml.po
index 4e76d07..168d182 100644
--- a/ml/qt_ml.po
+++ b/ml/qt_ml.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ml/vidalia_ml.po b/ml/vidalia_ml.po
index 4c7b7f6..a988b7d 100644
--- a/ml/vidalia_ml.po
+++ b/ml/vidalia_ml.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/mn/qt_mn.po b/mn/qt_mn.po
index 3638f0f..c7cb7eb 100644
--- a/mn/qt_mn.po
+++ b/mn/qt_mn.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/mn/vidalia_mn.po b/mn/vidalia_mn.po
index 287d716..a881986 100644
--- a/mn/vidalia_mn.po
+++ b/mn/vidalia_mn.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/mr/qt_mr.po b/mr/qt_mr.po
index 4a97296..9f41b03 100644
--- a/mr/qt_mr.po
+++ b/mr/qt_mr.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/mr/vidalia_mr.po b/mr/vidalia_mr.po
index e2997fd..e9f1f10 100644
--- a/mr/vidalia_mr.po
+++ b/mr/vidalia_mr.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ms/qt_ms.po b/ms/qt_ms.po
index b09c996..b4e34eb 100644
--- a/ms/qt_ms.po
+++ b/ms/qt_ms.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ms/vidalia_ms.po b/ms/vidalia_ms.po
index d1df2ff..888b95f 100644
--- a/ms/vidalia_ms.po
+++ b/ms/vidalia_ms.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/mt/qt_mt.po b/mt/qt_mt.po
index 90c737e..e770bbf 100644
--- a/mt/qt_mt.po
+++ b/mt/qt_mt.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/mt/vidalia_mt.po b/mt/vidalia_mt.po
index 496805b..4e6e074 100755
--- a/mt/vidalia_mt.po
+++ b/mt/vidalia_mt.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/nah/qt_nah.po b/nah/qt_nah.po
index 90d2fc4..84ddd6d 100644
--- a/nah/qt_nah.po
+++ b/nah/qt_nah.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/nah/vidalia_nah.po b/nah/vidalia_nah.po
index 604f57b..b3aad38 100644
--- a/nah/vidalia_nah.po
+++ b/nah/vidalia_nah.po
@@ -4,7 +4,7 @@ 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-09-03 12:39+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/nap/qt_nap.po b/nap/qt_nap.po
index 075d88b..c3b7557 100644
--- a/nap/qt_nap.po
+++ b/nap/qt_nap.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/nap/vidalia_nap.po b/nap/vidalia_nap.po
index 6b98109..e4f9534 100644
--- a/nap/vidalia_nap.po
+++ b/nap/vidalia_nap.po
@@ -4,7 +4,7 @@ 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-09-03 12:39+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ne/qt_ne.po b/ne/qt_ne.po
index 5e57801..1610f5e 100644
--- a/ne/qt_ne.po
+++ b/ne/qt_ne.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ne/vidalia_ne.po b/ne/vidalia_ne.po
index ca40fe1..0a1a5cc 100644
--- a/ne/vidalia_ne.po
+++ b/ne/vidalia_ne.po
@@ -4,7 +4,7 @@ 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-09-03 12:39+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/nn/qt_nn.po b/nn/qt_nn.po
index 957291a..16a79d2 100644
--- a/nn/qt_nn.po
+++ b/nn/qt_nn.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/nn/vidalia_nn.po b/nn/vidalia_nn.po
index 6058551..3fe3202 100644
--- a/nn/vidalia_nn.po
+++ b/nn/vidalia_nn.po
@@ -4,7 +4,7 @@ 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-09-03 12:39+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/nso/qt_nso.po b/nso/qt_nso.po
index 276f29b..5c27a81 100644
--- a/nso/qt_nso.po
+++ b/nso/qt_nso.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/nso/vidalia_nso.po b/nso/vidalia_nso.po
index e188954..285d312 100644
--- a/nso/vidalia_nso.po
+++ b/nso/vidalia_nso.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:12+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/oc/qt_oc.po b/oc/qt_oc.po
index fd2926a..f4ed2e4 100644
--- a/oc/qt_oc.po
+++ b/oc/qt_oc.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/oc/vidalia_oc.po b/oc/vidalia_oc.po
index 2f17341..3ea7416 100644
--- a/oc/vidalia_oc.po
+++ b/oc/vidalia_oc.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/or/qt_or.po b/or/qt_or.po
index 7ab26b8..cec89c8 100644
--- a/or/qt_or.po
+++ b/or/qt_or.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/or/vidalia_or.po b/or/vidalia_or.po
index 22b0f4e..d1880dc 100644
--- a/or/vidalia_or.po
+++ b/or/vidalia_or.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/pa/qt_pa.po b/pa/qt_pa.po
index 74bee92..7bdf2eb 100644
--- a/pa/qt_pa.po
+++ b/pa/qt_pa.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/pa/vidalia_pa.po b/pa/vidalia_pa.po
index bc45948..f7788f6 100755
--- a/pa/vidalia_pa.po
+++ b/pa/vidalia_pa.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/pap/qt_pap.po b/pap/qt_pap.po
index d305973..214a027 100644
--- a/pap/qt_pap.po
+++ b/pap/qt_pap.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/pap/vidalia_pap.po b/pap/vidalia_pap.po
index 64d7e84..93a9342 100644
--- a/pap/vidalia_pap.po
+++ b/pap/vidalia_pap.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/pms/qt_pms.po b/pms/qt_pms.po
index 5b69b65..2516d07 100644
--- a/pms/qt_pms.po
+++ b/pms/qt_pms.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/pms/vidalia_pms.po b/pms/vidalia_pms.po
index 0c15a75..f758017 100644
--- a/pms/vidalia_pms.po
+++ b/pms/vidalia_pms.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ps/qt_ps.po b/ps/qt_ps.po
index cc3bb21..5ef94a7 100644
--- a/ps/qt_ps.po
+++ b/ps/qt_ps.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ps/vidalia_ps.po b/ps/vidalia_ps.po
index 4118fb4..192535a 100644
--- a/ps/vidalia_ps.po
+++ b/ps/vidalia_ps.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/sco/qt_sco.po b/sco/qt_sco.po
index 43c449a..0590940 100644
--- a/sco/qt_sco.po
+++ b/sco/qt_sco.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/sco/vidalia_sco.po b/sco/vidalia_sco.po
index 1f625d3..ead55b7 100644
--- a/sco/vidalia_sco.po
+++ b/sco/vidalia_sco.po
@@ -4,7 +4,7 @@ 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-09-03 12:45+0000\n"
+"PO-Revision-Date: 2011-09-03 13:12+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/sk/qt_sk.po b/sk/qt_sk.po
index b17eb0b..f0176e3 100644
--- a/sk/qt_sk.po
+++ b/sk/qt_sk.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/sl/vidalia_sl.po b/sl/vidalia_sl.po
index a464ed1..50a3ee8 100644
--- a/sl/vidalia_sl.po
+++ b/sl/vidalia_sl.po
@@ -1,174 +1,196 @@
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 ""
 "Vidalia was unable to remove the Tor service.\n"
@@ -176,1559 +198,1328 @@ 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."
+msgctxt "CountryInfo"
+msgid "Mexico"
 msgstr ""
 
-#: helpbrowser.cpp:395
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
+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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+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 ""
 
-#: 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 +1527,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 +2010,378 @@ 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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
 msgstr ""
 
-#: mainwindow.cpp:1609
 msgctxt "MainWindow"
 msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+"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.cpp:1817
 msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "failed (%1)"
 msgstr ""
 
-#: mainwindow.cpp:1843
 msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
 msgstr ""
 
-#: mainwindow.cpp:1845
 msgctxt "MainWindow"
 msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+"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:1888
 msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
 msgstr ""
 
-#: mainwindow.cpp:1889
 msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid ", probably Telnet,"
 msgstr ""
 
-#: mainwindow.cpp:1890
 msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ", probably an email client,"
 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 +2390,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 +2409,1410 @@ 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 "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+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: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 "Invalid language code specified:"
 msgstr ""
 
-#: vidalia.cpp:273
 msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+msgid "Invalid GUI style specified:"
 msgstr ""
 
-#: vidalia.cpp:279
 msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
+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/so/qt_so.po b/so/qt_so.po
index 0797d11..c3edd8e 100644
--- a/so/qt_so.po
+++ b/so/qt_so.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/so/vidalia_so.po b/so/vidalia_so.po
index 22b0f4e..53b0567 100644
--- a/so/vidalia_so.po
+++ b/so/vidalia_so.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/son/qt_son.po b/son/qt_son.po
index ca0cf6d..514eedd 100644
--- a/son/qt_son.po
+++ b/son/qt_son.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/son/vidalia_son.po b/son/vidalia_son.po
index bcdf24f..cf8a4ba 100644
--- a/son/vidalia_son.po
+++ b/son/vidalia_son.po
@@ -4,7 +4,7 @@ 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-09-03 12:46+0000\n"
+"PO-Revision-Date: 2011-09-03 13:13+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/st/qt_st.po b/st/qt_st.po
index 0c50933..cc3ed53 100644
--- a/st/qt_st.po
+++ b/st/qt_st.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/st/vidalia_st.po b/st/vidalia_st.po
index 22b0f4e..e7a5d18 100644
--- a/st/vidalia_st.po
+++ b/st/vidalia_st.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:19+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/su/qt_su.po b/su/qt_su.po
index c1c0116..1a9f6e3 100644
--- a/su/qt_su.po
+++ b/su/qt_su.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/su/vidalia_su.po b/su/vidalia_su.po
index adf5c58..9a6e15c 100644
--- a/su/vidalia_su.po
+++ b/su/vidalia_su.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/sw/qt_sw.po b/sw/qt_sw.po
index 5b0a18f..2a89d0e 100644
--- a/sw/qt_sw.po
+++ b/sw/qt_sw.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/sw/vidalia_sw.po b/sw/vidalia_sw.po
index 432a836..4bb565a 100755
--- a/sw/vidalia_sw.po
+++ b/sw/vidalia_sw.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ta/qt_ta.po b/ta/qt_ta.po
index fdc9bd7..30bce5a 100644
--- a/ta/qt_ta.po
+++ b/ta/qt_ta.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po
index 6cd3932..13ff6aa 100644
--- a/ta/vidalia_ta.po
+++ b/ta/vidalia_ta.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/te/qt_te.po b/te/qt_te.po
index 267cd8e..845d6d9 100644
--- a/te/qt_te.po
+++ b/te/qt_te.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/te/vidalia_te.po b/te/vidalia_te.po
index 28155c7..6345190 100644
--- a/te/vidalia_te.po
+++ b/te/vidalia_te.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/tg/qt_tg.po b/tg/qt_tg.po
index d75b2fa..b69673c 100644
--- a/tg/qt_tg.po
+++ b/tg/qt_tg.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/tg/vidalia_tg.po b/tg/vidalia_tg.po
index 16c6a46..97db9ab 100644
--- a/tg/vidalia_tg.po
+++ b/tg/vidalia_tg.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/th/qt_th.po b/th/qt_th.po
index 40bb480..7a97b80 100644
--- a/th/qt_th.po
+++ b/th/qt_th.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ti/qt_ti.po b/ti/qt_ti.po
index 5405d06..094d402 100644
--- a/ti/qt_ti.po
+++ b/ti/qt_ti.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ti/vidalia_ti.po b/ti/vidalia_ti.po
index 194652d..75400ff 100644
--- a/ti/vidalia_ti.po
+++ b/ti/vidalia_ti.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/tk/qt_tk.po b/tk/qt_tk.po
index 2f82848..87ab6d3 100644
--- a/tk/qt_tk.po
+++ b/tk/qt_tk.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/tk/vidalia_tk.po b/tk/vidalia_tk.po
index 280f1f3..98fdb1d 100644
--- a/tk/vidalia_tk.po
+++ b/tk/vidalia_tk.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ur/qt_ur.po b/ur/qt_ur.po
index f36d98e..9da59f7 100644
--- a/ur/qt_ur.po
+++ b/ur/qt_ur.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ur/vidalia_ur.po b/ur/vidalia_ur.po
index 25b550b..be1fb19 100644
--- a/ur/vidalia_ur.po
+++ b/ur/vidalia_ur.po
@@ -4,7 +4,7 @@ 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-09-03 12:37+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/ve/qt_ve.po b/ve/qt_ve.po
index 50cdcbb..3dc0678 100644
--- a/ve/qt_ve.po
+++ b/ve/qt_ve.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/ve/vidalia_ve.po b/ve/vidalia_ve.po
index 45bc158..a2fa5c5 100644
--- a/ve/vidalia_ve.po
+++ b/ve/vidalia_ve.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/vi/qt_vi.po b/vi/qt_vi.po
index 678ff54..48943d2 100644
--- a/vi/qt_vi.po
+++ b/vi/qt_vi.po
@@ -4,7 +4,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-18 11:06+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/wa/qt_wa.po b/wa/qt_wa.po
index a1a50ff..00a5739 100644
--- a/wa/qt_wa.po
+++ b/wa/qt_wa.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/wa/vidalia_wa.po b/wa/vidalia_wa.po
index 22b0f4e..9560c90 100644
--- a/wa/vidalia_wa.po
+++ b/wa/vidalia_wa.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/wo/qt_wo.po b/wo/qt_wo.po
index 59d4df4..1cf35e1 100644
--- a/wo/qt_wo.po
+++ b/wo/qt_wo.po
@@ -4,7 +4,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-18 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/wo/vidalia_wo.po b/wo/vidalia_wo.po
index 22b0f4e..2672f73 100644
--- a/wo/vidalia_wo.po
+++ b/wo/vidalia_wo.po
@@ -1,15 +1,17 @@
-#, fuzzy
+# 
 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-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:18+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 +34,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 +80,6 @@ msgid "Vidalia was unable to install the Tor service."
 msgstr ""
 
 msgctxt "AdvancedPage"
-msgid "Control Port"
-msgstr ""
-
-msgctxt "AdvancedPage"
 msgid "Authentication:"
 msgstr ""
 
@@ -153,7 +136,64 @@ 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 ""
+"Vidalia was unable to remove the Tor service.\n"
 "\n"
 "You may need to remove it manually."
 msgstr ""
@@ -395,7 +435,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 +1153,10 @@ msgid "Zimbabwe"
 msgstr ""
 
 msgctxt "CountryInfo"
+msgid "Zaire"
+msgstr ""
+
+msgctxt "CountryInfo"
 msgid "Albania"
 msgstr ""
 
@@ -1206,6 +1252,62 @@ 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 ""
+"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 ""
+
+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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
+
 msgctxt "GeneralPage"
 msgid "Executables (*.exe)"
 msgstr ""
@@ -1223,10 +1325,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 +1521,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 +1536,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 +1581,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 +1818,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 +1856,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 +1878,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 +1900,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 +1910,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 +2004,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 +2026,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 +2040,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,22 +2058,38 @@ 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 ""
+
+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 "failed (%1)"
 msgstr ""
 
 msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
+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"
+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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
 "\n"
 "Please check the message log for recent warning or error messages."
 msgstr ""
@@ -1943,26 +2102,6 @@ msgctxt "MainWindow"
 msgid ", probably an email client,"
 msgstr ""
 
-msgctxt "MainWindow"
-msgid "Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "File"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Home"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Check For Updates"
-msgstr ""
-
 msgctxt "MessageLog"
 msgid "Error Setting Filter"
 msgstr ""
@@ -2204,10 +2343,6 @@ msgid "messages"
 msgstr ""
 
 msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
-
-msgctxt "MessageLog"
 msgid "Browse"
 msgstr ""
 
@@ -2220,34 +2355,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 +2526,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 +2554,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 +2586,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 +2600,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 +2624,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 +2814,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 +2890,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 +2948,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 +3010,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 +3029,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 +3046,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 +3060,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 +3078,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 +3100,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 +3177,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 +3474,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 +3593,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"
@@ -3149,6 +3664,14 @@ 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 ""
@@ -3254,7 +3777,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 +3814,5 @@ msgstr ""
 msgctxt "stringutil.h"
 msgid "%1 mins"
 msgstr ""
+
+
diff --git a/zh_HK/qt_zh_HK.po b/zh_HK/qt_zh_HK.po
index d9a1ae8..b856021 100644
--- a/zh_HK/qt_zh_HK.po
+++ b/zh_HK/qt_zh_HK.po
@@ -4,7 +4,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-18 11:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:20+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/zh_HK/vidalia_zh_HK.po b/zh_HK/vidalia_zh_HK.po
index f10c022..68ad5ac 100755
--- a/zh_HK/vidalia_zh_HK.po
+++ b/zh_HK/vidalia_zh_HK.po
@@ -4,7 +4,7 @@ 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-09-03 12:47+0000\n"
+"PO-Revision-Date: 2011-09-03 13:14+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
diff --git a/zu/qt_zu.po b/zu/qt_zu.po
index da31ae8..7577bf1 100644
--- a/zu/qt_zu.po
+++ b/zu/qt_zu.po
@@ -4,7 +4,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-18 11:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -430,3 +430,5 @@ msgstr ""
 msgctxt "QFileSystemModel"
 msgid "%1 bytes"
 msgstr ""
+
+
diff --git a/zu/vidalia_zu.po b/zu/vidalia_zu.po
index d96cf46..e56174b 100644
--- a/zu/vidalia_zu.po
+++ b/zu/vidalia_zu.po
@@ -4,7 +4,7 @@ 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-09-03 12:38+0000\n"
+"PO-Revision-Date: 2011-09-03 13:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"





More information about the tor-commits mailing list