[Pkg-privacy-commits] [vidalia] 70/160: Imported Upstream version 0.2.14
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository vidalia.
commit d893f35571650490354bff1a471db8ea590444be
Author: Dererk <dererk at debian.org>
Date: Mon Aug 29 09:41:04 2011 -0300
Imported Upstream version 0.2.14
---
CHANGELOG | 66 +-
CMakeLists.txt | 4 +-
debian/README.debs | 12 +-
pkg/win32/po/af/vidalia_af.po | 4 +-
pkg/win32/po/ak/vidalia_ak.po | 4 +-
pkg/win32/po/am/vidalia_am.po | 4 +-
pkg/win32/po/ar/vidalia_ar.po | 5 +-
pkg/win32/po/arn/vidalia_arn.po | 4 +-
pkg/win32/po/ast/vidalia_ast.po | 4 +-
pkg/win32/po/az/vidalia_az.po | 6 +-
pkg/win32/po/bg/vidalia_bg.po | 4 +-
pkg/win32/po/bn_IN/vidalia_bn_IN.po | 4 +-
pkg/win32/po/ca/vidalia_ca.po | 5 +-
pkg/win32/po/cs/vidalia_cs.po | 5 +-
pkg/win32/po/csb/vidalia_csb.po | 4 +-
pkg/win32/po/cy/vidalia_cy.po | 49 +-
pkg/win32/po/de/vidalia_de.po | 5 +-
pkg/win32/po/de_CH/vidalia_de_CH.po | 4 +-
pkg/win32/po/dz/vidalia_dz.po | 4 +-
pkg/win32/po/el/vidalia_el.po | 4 +
pkg/win32/po/eo/vidalia_eo.po | 4 +-
pkg/win32/po/es/vidalia_es.po | 5 +-
pkg/win32/po/et/vidalia_et.po | 5 +-
pkg/win32/po/eu/vidalia_eu.po | 4 +-
pkg/win32/po/fil/vidalia_fil.po | 4 +-
pkg/win32/po/fur/vidalia_fur.po | 4 +-
pkg/win32/po/ga/vidalia_ga.po | 4 +-
pkg/win32/po/gl/vidalia_gl.po | 4 +-
pkg/win32/po/gu/vidalia_gu.po | 4 +-
pkg/win32/po/gun/vidalia_gun.po | 4 +-
pkg/win32/po/ha/vidalia_ha.po | 4 +-
pkg/win32/po/he/vidalia_he.po | 5 +-
pkg/win32/po/hi/vidalia_hi.po | 4 +-
pkg/win32/po/hr/vidalia_hr.po | 4 +-
pkg/win32/po/ht/vidalia_ht.po | 4 +-
pkg/win32/po/hu/vidalia_hu.po | 4 +-
pkg/win32/po/id/vidalia_id.po | 5 +-
pkg/win32/po/is/vidalia_is.po | 4 +-
pkg/win32/po/it/vidalia_it.po | 5 +-
pkg/win32/po/kn/vidalia_kn.po | 4 +-
pkg/win32/po/lb/vidalia_lb.po | 4 +-
pkg/win32/po/ln/vidalia_ln.po | 4 +-
pkg/win32/po/lo/vidalia_lo.po | 4 +-
pkg/win32/po/lt/vidalia_lt.po | 4 +-
pkg/win32/po/lv/vidalia_lv.po | 4 +-
pkg/win32/po/mg/vidalia_mg.po | 4 +-
pkg/win32/po/mi/vidalia_mi.po | 4 +-
pkg/win32/po/mk/vidalia_mk.po | 4 +-
pkg/win32/po/ml/vidalia_ml.po | 4 +-
pkg/win32/po/mn/vidalia_mn.po | 4 +-
pkg/win32/po/mr/vidalia_mr.po | 4 +-
pkg/win32/po/ms/vidalia_ms.po | 4 +-
pkg/win32/po/mt/vidalia_mt.po | 4 +-
pkg/win32/po/my/vidalia_my.po | 5 +-
pkg/win32/po/nah/vidalia_nah.po | 4 +-
pkg/win32/po/nap/vidalia_nap.po | 4 +-
pkg/win32/po/nb/vidalia_nb.po | 5 +-
pkg/win32/po/ne/vidalia_ne.po | 4 +-
pkg/win32/po/nl/vidalia_nl.po | 5 +-
pkg/win32/po/nn/vidalia_nn.po | 4 +-
pkg/win32/po/nso/vidalia_nso.po | 4 +-
pkg/win32/po/oc/vidalia_oc.po | 4 +-
pkg/win32/po/pa/vidalia_pa.po | 4 +-
pkg/win32/po/pap/vidalia_pap.po | 4 +-
pkg/win32/po/pl/vidalia_pl.po | 5 +-
pkg/win32/po/pms/vidalia_pms.po | 4 +-
pkg/win32/po/ps/vidalia_ps.po | 4 +-
pkg/win32/po/pt/vidalia_pt.po | 5 +-
pkg/win32/po/pt_BR/vidalia_pt_BR.po | 4 +-
pkg/win32/po/ru/vidalia_ru.po | 5 +
pkg/win32/po/sco/vidalia_sco.po | 4 +-
pkg/win32/po/son/vidalia_son.po | 4 +-
pkg/win32/po/su/vidalia_su.po | 4 +-
pkg/win32/po/sw/vidalia_sw.po | 4 +-
pkg/win32/po/ta/vidalia_ta.po | 4 +-
pkg/win32/po/te/vidalia_te.po | 4 +-
pkg/win32/po/tg/vidalia_tg.po | 4 +-
pkg/win32/po/th/vidalia_th.po | 5 +-
pkg/win32/po/ti/vidalia_ti.po | 4 +-
pkg/win32/po/tk/vidalia_tk.po | 4 +-
pkg/win32/po/tr/vidalia_tr.po | 5 +-
pkg/win32/po/ur/vidalia_ur.po | 4 +-
pkg/win32/po/ve/vidalia_ve.po | 4 +-
pkg/win32/po/vi/vidalia_vi.po | 5 +-
pkg/win32/po/zh_CN/vidalia_zh_CN.po | 5 +-
pkg/win32/po/zh_HK/vidalia_zh_HK.po | 4 +-
pkg/win32/po/zu/vidalia_zu.po | 4 +-
src/common/procutil.cpp | 66 +-
src/common/procutil.h | 3 +-
src/torcontrol/TorControl.cpp | 20 +-
src/vidalia/CMakeLists.txt | 199 +-
src/vidalia/ControlPasswordInputDialog.cpp | 32 +-
src/vidalia/ControlPasswordInputDialog.h | 15 +
src/vidalia/ControlPasswordInputDialog.ui | 146 +-
src/vidalia/MainWindow.cpp | 2458 +++++++++++----------
src/vidalia/MainWindow.h | 158 +-
src/vidalia/MainWindow.ui | 634 +++++-
src/vidalia/StatusTab.cpp | 93 -
src/vidalia/StatusTab.h | 65 -
src/vidalia/StatusTab.ui | 154 --
src/vidalia/VClickLabel.cpp | 95 +
src/vidalia/VClickLabel.h | 59 +
src/vidalia/VTabWidget.cpp | 52 -
src/vidalia/VTabWidget.h | 43 -
src/vidalia/Vidalia.cpp | 16 +
src/vidalia/Vidalia.h | 2 +-
src/vidalia/VidaliaTab.cpp | 66 -
src/vidalia/VidaliaTab.h | 70 -
src/vidalia/bwgraph/BandwidthGraph.cpp | 27 +-
src/vidalia/bwgraph/BandwidthGraph.h | 12 +-
src/vidalia/bwgraph/BandwidthGraph.ui | 725 +++---
src/vidalia/config/AdvancedPage.cpp | 36 +-
src/vidalia/config/AdvancedPage.h | 3 +
src/vidalia/config/AdvancedPage.ui | 79 +-
src/vidalia/config/BridgeUsageDialog.ui | 63 +-
src/vidalia/config/ConfigDialog.h | 4 +-
src/vidalia/config/GeneralPage.ui | 109 +-
src/vidalia/config/ServerPage.cpp | 114 +-
src/vidalia/config/ServerPage.h | 6 +
src/vidalia/config/ServerPage.ui | 79 +-
src/vidalia/config/ServerSettings.cpp | 18 +-
src/vidalia/config/ServerSettings.h | 6 -
src/vidalia/config/ServicePage.h | 1 +
src/vidalia/config/ServicePage.ui | 117 +-
src/vidalia/config/TorSettings.cpp | 14 +
src/vidalia/config/TorSettings.h | 7 +
src/vidalia/config/TorrcDialog.cpp | 18 -
src/vidalia/config/TorrcDialog.h | 1 -
src/vidalia/config/TorrcDialog.ui | 259 ++-
src/vidalia/help/content/cs/bridges.html | 71 +
src/vidalia/help/content/cs/config.html | 185 ++
src/vidalia/help/content/cs/index.html | 41 +
src/vidalia/help/content/cs/links.html | 67 +
src/vidalia/help/content/cs/log.html | 102 +
src/vidalia/help/content/cs/netview.html | 174 ++
src/vidalia/help/content/cs/running.html | 105 +
src/vidalia/help/content/cs/server.html | 238 ++
src/vidalia/help/content/cs/services.html | 138 ++
src/vidalia/help/content/cs/troubleshooting.html | 155 ++
src/vidalia/help/content/eo/bridges.html | 71 +
src/vidalia/help/content/eo/config.html | 185 ++
src/vidalia/help/content/eo/index.html | 41 +
src/vidalia/help/content/eo/links.html | 67 +
src/vidalia/help/content/eo/log.html | 102 +
src/vidalia/help/content/eo/netview.html | 174 ++
src/vidalia/help/content/eo/running.html | 105 +
src/vidalia/help/content/eo/server.html | 238 ++
src/vidalia/help/content/eo/services.html | 138 ++
src/vidalia/help/content/eo/troubleshooting.html | 155 ++
src/vidalia/help/content/eu/bridges.html | 71 +
src/vidalia/help/content/eu/config.html | 185 ++
src/vidalia/help/content/eu/index.html | 41 +
src/vidalia/help/content/eu/links.html | 67 +
src/vidalia/help/content/eu/log.html | 102 +
src/vidalia/help/content/eu/netview.html | 174 ++
src/vidalia/help/content/eu/running.html | 105 +
src/vidalia/help/content/eu/server.html | 238 ++
src/vidalia/help/content/eu/services.html | 138 ++
src/vidalia/help/content/eu/troubleshooting.html | 155 ++
src/vidalia/help/content/fo/bridges.html | 71 +
src/vidalia/help/content/fo/log.html | 102 +
src/vidalia/help/content/fo/netview.html | 174 ++
src/vidalia/help/content/fo/running.html | 105 +
src/vidalia/help/content/fo/services.html | 138 ++
src/vidalia/help/content/fo/troubleshooting.html | 155 ++
src/vidalia/help/content/he/bridges.html | 71 +
src/vidalia/help/content/he/config.html | 185 ++
src/vidalia/help/content/he/index.html | 41 +
src/vidalia/help/content/he/links.html | 67 +
src/vidalia/help/content/he/log.html | 102 +
src/vidalia/help/content/he/netview.html | 174 ++
src/vidalia/help/content/he/running.html | 105 +
src/vidalia/help/content/he/server.html | 238 ++
src/vidalia/help/content/he/services.html | 138 ++
src/vidalia/help/content/he/troubleshooting.html | 155 ++
src/vidalia/help/content/ka/bridges.html | 71 +
src/vidalia/help/content/ka/config.html | 185 ++
src/vidalia/help/content/ka/index.html | 41 +
src/vidalia/help/content/ka/links.html | 67 +
src/vidalia/help/content/ka/log.html | 102 +
src/vidalia/help/content/ka/netview.html | 174 ++
src/vidalia/help/content/ka/running.html | 105 +
src/vidalia/help/content/ka/server.html | 238 ++
src/vidalia/help/content/ka/services.html | 138 ++
src/vidalia/help/content/ka/troubleshooting.html | 155 ++
src/vidalia/help/content/nap/bridges.html | 71 +
src/vidalia/help/content/nap/config.html | 185 ++
src/vidalia/help/content/nap/index.html | 41 +
src/vidalia/help/content/nap/links.html | 67 +
src/vidalia/help/content/nap/log.html | 102 +
src/vidalia/help/content/nap/netview.html | 174 ++
src/vidalia/help/content/nap/running.html | 105 +
src/vidalia/help/content/nap/server.html | 238 ++
src/vidalia/help/content/nap/services.html | 138 ++
src/vidalia/help/content/nap/troubleshooting.html | 155 ++
src/vidalia/help/content/po/af/links.po | 2 +-
src/vidalia/help/content/po/af/netview.po | 4 +-
src/vidalia/help/content/po/ak/links.po | 2 +-
src/vidalia/help/content/po/ak/netview.po | 4 +-
src/vidalia/help/content/po/am/links.po | 2 +-
src/vidalia/help/content/po/am/netview.po | 4 +-
src/vidalia/help/content/po/ar/links.po | 2 +-
src/vidalia/help/content/po/ar/netview.po | 74 +-
src/vidalia/help/content/po/arn/links.po | 2 +-
src/vidalia/help/content/po/arn/netview.po | 4 +-
src/vidalia/help/content/po/ast/links.po | 2 +-
src/vidalia/help/content/po/ast/netview.po | 4 +-
src/vidalia/help/content/po/az/links.po | 2 +-
src/vidalia/help/content/po/az/netview.po | 4 +-
src/vidalia/help/content/po/be/links.po | 2 +-
src/vidalia/help/content/po/be/netview.po | 4 +-
src/vidalia/help/content/po/bg/links.po | 2 +-
src/vidalia/help/content/po/bg/netview.po | 4 +-
src/vidalia/help/content/po/bn/links.po | 2 +-
src/vidalia/help/content/po/bn/netview.po | 4 +-
src/vidalia/help/content/po/bn_IN/links.po | 2 +-
src/vidalia/help/content/po/bn_IN/netview.po | 4 +-
src/vidalia/help/content/po/ca/netview.po | 4 +-
src/vidalia/help/content/po/cs/links.po | 2 +-
src/vidalia/help/content/po/cs/netview.po | 4 +-
src/vidalia/help/content/po/csb/links.po | 2 +-
src/vidalia/help/content/po/csb/netview.po | 4 +-
src/vidalia/help/content/po/cy/links.po | 2 +-
src/vidalia/help/content/po/cy/netview.po | 15 +-
src/vidalia/help/content/po/dz/links.po | 2 +-
src/vidalia/help/content/po/dz/netview.po | 4 +-
src/vidalia/help/content/po/el/links.po | 2 +-
src/vidalia/help/content/po/el/netview.po | 4 +-
src/vidalia/help/content/po/en/bridges.po | 2 +-
src/vidalia/help/content/po/en/config.po | 2 +-
src/vidalia/help/content/po/en/index.po | 2 +-
src/vidalia/help/content/po/en/links.po | 2 +-
src/vidalia/help/content/po/en/log.po | 2 +-
src/vidalia/help/content/po/en/netview.po | 2 +-
src/vidalia/help/content/po/en/running.po | 2 +-
src/vidalia/help/content/po/en/server.po | 2 +-
src/vidalia/help/content/po/en/services.po | 2 +-
src/vidalia/help/content/po/en/troubleshooting.po | 2 +-
src/vidalia/help/content/po/eo/links.po | 2 +-
src/vidalia/help/content/po/eo/netview.po | 4 +-
src/vidalia/help/content/po/es/links.po | 2 +-
src/vidalia/help/content/po/es/netview.po | 41 +-
src/vidalia/help/content/po/et/links.po | 2 +-
src/vidalia/help/content/po/et/netview.po | 4 +-
src/vidalia/help/content/po/eu/links.po | 2 +-
src/vidalia/help/content/po/eu/netview.po | 4 +-
src/vidalia/help/content/po/fil/links.po | 2 +-
src/vidalia/help/content/po/fil/netview.po | 4 +-
src/vidalia/help/content/po/fr/links.po | 2 +-
src/vidalia/help/content/po/fr/netview.po | 68 +-
src/vidalia/help/content/po/fur/links.po | 2 +-
src/vidalia/help/content/po/fur/netview.po | 4 +-
src/vidalia/help/content/po/ga/links.po | 2 +-
src/vidalia/help/content/po/ga/netview.po | 4 +-
src/vidalia/help/content/po/gl/links.po | 2 +-
src/vidalia/help/content/po/gl/netview.po | 4 +-
src/vidalia/help/content/po/gu/links.po | 2 +-
src/vidalia/help/content/po/gu/netview.po | 4 +-
src/vidalia/help/content/po/gun/links.po | 2 +-
src/vidalia/help/content/po/gun/netview.po | 4 +-
src/vidalia/help/content/po/ha/links.po | 2 +-
src/vidalia/help/content/po/ha/netview.po | 4 +-
src/vidalia/help/content/po/he/links.po | 2 +-
src/vidalia/help/content/po/he/netview.po | 4 +-
src/vidalia/help/content/po/hi/links.po | 2 +-
src/vidalia/help/content/po/hi/netview.po | 4 +-
src/vidalia/help/content/po/hr/links.po | 2 +-
src/vidalia/help/content/po/hr/netview.po | 4 +-
src/vidalia/help/content/po/ht/links.po | 2 +-
src/vidalia/help/content/po/ht/netview.po | 4 +-
src/vidalia/help/content/po/hu/links.po | 2 +-
src/vidalia/help/content/po/hu/netview.po | 4 +-
src/vidalia/help/content/po/id/links.po | 2 +-
src/vidalia/help/content/po/id/netview.po | 4 +-
src/vidalia/help/content/po/is/links.po | 2 +-
src/vidalia/help/content/po/is/netview.po | 4 +-
src/vidalia/help/content/po/it/links.po | 2 +-
src/vidalia/help/content/po/it/netview.po | 41 +-
src/vidalia/help/content/po/kn/links.po | 2 +-
src/vidalia/help/content/po/kn/netview.po | 4 +-
src/vidalia/help/content/po/kw/links.po | 2 +-
src/vidalia/help/content/po/kw/netview.po | 4 +-
src/vidalia/help/content/po/lb/links.po | 2 +-
src/vidalia/help/content/po/lb/netview.po | 4 +-
src/vidalia/help/content/po/ln/links.po | 2 +-
src/vidalia/help/content/po/ln/netview.po | 4 +-
src/vidalia/help/content/po/lo/links.po | 2 +-
src/vidalia/help/content/po/lo/netview.po | 4 +-
src/vidalia/help/content/po/lt/links.po | 2 +-
src/vidalia/help/content/po/lt/netview.po | 4 +-
src/vidalia/help/content/po/lv/links.po | 2 +-
src/vidalia/help/content/po/lv/netview.po | 4 +-
src/vidalia/help/content/po/mg/links.po | 2 +-
src/vidalia/help/content/po/mg/netview.po | 4 +-
src/vidalia/help/content/po/mi/links.po | 2 +-
src/vidalia/help/content/po/mi/netview.po | 4 +-
src/vidalia/help/content/po/mk/links.po | 2 +-
src/vidalia/help/content/po/mk/netview.po | 4 +-
src/vidalia/help/content/po/ml/links.po | 2 +-
src/vidalia/help/content/po/ml/netview.po | 4 +-
src/vidalia/help/content/po/mn/links.po | 2 +-
src/vidalia/help/content/po/mn/netview.po | 4 +-
src/vidalia/help/content/po/mr/links.po | 2 +-
src/vidalia/help/content/po/mr/netview.po | 4 +-
src/vidalia/help/content/po/ms/links.po | 2 +-
src/vidalia/help/content/po/ms/netview.po | 4 +-
src/vidalia/help/content/po/mt/links.po | 2 +-
src/vidalia/help/content/po/mt/netview.po | 4 +-
src/vidalia/help/content/po/my/links.po | 2 +-
src/vidalia/help/content/po/my/netview.po | 52 +-
src/vidalia/help/content/po/nap/links.po | 2 +-
src/vidalia/help/content/po/nap/netview.po | 4 +-
src/vidalia/help/content/po/nb/links.po | 2 +-
src/vidalia/help/content/po/nb/netview.po | 4 +-
src/vidalia/help/content/po/ne/links.po | 2 +-
src/vidalia/help/content/po/ne/netview.po | 4 +-
src/vidalia/help/content/po/nl/links.po | 2 +-
src/vidalia/help/content/po/nl/netview.po | 4 +-
src/vidalia/help/content/po/nn/links.po | 2 +-
src/vidalia/help/content/po/nn/netview.po | 4 +-
src/vidalia/help/content/po/nso/links.po | 2 +-
src/vidalia/help/content/po/nso/netview.po | 4 +-
src/vidalia/help/content/po/oc/links.po | 2 +-
src/vidalia/help/content/po/oc/netview.po | 4 +-
src/vidalia/help/content/po/pa/links.po | 2 +-
src/vidalia/help/content/po/pa/netview.po | 4 +-
src/vidalia/help/content/po/pap/links.po | 2 +-
src/vidalia/help/content/po/pap/netview.po | 4 +-
src/vidalia/help/content/po/pl/links.po | 2 +-
src/vidalia/help/content/po/pl/netview.po | 4 +-
src/vidalia/help/content/po/pms/links.po | 2 +-
src/vidalia/help/content/po/pms/netview.po | 4 +-
src/vidalia/help/content/po/ps/links.po | 2 +-
src/vidalia/help/content/po/ps/netview.po | 4 +-
src/vidalia/help/content/po/pt/links.po | 2 +-
src/vidalia/help/content/po/pt/netview.po | 4 +-
src/vidalia/help/content/po/pt_BR/links.po | 2 +-
src/vidalia/help/content/po/pt_BR/netview.po | 4 +-
src/vidalia/help/content/po/ro/links.po | 2 +-
src/vidalia/help/content/po/ro/netview.po | 4 +-
src/vidalia/help/content/po/ru/index.po | 2 +-
src/vidalia/help/content/po/ru/links.po | 2 +-
src/vidalia/help/content/po/ru/netview.po | 76 +-
src/vidalia/help/content/po/sco/links.po | 2 +-
src/vidalia/help/content/po/sco/netview.po | 4 +-
src/vidalia/help/content/po/son/links.po | 2 +-
src/vidalia/help/content/po/son/netview.po | 4 +-
src/vidalia/help/content/po/su/links.po | 2 +-
src/vidalia/help/content/po/su/netview.po | 4 +-
src/vidalia/help/content/po/sw/links.po | 2 +-
src/vidalia/help/content/po/sw/netview.po | 4 +-
src/vidalia/help/content/po/ta/links.po | 2 +-
src/vidalia/help/content/po/ta/netview.po | 4 +-
src/vidalia/help/content/po/te/links.po | 2 +-
src/vidalia/help/content/po/te/netview.po | 4 +-
src/vidalia/help/content/po/tg/links.po | 2 +-
src/vidalia/help/content/po/tg/netview.po | 4 +-
src/vidalia/help/content/po/th/links.po | 2 +-
src/vidalia/help/content/po/th/netview.po | 4 +-
src/vidalia/help/content/po/ti/links.po | 2 +-
src/vidalia/help/content/po/ti/netview.po | 4 +-
src/vidalia/help/content/po/tk/links.po | 2 +-
src/vidalia/help/content/po/tk/netview.po | 4 +-
src/vidalia/help/content/po/tr/links.po | 2 +-
src/vidalia/help/content/po/tr/netview.po | 4 +-
src/vidalia/help/content/po/uk/links.po | 2 +-
src/vidalia/help/content/po/uk/netview.po | 4 +-
src/vidalia/help/content/po/ur/links.po | 2 +-
src/vidalia/help/content/po/ur/netview.po | 4 +-
src/vidalia/help/content/po/ve/links.po | 2 +-
src/vidalia/help/content/po/ve/netview.po | 4 +-
src/vidalia/help/content/po/vi/links.po | 2 +-
src/vidalia/help/content/po/vi/netview.po | 4 +-
src/vidalia/help/content/po/wa/links.po | 2 +-
src/vidalia/help/content/po/wa/netview.po | 4 +-
src/vidalia/help/content/po/zh_CN/links.po | 2 +-
src/vidalia/help/content/po/zh_CN/netview.po | 4 +-
src/vidalia/help/content/po/zh_HK/links.po | 2 +-
src/vidalia/help/content/po/zh_HK/netview.po | 4 +-
src/vidalia/help/content/po/zh_TW/links.po | 2 +-
src/vidalia/help/content/po/zh_TW/netview.po | 4 +-
src/vidalia/help/content/po/zu/links.po | 2 +-
src/vidalia/help/content/po/zu/netview.po | 4 +-
src/vidalia/help/content/po2html.sh | 2 +-
src/vidalia/help/content/ru/index.html | 2 +-
src/vidalia/i18n/po/.tx/config | 125 +-
src/vidalia/i18n/po/af/vidalia_af.po | 300 +--
src/vidalia/i18n/po/ak/vidalia_ak.po | 300 +--
src/vidalia/i18n/po/am/vidalia_am.po | 300 +--
src/vidalia/i18n/po/ar/vidalia_ar.po | 325 +--
src/vidalia/i18n/po/arn/vidalia_arn.po | 300 +--
src/vidalia/i18n/po/ast/vidalia_ast.po | 300 +--
src/vidalia/i18n/po/az/vidalia_az.po | 300 +--
src/vidalia/i18n/po/bg/vidalia_bg.po | 303 +--
src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 300 +--
src/vidalia/i18n/po/ca/vidalia_ca.po | 300 +--
src/vidalia/i18n/po/cs/vidalia_cs.po | 307 +--
src/vidalia/i18n/po/csb/vidalia_csb.po | 300 +--
src/vidalia/i18n/po/cy/vidalia_cy.po | 737 +++---
src/vidalia/i18n/po/de/vidalia_de.po | 330 +--
src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 300 +--
src/vidalia/i18n/po/dz/vidalia_dz.po | 300 +--
src/vidalia/i18n/po/el/vidalia_el.po | 339 +--
src/vidalia/i18n/po/eo/vidalia_eo.po | 313 +--
src/vidalia/i18n/po/es/vidalia_es.po | 426 ++--
src/vidalia/i18n/po/et/vidalia_et.po | 300 +--
src/vidalia/i18n/po/eu/vidalia_eu.po | 300 +--
src/vidalia/i18n/po/fil/vidalia_fil.po | 300 +--
src/vidalia/i18n/po/fur/vidalia_fur.po | 300 +--
src/vidalia/i18n/po/ga/vidalia_ga.po | 300 +--
src/vidalia/i18n/po/gl/vidalia_gl.po | 300 +--
src/vidalia/i18n/po/gu/vidalia_gu.po | 301 +--
src/vidalia/i18n/po/gun/vidalia_gun.po | 300 +--
src/vidalia/i18n/po/ha/vidalia_ha.po | 300 +--
src/vidalia/i18n/po/he/vidalia_he.po | 305 +--
src/vidalia/i18n/po/hi/vidalia_hi.po | 301 +--
src/vidalia/i18n/po/hr/vidalia_hr.po | 300 +--
src/vidalia/i18n/po/ht/vidalia_ht.po | 300 +--
src/vidalia/i18n/po/hu/vidalia_hu.po | 1337 +++++------
src/vidalia/i18n/po/id/vidalia_id.po | 1714 +++++++-------
src/vidalia/i18n/po/is/vidalia_is.po | 305 +--
src/vidalia/i18n/po/it/vidalia_it.po | 321 +--
src/vidalia/i18n/po/kn/vidalia_kn.po | 300 +--
src/vidalia/i18n/po/lb/vidalia_lb.po | 300 +--
src/vidalia/i18n/po/ln/vidalia_ln.po | 300 +--
src/vidalia/i18n/po/lo/vidalia_lo.po | 300 +--
src/vidalia/i18n/po/lt/vidalia_lt.po | 300 +--
src/vidalia/i18n/po/lv/vidalia_lv.po | 300 +--
src/vidalia/i18n/po/mg/vidalia_mg.po | 300 +--
src/vidalia/i18n/po/mi/vidalia_mi.po | 300 +--
src/vidalia/i18n/po/mk/vidalia_mk.po | 300 +--
src/vidalia/i18n/po/ml/vidalia_ml.po | 300 +--
src/vidalia/i18n/po/mn/vidalia_mn.po | 300 +--
src/vidalia/i18n/po/mr/vidalia_mr.po | 300 +--
src/vidalia/i18n/po/ms/vidalia_ms.po | 300 +--
src/vidalia/i18n/po/mt/vidalia_mt.po | 300 +--
src/vidalia/i18n/po/my/vidalia_my.po | 315 +--
src/vidalia/i18n/po/nah/vidalia_nah.po | 300 +--
src/vidalia/i18n/po/nap/vidalia_nap.po | 300 +--
src/vidalia/i18n/po/nb/vidalia_nb.po | 320 +--
src/vidalia/i18n/po/ne/vidalia_ne.po | 300 +--
src/vidalia/i18n/po/nl/vidalia_nl.po | 800 ++++---
src/vidalia/i18n/po/nn/vidalia_nn.po | 300 +--
src/vidalia/i18n/po/nso/vidalia_nso.po | 300 +--
src/vidalia/i18n/po/oc/vidalia_oc.po | 300 +--
src/vidalia/i18n/po/pa/vidalia_pa.po | 300 +--
src/vidalia/i18n/po/pap/vidalia_pap.po | 300 +--
src/vidalia/i18n/po/pl/vidalia_pl.po | 320 +--
src/vidalia/i18n/po/pms/vidalia_pms.po | 300 +--
src/vidalia/i18n/po/ps/vidalia_ps.po | 300 +--
src/vidalia/i18n/po/pt/vidalia_pt.po | 971 ++++----
src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 312 +--
src/vidalia/i18n/po/ru/vidalia_ru.po | 322 +--
src/vidalia/i18n/po/sco/vidalia_sco.po | 300 +--
src/vidalia/i18n/po/son/vidalia_son.po | 300 +--
src/vidalia/i18n/po/su/vidalia_su.po | 300 +--
src/vidalia/i18n/po/sw/vidalia_sw.po | 300 +--
src/vidalia/i18n/po/ta/vidalia_ta.po | 300 +--
src/vidalia/i18n/po/te/vidalia_te.po | 300 +--
src/vidalia/i18n/po/templates/vidalia.pot | 262 ++-
src/vidalia/i18n/po/tg/vidalia_tg.po | 300 +--
src/vidalia/i18n/po/th/vidalia_th.po | 312 +--
src/vidalia/i18n/po/ti/vidalia_ti.po | 300 +--
src/vidalia/i18n/po/tk/vidalia_tk.po | 300 +--
src/vidalia/i18n/po/tr/vidalia_tr.po | 318 +--
src/vidalia/i18n/po/ur/vidalia_ur.po | 300 +--
src/vidalia/i18n/po/ve/vidalia_ve.po | 300 +--
src/vidalia/i18n/po/vi/vidalia_vi.po | 313 +--
src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 317 +--
src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 300 +--
src/vidalia/i18n/po/zu/vidalia_zu.po | 300 +--
src/vidalia/log/MessageLog.cpp | 79 +-
src/vidalia/log/MessageLog.h | 8 +-
src/vidalia/log/MessageLog.ui | 814 ++++---
src/vidalia/network/NetViewer.cpp | 20 +-
src/vidalia/network/NetViewer.h | 4 +-
src/vidalia/network/NetViewer.ui | 464 ++--
477 files changed, 29456 insertions(+), 17930 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index ee6c005..f39003e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,35 +1,43 @@
-0.3.0 06-May-2011
- o Vidalia has got a new GUI. Instead of separate dialogs, each functionality
- is organized in tabs arranged in a common main window. This new tab
- organization will give Vidalia a generic way of organizing the GUI plug-ins
- that will be available in later releases. Resolves bug 2939.
- o When a Tor instance is already running and Vidalia doesn't know the control
- password, don't ask for the it but rather explain the situation and display
- the few possible choices the user has. Resolves bug 2132.
- o Add an option for setting up a non-exit relay to the Sharing configuration
- panel. This is meant to clarify what an exit policy and an exit relay are.
- Resolves bug 2644.
- o Add a way to reload Tor's configuration without having to stop it. Tor can
- reload its configuration while it is running, Vidalia now provides a menu
- option for that, so, for example, relay operators won't be affected by the
- fact that their relay was down for a while. Resolves bug 2724.
- o Reintegrate Breakpad, and make available in other platforms other than
- Windows. Resolves bug 2105.
- o Fix bandwidth assigned to relays on the Network Map. A lot of relays are
- displaying an erroneous bandwidth and since they are ordered by that value
- in the Network Map, it leads to confusion. Vidalia now specifies the
- bandwidth as the minimum of the three possible values (burst, average and
- observed). Fixes bug 2744.
- o Minor change to the checkbox for starting Tor when Vidalia starts. It was
- suggested that the way the phrasing was done was missleading. Resolves bug
- 2806.
- o Add a way to bootstrap Tor's torrc file (copy the torrc to a given directory
- before Vidalia starts) so that packages such as Bridge-by-default portable
- bundles for OSX don't violate the directory structure of the operative
- system. Fixes bug 2821.
+0.2.14 26-Aug-2011
+ o Make the AutoPort setting default to false, so that it doesn't
+ break backwards compatibility for people that aren't using Vidalia
+ inside Tor Browser Bundle.
+
+0.2.13 10-Aug-2011
+ o Add a way to bootstrap Tor's torrc file (copy the torrc to a given
+ directory before Vidalia starts) so that packages such as
+ Bridge-by-default portable bundles for OSX don't violate the directory
+ structure of the operating system. Fixes bug 2821.
o Add the proper CA Certificates so that the "Find Bridges" button works
again. Fixes bug 2835.
o Update the useful links help page. Fixes bug 2809.
+ o Reintegrate Breakpad, and make it available in platforms other than
+ Windows. Resolves bug 2105.
+ o Fix bandwidth assigned to relays on the Network Map. A lot of relays are
+ displaying an erroneous bandwidth and since they are ordered by that
+ value in the Network Map, it leads to confusion. Vidalia now specifies
+ the bandwidth as the minimum of the three possible values (burst,
+ average and observed). Fixes bug 2744.
+ o Fix layouts in the configuration panel to make them look seamlessly
+ across all platforms.
+ o Add -no-remote parameter to Firefox so it allows another instance of
+ non-TBB Firefox. Fixes bug 2254.
+ o Add the possibility of changing the torrc path while Tor hasn't
+ started. Fixes bug 3109.
+ o Make the fact that bridges don't need a DirPort setting more clear by
+ removing the content of the field when disabling it. Fixes bug 3119.
+ o Improve command line parameter handling. Resolves bug 2965.
+ o Fix layout in BandwidthGraph to display labels correctly in every
+ language. Fixes bug 2500.
+ o Updates README.debs to reflect the change in the packaging now that
+ Vidalia uses Git. Fixes bug 3668.
+ o Add a way to use the autoconfiguration for ControlPort and SocksPort.
+ Tor can now autoconfigure Control and Socks Ports when the default ones
+ are in use. This makes it easier to run several different instances of
+ TBB at the same time. Resolves bug 3077.
+ o Provide the necessary fields (Control password, ControlPort) to let
+ TorButton NEWNYM. Vidalia provides these in env vars when it launches
+ the Firefox instance. Resolves bug 2659.
0.2.12 10-Apr-2011
o Vidalia's SVN repository has been migrated to Git. All branches but
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af75563..18f2575 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,8 @@
set(VER_MAJOR "0")
-set(VER_MINOR "3")
-set(VER_PATCH "0")
+set(VER_MINOR "2")
+set(VER_PATCH "14")
set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
message(STATUS "Configuring Vidalia ${VERSION}")
project(Vidalia)
diff --git a/debian/README.debs b/debian/README.debs
index 8dabfaf..bdf85d2 100644
--- a/debian/README.debs
+++ b/debian/README.debs
@@ -12,12 +12,15 @@ https://www.torproject.org/docs/debian-vidalia.html.en
Building your own
--------------------------------
If you would like to build your own packages, you can get the current
-debian/ directory by cloning the git repository:
+Debian source by cloning the Git repository.
-git clone http://git.debian.org/git/collab-maint/vidalia.git
+If you want to use git-buildpackage:
+ gbp-clone http://git.debian.org/git/collab-maint/vidalia.git
+then use git-buildpackage to build packages.
-Then move everything from the debian/0.2.x directory into the
-vidalia-x.x.x/debian/ directory and build packages as normal.
+Else, just clone the repository "normally":
+ git clone http://git.debian.org/git/collab-maint/vidalia.git
+then build packages as normal.
Instructions
--------------------------------
@@ -29,3 +32,4 @@ the following documentation:
3. https://www.netfort.gr.jp/~dancer/software/pbuilder-doc/pbuilder-doc.html
4. https://wiki.ubuntu.com/PackagingGuide/Complete
5. https://wiki.ubuntu.com/PbuilderHowto
+6. http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html
diff --git a/pkg/win32/po/af/vidalia_af.po b/pkg/win32/po/af/vidalia_af.po
index d9e2027..96bdce1 100755
--- a/pkg/win32/po/af/vidalia_af.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ak/vidalia_ak.po b/pkg/win32/po/ak/vidalia_ak.po
index 707d4a5..b34dff3 100644
--- a/pkg/win32/po/ak/vidalia_ak.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/am/vidalia_am.po b/pkg/win32/po/am/vidalia_am.po
index d5e1073..a6a90a9 100755
--- a/pkg/win32/po/am/vidalia_am.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ar/vidalia_ar.po b/pkg/win32/po/ar/vidalia_ar.po
index f31d661..878c65c 100644
--- a/pkg/win32/po/ar/vidalia_ar.po
+++ b/pkg/win32/po/ar/vidalia_ar.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -276,3 +277,5 @@ msgstr ""
"\n"
"أو إذا كنت تفضل تثبيت تور بدون فايرفوكس، ببساطة\n"
"إضغط \"التالي\" للاستمرار"
+
+
diff --git a/pkg/win32/po/arn/vidalia_arn.po b/pkg/win32/po/arn/vidalia_arn.po
index 082ebce..2a0f43e 100755
--- a/pkg/win32/po/arn/vidalia_arn.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ast/vidalia_ast.po b/pkg/win32/po/ast/vidalia_ast.po
index 87b1b47..3745a2d 100755
--- a/pkg/win32/po/ast/vidalia_ast.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/az/vidalia_az.po b/pkg/win32/po/az/vidalia_az.po
index 6a28bb4..504f330 100755
--- a/pkg/win32/po/az/vidalia_az.po
+++ b/pkg/win32/po/az/vidalia_az.po
@@ -1,10 +1,12 @@
#
+# Ulviyya Guliyeva <guliyeva171 at gmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -275,3 +277,5 @@ msgstr ""
" Tor qurgusunu davam etdirə bilərsiniz.\n"
"\n"
"Və ya əgər siz Firefox-suz Tor quraşdırmağı üstün tutardınızsa, sadəcəSonrakı -nı klikləyərək davam edə bilərsiniz."
+
+
diff --git a/pkg/win32/po/bg/vidalia_bg.po b/pkg/win32/po/bg/vidalia_bg.po
index 00f335d..cc6c1eb 100755
--- a/pkg/win32/po/bg/vidalia_bg.po
+++ b/pkg/win32/po/bg/vidalia_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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/bn_IN/vidalia_bn_IN.po b/pkg/win32/po/bn_IN/vidalia_bn_IN.po
index b018b91..2c43845 100755
--- a/pkg/win32/po/bn_IN/vidalia_bn_IN.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ca/vidalia_ca.po b/pkg/win32/po/ca/vidalia_ca.po
index 8393dcf..cb45034 100755
--- a/pkg/win32/po/ca/vidalia_ca.po
+++ b/pkg/win32/po/ca/vidalia_ca.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -268,3 +269,5 @@ msgstr ""
"\n"
"O si prefereixes continuar amb la instal·lació de Tor sense Firefox\n"
"prem Next per continuar."
+
+
diff --git a/pkg/win32/po/cs/vidalia_cs.po b/pkg/win32/po/cs/vidalia_cs.po
index 7cfb4e8..4e39746 100644
--- a/pkg/win32/po/cs/vidalia_cs.po
+++ b/pkg/win32/po/cs/vidalia_cs.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -273,3 +274,5 @@ msgstr ""
"\n"
"Pokud preferujete instalovat Tor bez prohlížeče Firefox, jednoduše\n"
"klikněte na Pokračovat."
+
+
diff --git a/pkg/win32/po/csb/vidalia_csb.po b/pkg/win32/po/csb/vidalia_csb.po
index d2afbb8..7dfc0f6 100755
--- a/pkg/win32/po/csb/vidalia_csb.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/cy/vidalia_cy.po b/pkg/win32/po/cy/vidalia_cy.po
index 36f8891..32869fa 100755
--- a/pkg/win32/po/cy/vidalia_cy.po
+++ b/pkg/win32/po/cy/vidalia_cy.po
@@ -1,11 +1,12 @@
#
+# cymro <markives at hotmail.co.uk>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2011-05-15 14:48+0000\n"
+"Last-Translator: cymro <markives at hotmail.co.uk>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -15,7 +16,7 @@ msgstr ""
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
-msgstr ""
+msgstr "$ {BUNDLE_NAME} gosodiad"
msgctxt "BundleWelcomeText"
msgid ""
@@ -31,14 +32,25 @@ msgid ""
"\n"
"$_CLICK"
msgstr ""
+"Bydd y dewin yma yn eich arweini chi drwy osod Tor, Vidalia, Polipo, a Torbutton.\n"
+"\n"
+"Mae Tor yn system ar gyfer defnyddio'r Rhyngrwyd yn ddi-enw, gan eich helpu anhysbyseddu pori'r We a chyhoeddi, negeseuon gwib, IRC, a mwy. Mae Vidalia yn GUI sy'n eich helpu chi reoli, monitro, a ffurfweddu Tor.\n"
+"\n"
+"Mae Polipo yn storfa procsi gwe sy'n helpu perfformiad gynnydd pori'r we drwy Tor.\n"
+"\n"
+"Mae Torbutton yn estyniad Firefox sy'n caniatáu i chi yn sydun i galluogi neu analluogi pori'r we yn ddienw.\n"
+"\n"
+"Os ydych chi eisoes wedi gosod Tor, Vidalia, Polipo, neu Firefox, gwnewch yn siwr nad ydynt yn cael eu cynnal cyn parhau gosodiad hwn.\n"
+"\n"
+"$_CLICK"
msgctxt "BundleWelcomeTitle"
msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr ""
+msgstr "Croeso i ${BUNDLE_NAME} Dewin Gosod"
msgctxt "BundleLinkText"
msgid "${TOR_NAME} installation documentation"
-msgstr ""
+msgstr "${TOR_NAME} ddogfennaeth gosod"
msgctxt "BundleFinishText"
msgid ""
@@ -47,22 +59,27 @@ msgid ""
"\n"
"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
+"Gosodiad yn gyflawn.\n"
+"Gweler https://www.torproject.org/docs/tor-doc-windows i ddysgu sut i ffurfweddu eich ceisiadau i ddefnyddio Tor.\n"
+"\n"
+"Os rydych wedi gosod Torbutton, bydd angen i chi ailddechrau Firefox."
msgctxt "BundleRunNow"
msgid "Run installed components now"
-msgstr ""
+msgstr "Rhedwch cydrannau sydd wedi cael ei oosod yn awr"
msgctxt "VidaliaGroupDesc"
msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
msgstr ""
+"Mae Vidalia yn GUI sy'n eich helpu i reoli, monitro, a ffurfweddu Tor."
msgctxt "VidaliaUninstDesc"
msgid "Remove ${VIDALIA_DESC}."
-msgstr ""
+msgstr "Tynnu ${VIDALIA_DESC}."
msgctxt "VidaliaSetupCaption"
msgid "${VIDALIA_NAME} setup"
-msgstr ""
+msgstr "${VIDALIA_NAME} gosodiad"
msgctxt "VidaliaWelcomeText"
msgid ""
@@ -70,30 +87,34 @@ msgid ""
"\n"
"$_CLICK"
msgstr ""
+"Bydd y dewin yma yn eich arwain chi trwy osod Vidalia, GUI sy'n eich helpu i reoli, monitro, a ffurfweddu Tor.\n"
+"\n"
+"$_CLICK"
msgctxt "VidaliaWelcomeTitle"
msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
-msgstr ""
+msgstr "Croeso i'r ${VIDALIA_NAME} Dewin Gosod"
msgctxt "VidaliaLinkText"
msgid "${VIDALIA_NAME} homepage"
-msgstr ""
+msgstr "$ {VIDALIA_NAME} hafan"
msgctxt "VidaliaAppDesc"
msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
msgstr ""
+"Mae Vidalia yn GUI sy'n eich helpu i reoli, monitro, a ffurfweddu Tor."
msgctxt "VidaliaStartup"
msgid "Run At Startup"
-msgstr ""
+msgstr "Rheded Ar Gosodiad"
msgctxt "VidaliaStartupDesc"
msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr ""
+msgstr "Rhedeg ${VIDALIA_NAME} yn awtamatig wrth gosod."
msgctxt "VidaliaShortcuts"
msgid "Add to Start Menu"
-msgstr ""
+msgstr "Ychwanegu at Ddewislen Cychwyn"
msgctxt "VidaliaShortcutsDesc"
msgid "Add ${VIDALIA_NAME} to your Start menu."
@@ -236,3 +257,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/de/vidalia_de.po b/pkg/win32/po/de/vidalia_de.po
index badea4b..9ece60b 100644
--- a/pkg/win32/po/de/vidalia_de.po
+++ b/pkg/win32/po/de/vidalia_de.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -282,3 +283,5 @@ msgstr ""
"\n"
"Falls Sie es vorziehen, Tor ohne Firefox zu installieren, klicken\n"
"Sie einfach auf Weiter,"
+
+
diff --git a/pkg/win32/po/de_CH/vidalia_de_CH.po b/pkg/win32/po/de_CH/vidalia_de_CH.po
index da198b5..3260e99 100755
--- a/pkg/win32/po/de_CH/vidalia_de_CH.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/dz/vidalia_dz.po b/pkg/win32/po/dz/vidalia_dz.po
index f5cee71..ad6794b 100755
--- a/pkg/win32/po/dz/vidalia_dz.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/el/vidalia_el.po b/pkg/win32/po/el/vidalia_el.po
index a0a1311..40b0a25 100755
--- a/pkg/win32/po/el/vidalia_el.po
+++ b/pkg/win32/po/el/vidalia_el.po
@@ -1,4 +1,6 @@
#
+# Γιάννης <yannanth at gmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
@@ -280,3 +282,5 @@ msgstr ""
"εγκαταστάτη του Tor.\n"
"Ενναλακτικά, εάν θα προτιμούσατε να εγκαταστησετε το Tor χωρίς το Firefox,\n"
"απλώς πατήστε «Επόμενο» για να συνεχίσετε."
+
+
diff --git a/pkg/win32/po/eo/vidalia_eo.po b/pkg/win32/po/eo/vidalia_eo.po
index b6a4349..4143410 100755
--- a/pkg/win32/po/eo/vidalia_eo.po
+++ b/pkg/win32/po/eo/vidalia_eo.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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/es/vidalia_es.po b/pkg/win32/po/es/vidalia_es.po
index 02e5913..cac6431 100644
--- a/pkg/win32/po/es/vidalia_es.po
+++ b/pkg/win32/po/es/vidalia_es.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
@@ -280,3 +281,5 @@ msgstr ""
"\n"
"O, si prefieres instalar Tor sin Firefox, simplemente\n"
"pulse Continuar."
+
+
diff --git a/pkg/win32/po/et/vidalia_et.po b/pkg/win32/po/et/vidalia_et.po
index 9fc7f62..531101f 100644
--- a/pkg/win32/po/et/vidalia_et.po
+++ b/pkg/win32/po/et/vidalia_et.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -281,3 +282,5 @@ msgstr ""
"uuesti käivitada.\n"
"\n"
"Kui sa soovid Tori installeerida ilma Firefoxita, jätka lihtsalt installatsiooniga."
+
+
diff --git a/pkg/win32/po/eu/vidalia_eu.po b/pkg/win32/po/eu/vidalia_eu.po
index 200446a..bc36cf7 100755
--- a/pkg/win32/po/eu/vidalia_eu.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/fil/vidalia_fil.po b/pkg/win32/po/fil/vidalia_fil.po
index 265c869..a56be46 100755
--- a/pkg/win32/po/fil/vidalia_fil.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/fur/vidalia_fur.po b/pkg/win32/po/fur/vidalia_fur.po
index c85ec51..1169170 100755
--- a/pkg/win32/po/fur/vidalia_fur.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ga/vidalia_ga.po b/pkg/win32/po/ga/vidalia_ga.po
index c5b5ac3..963a95b 100755
--- a/pkg/win32/po/ga/vidalia_ga.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/gl/vidalia_gl.po b/pkg/win32/po/gl/vidalia_gl.po
index f6840a3..e56c358 100755
--- a/pkg/win32/po/gl/vidalia_gl.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/gu/vidalia_gu.po b/pkg/win32/po/gu/vidalia_gu.po
index a4ebbfe..7228db6 100755
--- a/pkg/win32/po/gu/vidalia_gu.po
+++ b/pkg/win32/po/gu/vidalia_gu.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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/gun/vidalia_gun.po b/pkg/win32/po/gun/vidalia_gun.po
index bb9ed37..2dd9b8a 100755
--- a/pkg/win32/po/gun/vidalia_gun.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ha/vidalia_ha.po b/pkg/win32/po/ha/vidalia_ha.po
index ea52bbf..b5a9e84 100755
--- a/pkg/win32/po/ha/vidalia_ha.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/he/vidalia_he.po b/pkg/win32/po/he/vidalia_he.po
index 9925c35..0a036fe 100644
--- a/pkg/win32/po/he/vidalia_he.po
+++ b/pkg/win32/po/he/vidalia_he.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -249,3 +250,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/hi/vidalia_hi.po b/pkg/win32/po/hi/vidalia_hi.po
index 0ff1deb..b18a2f1 100755
--- a/pkg/win32/po/hi/vidalia_hi.po
+++ b/pkg/win32/po/hi/vidalia_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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/hr/vidalia_hr.po b/pkg/win32/po/hr/vidalia_hr.po
index b4af1f0..1625b25 100755
--- a/pkg/win32/po/hr/vidalia_hr.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ht/vidalia_ht.po b/pkg/win32/po/ht/vidalia_ht.po
index 6346d36..464e8df 100755
--- a/pkg/win32/po/ht/vidalia_ht.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/hu/vidalia_hu.po b/pkg/win32/po/hu/vidalia_hu.po
index 062f087..8ba987c 100755
--- a/pkg/win32/po/hu/vidalia_hu.po
+++ b/pkg/win32/po/hu/vidalia_hu.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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/id/vidalia_id.po b/pkg/win32/po/id/vidalia_id.po
index 75a3521..0878848 100755
--- a/pkg/win32/po/id/vidalia_id.po
+++ b/pkg/win32/po/id/vidalia_id.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -264,3 +265,5 @@ msgstr ""
"Ketika Anda telah selesai menginstall Firefox, Anda harus menjalankan Tor Installer sekali lagi.\n"
"\n"
"Atau, jika Anda memilih untuk menginstall Tor tanpa Firefox, tekan tombol Lanjut."
+
+
diff --git a/pkg/win32/po/is/vidalia_is.po b/pkg/win32/po/is/vidalia_is.po
index 3615c7a..9c7adc7 100755
--- a/pkg/win32/po/is/vidalia_is.po
+++ b/pkg/win32/po/is/vidalia_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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/it/vidalia_it.po b/pkg/win32/po/it/vidalia_it.po
index f206616..289ac77 100644
--- a/pkg/win32/po/it/vidalia_it.po
+++ b/pkg/win32/po/it/vidalia_it.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -281,3 +282,5 @@ msgstr ""
"\n"
"O, se preferisci installare Tor senza Firefox,\n"
"premi Avanti per continuare"
+
+
diff --git a/pkg/win32/po/kn/vidalia_kn.po b/pkg/win32/po/kn/vidalia_kn.po
index 8956c98..5f2684f 100755
--- a/pkg/win32/po/kn/vidalia_kn.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/lb/vidalia_lb.po b/pkg/win32/po/lb/vidalia_lb.po
index ffdfa4d..2f9d267 100755
--- a/pkg/win32/po/lb/vidalia_lb.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ln/vidalia_ln.po b/pkg/win32/po/ln/vidalia_ln.po
index d438efc..5ee213a 100755
--- a/pkg/win32/po/ln/vidalia_ln.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/lo/vidalia_lo.po b/pkg/win32/po/lo/vidalia_lo.po
index c65ea65..b8944d6 100755
--- a/pkg/win32/po/lo/vidalia_lo.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/lt/vidalia_lt.po b/pkg/win32/po/lt/vidalia_lt.po
index 5922c84..d4c2a5d 100755
--- a/pkg/win32/po/lt/vidalia_lt.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/lv/vidalia_lv.po b/pkg/win32/po/lv/vidalia_lv.po
index d8e70e4..8a6e82b 100755
--- a/pkg/win32/po/lv/vidalia_lv.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/mg/vidalia_mg.po b/pkg/win32/po/mg/vidalia_mg.po
index 79451bb..dcad8a1 100755
--- a/pkg/win32/po/mg/vidalia_mg.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/mi/vidalia_mi.po b/pkg/win32/po/mi/vidalia_mi.po
index 1394c29..0ffb72c 100755
--- a/pkg/win32/po/mi/vidalia_mi.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/mk/vidalia_mk.po b/pkg/win32/po/mk/vidalia_mk.po
index 2efa63d..9e950b9 100755
--- a/pkg/win32/po/mk/vidalia_mk.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ml/vidalia_ml.po b/pkg/win32/po/ml/vidalia_ml.po
index 506e72a..030cc06 100755
--- a/pkg/win32/po/ml/vidalia_ml.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/mn/vidalia_mn.po b/pkg/win32/po/mn/vidalia_mn.po
index e81f0ee..a7e9b3e 100755
--- a/pkg/win32/po/mn/vidalia_mn.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/mr/vidalia_mr.po b/pkg/win32/po/mr/vidalia_mr.po
index 7796ef5..1e90ae8 100755
--- a/pkg/win32/po/mr/vidalia_mr.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ms/vidalia_ms.po b/pkg/win32/po/ms/vidalia_ms.po
index aad06e3..c389176 100755
--- a/pkg/win32/po/ms/vidalia_ms.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/mt/vidalia_mt.po b/pkg/win32/po/mt/vidalia_mt.po
index 39e4244..a8af285 100755
--- a/pkg/win32/po/mt/vidalia_mt.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/my/vidalia_my.po b/pkg/win32/po/my/vidalia_my.po
index 46befc5..8272d64 100755
--- a/pkg/win32/po/my/vidalia_my.po
+++ b/pkg/win32/po/my/vidalia_my.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -269,3 +270,5 @@ msgstr ""
"\n"
"သုိ႕မဟုတ္ Firefox ထည့္သြင္းျခင္း မျပဳဘဲ Tor ကို ထည့္သြင္းလုိပါလွ်င္ \n"
"Next ကုိ ႏွိပ္၍ ဆက္လက္လုပ္ေဆာင္ႏုိင္ပါသည္"
+
+
diff --git a/pkg/win32/po/nah/vidalia_nah.po b/pkg/win32/po/nah/vidalia_nah.po
index 54ab505..f90c4f6 100755
--- a/pkg/win32/po/nah/vidalia_nah.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/nap/vidalia_nap.po b/pkg/win32/po/nap/vidalia_nap.po
index 5756df9..e87d448 100755
--- a/pkg/win32/po/nap/vidalia_nap.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/nb/vidalia_nb.po b/pkg/win32/po/nb/vidalia_nb.po
index af95788..3de10a1 100755
--- a/pkg/win32/po/nb/vidalia_nb.po
+++ b/pkg/win32/po/nb/vidalia_nb.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -266,3 +267,5 @@ msgstr ""
"Når du er ferdig med å innstallere Firefox kan du kjøre Tor-innstallasjonen på nytt.\n"
"\n"
"Eller, hvis du vil innstallere Tor uten Firefox, trykk Neste for å fortsette."
+
+
diff --git a/pkg/win32/po/ne/vidalia_ne.po b/pkg/win32/po/ne/vidalia_ne.po
index 0bf0b42..7f4496a 100755
--- a/pkg/win32/po/ne/vidalia_ne.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/nl/vidalia_nl.po b/pkg/win32/po/nl/vidalia_nl.po
index dbe4361..1489c73 100644
--- a/pkg/win32/po/nl/vidalia_nl.po
+++ b/pkg/win32/po/nl/vidalia_nl.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -279,3 +280,5 @@ msgstr ""
"\n"
"Of, indien U Tor wil installeren zonder Firefox, druk \n"
"Volgende om verder te gaan."
+
+
diff --git a/pkg/win32/po/nn/vidalia_nn.po b/pkg/win32/po/nn/vidalia_nn.po
index 309cac4..f476847 100755
--- a/pkg/win32/po/nn/vidalia_nn.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/nso/vidalia_nso.po b/pkg/win32/po/nso/vidalia_nso.po
index 5cec10c..5e68ab2 100755
--- a/pkg/win32/po/nso/vidalia_nso.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/oc/vidalia_oc.po b/pkg/win32/po/oc/vidalia_oc.po
index 24d8fbc..191334a 100755
--- a/pkg/win32/po/oc/vidalia_oc.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/pa/vidalia_pa.po b/pkg/win32/po/pa/vidalia_pa.po
index 0563f13..b89f84b 100755
--- a/pkg/win32/po/pa/vidalia_pa.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/pap/vidalia_pap.po b/pkg/win32/po/pap/vidalia_pap.po
index fcad213..65c86ef 100755
--- a/pkg/win32/po/pap/vidalia_pap.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/pl/vidalia_pl.po b/pkg/win32/po/pl/vidalia_pl.po
index 0b537fc..1f3b038 100644
--- a/pkg/win32/po/pl/vidalia_pl.po
+++ b/pkg/win32/po/pl/vidalia_pl.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -280,3 +281,5 @@ msgstr ""
"Gdy zakończysz instalowanie Firefoxa, możesz ponownie uruchomić instalatora Tor.\n"
"\n"
"Albo, jeśli preferujesz zainstalować Tora bez Firefoxa, po prostu kliknij Kontynuuj."
+
+
diff --git a/pkg/win32/po/pms/vidalia_pms.po b/pkg/win32/po/pms/vidalia_pms.po
index a7ef9a4..c8ec183 100755
--- a/pkg/win32/po/pms/vidalia_pms.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ps/vidalia_ps.po b/pkg/win32/po/ps/vidalia_ps.po
index e651a04..eef2b2d 100644
--- a/pkg/win32/po/ps/vidalia_ps.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/pt/vidalia_pt.po b/pkg/win32/po/pt/vidalia_pt.po
index 9490ef3..ff0b115 100644
--- a/pkg/win32/po/pt/vidalia_pt.po
+++ b/pkg/win32/po/pt/vidalia_pt.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -278,3 +279,5 @@ msgstr ""
"Quando terminar de instalar o Firefox, pode executar o instalador do Tor novamente.\n"
"\n"
"Ou, se você preferir instalar o Tor sem o Firefox, simplesmente clique Seguinte para continuar."
+
+
diff --git a/pkg/win32/po/pt_BR/vidalia_pt_BR.po b/pkg/win32/po/pt_BR/vidalia_pt_BR.po
index f8def11..f4961d9 100755
--- a/pkg/win32/po/pt_BR/vidalia_pt_BR.po
+++ b/pkg/win32/po/pt_BR/vidalia_pt_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-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ru/vidalia_ru.po b/pkg/win32/po/ru/vidalia_ru.po
index 4067e6b..4136d40 100644
--- a/pkg/win32/po/ru/vidalia_ru.po
+++ b/pkg/win32/po/ru/vidalia_ru.po
@@ -1,4 +1,7 @@
#
+# RK2 <nord115 at mail.ru>, 2011.
+# Андрей Костенко <andrey at kostenko.name>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
@@ -279,3 +282,5 @@ msgstr ""
"⏎\n"
"Если вы не хотите устанавливать Firefox, просто⏎\n"
"нажмите \"Далее\"."
+
+
diff --git a/pkg/win32/po/sco/vidalia_sco.po b/pkg/win32/po/sco/vidalia_sco.po
index 98a1868..014d688 100755
--- a/pkg/win32/po/sco/vidalia_sco.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/son/vidalia_son.po b/pkg/win32/po/son/vidalia_son.po
index dab2414..ebe32a1 100755
--- a/pkg/win32/po/son/vidalia_son.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/su/vidalia_su.po b/pkg/win32/po/su/vidalia_su.po
index 52232de..d6bc462 100755
--- a/pkg/win32/po/su/vidalia_su.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/sw/vidalia_sw.po b/pkg/win32/po/sw/vidalia_sw.po
index f3550cd..c7e5a0d 100755
--- a/pkg/win32/po/sw/vidalia_sw.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ta/vidalia_ta.po b/pkg/win32/po/ta/vidalia_ta.po
index a1e5aaa..d74e088 100755
--- a/pkg/win32/po/ta/vidalia_ta.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/te/vidalia_te.po b/pkg/win32/po/te/vidalia_te.po
index 8ad0952..c538c48 100755
--- a/pkg/win32/po/te/vidalia_te.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/tg/vidalia_tg.po b/pkg/win32/po/tg/vidalia_tg.po
index cecc03f..8a058c1 100755
--- a/pkg/win32/po/tg/vidalia_tg.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/th/vidalia_th.po b/pkg/win32/po/th/vidalia_th.po
index 425d415..d61b74a 100755
--- a/pkg/win32/po/th/vidalia_th.po
+++ b/pkg/win32/po/th/vidalia_th.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -242,3 +243,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ti/vidalia_ti.po b/pkg/win32/po/ti/vidalia_ti.po
index a496ed9..a6c9892 100755
--- a/pkg/win32/po/ti/vidalia_ti.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/tk/vidalia_tk.po b/pkg/win32/po/tk/vidalia_tk.po
index ef1e357..d6b3bc9 100755
--- a/pkg/win32/po/tk/vidalia_tk.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/tr/vidalia_tr.po b/pkg/win32/po/tr/vidalia_tr.po
index 31bc57f..3bd36d4 100644
--- a/pkg/win32/po/tr/vidalia_tr.po
+++ b/pkg/win32/po/tr/vidalia_tr.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -280,3 +281,5 @@ msgstr ""
"\n"
"Ya da Tor'u Firefox olmadan kullanmak istiyorsanız\n"
"basitçe Devam'a tıklayın."
+
+
diff --git a/pkg/win32/po/ur/vidalia_ur.po b/pkg/win32/po/ur/vidalia_ur.po
index 88ae6e0..24408b2 100644
--- a/pkg/win32/po/ur/vidalia_ur.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/ve/vidalia_ve.po b/pkg/win32/po/ve/vidalia_ve.po
index acee9c9..1246fe5 100755
--- a/pkg/win32/po/ve/vidalia_ve.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/vi/vidalia_vi.po b/pkg/win32/po/vi/vidalia_vi.po
index bbfd5a6..2f6fa6f 100755
--- a/pkg/win32/po/vi/vidalia_vi.po
+++ b/pkg/win32/po/vi/vidalia_vi.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"PO-Revision-Date: 2011-08-10 11:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -265,3 +266,5 @@ msgstr ""
"\n"
" Hoặc, nếu bạn muốn cài đặt Tor mà không có Firefox, bạn chỉ cần\n"
" nhấn nút Kế tiếp để tiếp tục."
+
+
diff --git a/pkg/win32/po/zh_CN/vidalia_zh_CN.po b/pkg/win32/po/zh_CN/vidalia_zh_CN.po
index 4792574..6afa01c 100644
--- a/pkg/win32/po/zh_CN/vidalia_zh_CN.po
+++ b/pkg/win32/po/zh_CN/vidalia_zh_CN.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -264,3 +265,5 @@ msgstr ""
"当您完成 Firefox 的安装后，再运行 Tor 安装程序。\n"
"\n"
"如果您希望仅安装 Tor 而不使用 Firefox，请点击 下一步 继续安装。"
+
+
diff --git a/pkg/win32/po/zh_HK/vidalia_zh_HK.po b/pkg/win32/po/zh_HK/vidalia_zh_HK.po
index d4694a8..0da9632 100755
--- a/pkg/win32/po/zh_HK/vidalia_zh_HK.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:18+0000\n"
+"PO-Revision-Date: 2011-08-10 11:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/pkg/win32/po/zu/vidalia_zu.po b/pkg/win32/po/zu/vidalia_zu.po
index aa82f74..f49c971 100755
--- a/pkg/win32/po/zu/vidalia_zu.po
+++ b/pkg/win32/po/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: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-05-06 15:19+0000\n"
+"PO-Revision-Date: 2011-08-10 11:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,3 +236,5 @@ msgid ""
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+
+
diff --git a/src/common/procutil.cpp b/src/common/procutil.cpp
index 2e06e16..59b22fa 100644
--- a/src/common/procutil.cpp
+++ b/src/common/procutil.cpp
@@ -21,11 +21,6 @@
#include <QFileInfo>
#include <QTextStream>
#include <QApplication>
-#include <QProcess>
-
-#if !defined(Q_OS_WIN)
-#include <signal.h>
-#endif
/** Returns the PID of the current process. */
@@ -109,9 +104,13 @@ read_pidfile(const QString &pidFileName, QString *errmsg)
}
QHash<qint64, QString>
-process_list(quint16 port)
+process_list()
{
- return universal_process_list(port);
+#if defined(Q_OS_WIN32)
+ return win32_process_list();
+#else
+ return QHash<qint64, QString>();
+#endif
}
bool
@@ -128,60 +127,7 @@ process_kill(qint64 pid)
return (ret != FALSE);
#else
- if(!kill(pid, 15))
- return true;
return false;
#endif
}
-QHash<qint64, QString>
-universal_process_list(quint16 port)
-{
- QHash<qint64, QString> pl;
-
- QProcess ps;
- QStringList args;
-#if defined(Q_OS_LINUX)
- args << "-npl";
-#else
- args << "-no";
-#endif
-
- ps.start("netstat", args, QIODevice::ReadOnly);
- while(!ps.waitForFinished());
-
- QString flt = QString("127.0.0.1:%1").arg(port);
- QStringList lines = QString(ps.readAllStandardOutput()).split("\n");
- QStringList filtered = lines.filter(flt);
-
-#if defined(Q_OS_WIN)
- filtered = filtered.filter("LISTENING");
-#endif
-
- if(filtered.length() == 0)
- return QHash<qint64, QString>();
-
- qint64 pid = 0;
- QString proc = "";
-#if defined(Q_OS_LINUX)
- foreach(QString line, lines) {
- QStringList items = line.trimmed().split(" ");
- if(items.length() < 1)
- continue;
- items = items.last().trimmed().split("/");
- if(items.length() < 2)
- continue;
-
- pid = items[0].toLong();
- proc = items[1];
-
- pl.insert(pid, proc);
- }
-#else
- pid = filtered[0].split(" ").last().trimmed().toLong();
- proc = "tor";
- pl.insert(pid, proc);
-#endif
-
- return pl;
-}
diff --git a/src/common/procutil.h b/src/common/procutil.h
index f82ec43..843174c 100644
--- a/src/common/procutil.h
+++ b/src/common/procutil.h
@@ -45,8 +45,7 @@ qint64 read_pidfile(const QString &pidfile, QString *errmsg = 0);
/** Return a list of all currently running PIDs and their associated process
* names. */
-QHash<qint64, QString> process_list(quint16 port = 0);
-QHash<qint64, QString> universal_process_list(quint16 port);
+QHash<qint64, QString> process_list();
/** Attempt to kill process <b>pid</b>. Return true if the specified process
* was successfully terminated. Otherwise, return false. */
diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp
index 433e1a9..57abeb1 100644
--- a/src/torcontrol/TorControl.cpp
+++ b/src/torcontrol/TorControl.cpp
@@ -97,6 +97,10 @@ TorControl::TorControl(ControlMethod::Method method)
/** Default destructor */
TorControl::~TorControl()
{
+ /* Disconnect the control socket */
+ if (isConnected()) {
+ disconnect();
+ }
/* If we started our own Tor, stop it now */
if (isVidaliaRunningTor()) {
stop();
@@ -131,18 +135,10 @@ bool
TorControl::stop(QString *errmsg)
{
bool rc = false;
-
- if (!isVidaliaRunningTor()) {
- *errmsg = tr("Vidalia has not started Tor. "
- "You need to stop Tor through the interface you started it.");
- return rc;
- } else {
- if (_controlConn->isConnected())
- rc = signal(TorSignal::Halt, errmsg);
- if (!rc)
- rc = _torProcess->stop(errmsg);
- }
-
+ if (_controlConn->isConnected())
+ rc = signal(TorSignal::Halt, errmsg);
+ if (!rc)
+ rc = _torProcess->stop(errmsg);
return rc;
}
diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt
index 5811320..08fb510 100644
--- a/src/vidalia/CMakeLists.txt
+++ b/src/vidalia/CMakeLists.txt
@@ -151,65 +151,35 @@ if (USE_MINIUPNPC)
)
endif(USE_MINIUPNPC)
-## Main Vidalia sources
+## Help browser sources
set(vidalia_SRCS ${vidalia_SRCS}
- main.cpp
- Vidalia.cpp
- LanguageSupport.cpp
- VTabWidget.cpp
- MainWindow.cpp
- VidaliaWindow.cpp
- VMessageBox.cpp
- ControlPasswordInputDialog.cpp
- VidaliaTab.cpp
- StatusTab.cpp
- HelperProcess.cpp
+ help/browser/HelpBrowser.cpp
+ help/browser/HelpTextBrowser.cpp
)
qt4_wrap_cpp(vidalia_SRCS
- Vidalia.h
- VTabWidget.h
- MainWindow.h
- VidaliaWindow.h
- VMessageBox.h
- ControlPasswordInputDialog.h
- VidaliaTab.h
- StatusTab.h
- HelperProcess.h
+ help/browser/HelpBrowser.h
+ help/browser/HelpTextBrowser.h
)
-if (USE_MINIUPNPC)
- qt4_wrap_ui(vidalia_SRCS config/UPNPTestDialog.ui)
-endif(USE_MINIUPNPC)
-
-## Specify all the Qt Designer .ui files
-qt4_wrap_ui(vidalia_SRCS
- ControlPasswordInputDialog.ui
- StatusTab.ui
- MainWindow.ui
- about/AboutDialog.ui
- about/LicenseDialog.ui
- bwgraph/BandwidthGraph.ui
- config/AdvancedPage.ui
- config/AppearancePage.ui
- config/BridgeDownloaderProgressDialog.ui
- config/BridgeUsageDialog.ui
- config/ConfigDialog.ui
- config/GeneralPage.ui
- config/NetworkPage.ui
- config/ServerPage.ui
- config/ServicePage.ui
- config/TorrcDialog.ui
- log/MessageLog.ui
- help/browser/HelpBrowser.ui
- network/NetViewer.ui
- network/RouterInfoDialog.ui
+## Message log sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ log/LogFile.cpp
+ log/LogHeaderView.cpp
+ log/LogMessageColumnDelegate.cpp
+ log/LogTreeItem.cpp
+ log/LogTreeWidget.cpp
+ log/MessageLog.cpp
+ log/StatusEventItem.cpp
+ log/StatusEventItemDelegate.cpp
+ log/StatusEventWidget.cpp
)
-
-## Add the resource files (icons, etc.)
-qt4_add_resources(vidalia_SRCS
- res/vidalia.qrc
- help/content/content.qrc
- ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
+qt4_wrap_cpp(vidalia_SRCS
+ log/LogFile.h
+ log/LogHeaderView.h
+ log/LogTreeWidget.h
+ log/MessageLog.h
+ log/StatusEventItemDelegate.h
+ log/StatusEventWidget.h
)
## Network map sources
@@ -265,35 +235,112 @@ if (USE_GEOIP)
)
endif(USE_GEOIP)
-## Help browser sources
+## Main Vidalia sources
set(vidalia_SRCS ${vidalia_SRCS}
- help/browser/HelpBrowser.cpp
- help/browser/HelpTextBrowser.cpp
+ main.cpp
+ Vidalia.cpp
+ LanguageSupport.cpp
+ MainWindow.cpp
+ VClickLabel.cpp
+ VidaliaWindow.cpp
+ VMessageBox.cpp
+ HelperProcess.cpp
+ ControlPasswordInputDialog.cpp
)
qt4_wrap_cpp(vidalia_SRCS
- help/browser/HelpBrowser.h
- help/browser/HelpTextBrowser.h
+ Vidalia.h
+ MainWindow.h
+ VClickLabel.h
+ VidaliaWindow.h
+ VMessageBox.h
+ HelperProcess.h
+ ControlPasswordInputDialog.h
)
+if (USE_BREAKPAD)
+ set(vidalia_SRCS ${vidalia_SRCS}
+ CrashReporter.cpp
+ )
+endif(USE_BREAKPAD)
-## Message log sources
-set(vidalia_SRCS ${vidalia_SRCS}
- log/LogFile.cpp
- log/LogHeaderView.cpp
- log/LogMessageColumnDelegate.cpp
- log/LogTreeItem.cpp
- log/LogTreeWidget.cpp
- log/MessageLog.cpp
- log/StatusEventItem.cpp
- log/StatusEventItemDelegate.cpp
- log/StatusEventWidget.cpp
+## Specify all the Qt Designer .ui files
+qt4_wrap_ui(vidalia_SRCS
+ ControlPasswordInputDialog.ui
+ MainWindow.ui
+ about/AboutDialog.ui
+ about/LicenseDialog.ui
+ bwgraph/BandwidthGraph.ui
+ config/AdvancedPage.ui
+ config/AppearancePage.ui
+ config/BridgeDownloaderProgressDialog.ui
+ config/BridgeUsageDialog.ui
+ config/ConfigDialog.ui
+ config/GeneralPage.ui
+ config/NetworkPage.ui
+ config/ServerPage.ui
+ config/ServicePage.ui
+ config/TorrcDialog.ui
+ help/browser/HelpBrowser.ui
+ log/MessageLog.ui
+ network/NetViewer.ui
+ network/RouterInfoDialog.ui
)
-qt4_wrap_cpp(vidalia_SRCS
- log/LogFile.h
- log/LogHeaderView.h
- log/LogTreeWidget.h
- log/MessageLog.h
- log/StatusEventItemDelegate.h
- log/StatusEventWidget.h
+
+if (USE_MINIUPNPC)
+ qt4_wrap_ui(vidalia_SRCS config/UPNPTestDialog.ui)
+endif(USE_MINIUPNPC)
+
+if (USE_AUTOUPDATE)
+ set(vidalia_SRCS ${vidalia_SRCS}
+ PackageInfo.cpp
+ UpdateProcess.cpp
+ UpdateProgressDialog.cpp
+ UpdatesAvailableDialog.cpp
+ )
+ qt4_wrap_cpp(vidalia_SRCS
+ UpdateProcess.h
+ UpdateProgressDialog.h
+ UpdatesAvailableDialog.h
+ )
+ qt4_wrap_ui(vidalia_SRCS
+ UpdateProgressDialog.ui
+ UpdatesAvailableDialog.ui
+ )
+endif(USE_AUTOUPDATE)
+
+## Add the resource files (icons, etc.)
+qt4_add_resources(vidalia_SRCS
+ res/vidalia.qrc
+ help/content/content.qrc
+ ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
+)
+
+## Specify the map data Marble will need
+set(marble_DATA
+ landcolors.leg
+ seacolors.leg
+ maps/earth/bluemarble/bluemarble.dgml
+ maps/earth/citylights/citylights.dgml
+ maps/earth/srtm/srtm.dgml
+ maps/earth/srtm/srtm.jpg
+ mwdbii/DATELINE.PNT
+ mwdbii/PAUST.PNT
+ mwdbii/PBORDER.PNT
+ mwdbii/PCANPROV.PNT
+ mwdbii/PCOAST.PNT
+ mwdbii/PDIFFBORDER.PNT
+ mwdbii/PGLACIER.PNT
+ mwdbii/PISLAND.PNT
+ mwdbii/PLAKE.PNT
+ mwdbii/PLAKEISLAND.PNT
+ mwdbii/PMEXICO.PNT
+ mwdbii/PUSA48.DIFF.PNT
+ mwdbii/PUSA48.PNT
+ mwdbii/RIVER.PNT
+ placemarks/baseplacemarks.cache
+ placemarks/boundaryplacemarks.cache
+ placemarks/elevplacemarks.cache
+ stars/stars.dat
+ svg/worldmap.svg
)
## Set the appropriate executable target for the current platform
diff --git a/src/vidalia/ControlPasswordInputDialog.cpp b/src/vidalia/ControlPasswordInputDialog.cpp
index 9fe3eee..554b668 100644
--- a/src/vidalia/ControlPasswordInputDialog.cpp
+++ b/src/vidalia/ControlPasswordInputDialog.cpp
@@ -27,11 +27,17 @@ ControlPasswordInputDialog::ControlPasswordInputDialog(QWidget *parent)
setAttribute(Qt::WA_DeleteOnClose, false);
ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok
+ | QDialogButtonBox::Cancel
| QDialogButtonBox::Reset
| QDialogButtonBox::Help);
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)),
this, SLOT(clicked(QAbstractButton*)));
+ connect(ui.linePassword, SIGNAL(textEdited(QString)),
+ this, SLOT(passwordEdited(QString)));
+
+ /* The dialog starts with an empty password field */
+ passwordEdited(QString());
}
void
@@ -40,16 +46,32 @@ ControlPasswordInputDialog::setResetEnabled(bool enabled)
if (enabled) {
ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons()
| QDialogButtonBox::Reset);
- ui.lblOptionOne->setVisible(false);
- ui.lblOptionTwo->setVisible(true);
} else {
ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons()
& ~QDialogButtonBox::Reset);
- ui.lblOptionOne->setVisible(true);
- ui.lblOptionTwo->setVisible(false);
}
}
+QString
+ControlPasswordInputDialog::password() const
+{
+ return ui.linePassword->text();
+}
+
+bool
+ControlPasswordInputDialog::isSavePasswordChecked() const
+{
+ return ui.chkSavePassword->isChecked();
+}
+
+void
+ControlPasswordInputDialog::passwordEdited(const QString &text)
+{
+ QPushButton *okButton = ui.buttonBox->button(QDialogButtonBox::Ok);
+ if (okButton)
+ okButton->setEnabled(! text.isEmpty());
+}
+
void
ControlPasswordInputDialog::clicked(QAbstractButton *button)
{
@@ -74,7 +96,7 @@ void
ControlPasswordInputDialog::setVisible(bool visible)
{
if (visible)
- adjustSize();
+ resize(minimumSizeHint());
QDialog::setVisible(visible);
}
diff --git a/src/vidalia/ControlPasswordInputDialog.h b/src/vidalia/ControlPasswordInputDialog.h
index b7fa313..193027b 100644
--- a/src/vidalia/ControlPasswordInputDialog.h
+++ b/src/vidalia/ControlPasswordInputDialog.h
@@ -32,6 +32,16 @@ public:
*/
ControlPasswordInputDialog(QWidget *parent = 0);
+ /** Returns the password entered in the dialog. If the dialog was dismissed
+ * with the "Cancel" button, then the returned QString will be empty.
+ */
+ QString password() const;
+
+ /** Returns true if the "Remember my password" checkbox was checked at the
+ * time the dialog was dismissed.
+ */
+ bool isSavePasswordChecked() const;
+
/** If <b>enabled</b> is true, then the "Reset" button will be visible on
* the password input dialog. Otherwise, the "Reset" button will be hidden.
*/
@@ -50,6 +60,11 @@ protected slots:
*/
void clicked(QAbstractButton *button);
+ /** Called when the user changes the password QLineEdit. If the password is
+ * empty, then the "Ok" button will be disabled. Otherwise, it is enabled.
+ */
+ void passwordEdited(const QString &text);
+
protected:
/** Adjusts the size of the input dialog when it is displayed. */
virtual void setVisible(bool visible);
diff --git a/src/vidalia/ControlPasswordInputDialog.ui b/src/vidalia/ControlPasswordInputDialog.ui
index 07b761c..00b5002 100644
--- a/src/vidalia/ControlPasswordInputDialog.ui
+++ b/src/vidalia/ControlPasswordInputDialog.ui
@@ -1,133 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>ControlPasswordInputDialog</class>
- <widget class="QDialog" name="ControlPasswordInputDialog">
- <property name="windowModality">
+ <widget class="QDialog" name="ControlPasswordInputDialog" >
+ <property name="windowModality" >
<enum>Qt::WindowModal</enum>
</property>
- <property name="geometry">
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>470</width>
- <height>189</height>
+ <width>350</width>
+ <height>192</height>
</rect>
</property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>1</verstretch>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="minimumSize" >
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <property name="windowTitle">
- <string>Problem connecting to Tor</string>
+ <property name="windowTitle" >
+ <string>Password Required</string>
</property>
- <property name="windowIcon">
+ <property name="windowIcon" >
<iconset>
<normaloff>:/images/32x32/dialog-password.png</normaloff>:/images/32x32/dialog-password.png</iconset>
</property>
- <property name="sizeGripEnabled">
+ <property name="sizeGripEnabled" >
<bool>false</bool>
</property>
- <property name="modal">
+ <property name="modal" >
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <property name="sizeConstraint">
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <layout class="QGridLayout" name="gridLayout" >
+ <property name="sizeConstraint" >
<enum>QLayout::SetDefaultConstraint</enum>
</property>
- <item row="0" column="1">
- <widget class="QLabel" name="lblPrompt">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lblIcon" >
+ <property name="minimumSize" >
+ <size>
+ <width>48</width>
+ <height>48</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="res/vidalia.qrc" >:/images/48x48/dialog-password.png</pixmap>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="lblPrompt" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>1</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="text">
- <string>Tor is already running, but Vidalia can't connect to it.
-
-This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor.</string>
+ <property name="text" >
+ <string>Vidalia has connected to a running Tor process that requires a password. Please enter your control password: </string>
</property>
- <property name="textFormat">
+ <property name="textFormat" >
<enum>Qt::PlainText</enum>
</property>
- <property name="scaledContents">
+ <property name="scaledContents" >
<bool>true</bool>
</property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ <property name="alignment" >
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
- <property name="wordWrap">
+ <property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="2">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+ <item row="2" column="1" >
+ <widget class="QCheckBox" name="chkSavePassword" >
+ <property name="text" >
+ <string>Remember my password</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="lblOptionOne">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
- <property name="lineWidth">
- <number>1</number>
- </property>
- <property name="text">
- <string>You will need to shut down the Tor process before Vidalia can launch a new one. </string>
- </property>
- <property name="textFormat">
- <enum>Qt::AutoText</enum>
- </property>
- <property name="scaledContents">
- <bool>false</bool>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
+ <item row="3" column="0" colspan="2" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="openExternalLinks">
- <bool>false</bool>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLabel" name="lblOptionTwo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="linePassword" >
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -136,7 +122,7 @@ This can happen when something else (such as another active Vidalia process, or
</layout>
</widget>
<resources>
- <include location="res/vidalia.qrc"/>
+ <include location="res/vidalia.qrc" />
</resources>
<connections/>
</ui>
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index c373d01..b159d2e 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -19,12 +19,10 @@
#include "MainWindow.h"
#include "Vidalia.h"
-#include "ControlPasswordInputDialog.h"
#include "VMessageBox.h"
+#include "ControlPasswordInputDialog.h"
#include "TorSettings.h"
#include "ServerSettings.h"
-#include "AboutDialog.h"
-#include "HelpBrowser.h"
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
@@ -37,7 +35,9 @@
#include "stringutil.h"
#include "procutil.h"
-#include <QtGui>
+#include <QMenuBar>
+#include <QTimer>
+#include <QTextStream>
#define IMG_BWGRAPH ":/images/16x16/utilities-system-monitor.png"
#define IMG_CONTROL_PANEL ":/images/16x16/system-run.png"
@@ -97,241 +97,41 @@ void qt_mac_set_dock_menu(QMenu *menu);
MainWindow::MainWindow()
: VidaliaWindow("MainWindow")
{
- /* Create a new TorControl object, used to communicate with Tor */
- _torControl = Vidalia::torControl();
+ VidaliaSettings settings;
- createGUI();
- createConnections();
-}
+ ui.setupUi(this);
-/** Destructor */
-MainWindow::~MainWindow() {}
+ /* Pressing 'Esc' or 'Ctrl+W' will close the window */
+ Vidalia::createShortcut("Ctrl+W", this, ui.btnHide, SLOT(click()));
+ Vidalia::createShortcut("Esc", this, ui.btnHide, SLOT(click()));
+
+ /* Create all the dialogs of which we only want one instance */
+ _messageLog = new MessageLog();
+ _bandwidthGraph = new BandwidthGraph();
+ _netViewer = new NetViewer();
+ _configDialog = new ConfigDialog();
+ _menuBar = 0;
+ connect(_messageLog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ connect(_netViewer, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ connect(_configDialog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ connect(_configDialog, SIGNAL(restartTor()),
+ this, SLOT(restart()));
-/** Calls the different methods that will handle the GUI "creation".
- * It's called once at the MainWindow creation. */
-void
-MainWindow::createGUI()
-{
- ui.setupUi(this);
+ /* Create the actions that will go in the tray menu */
createActions();
- createMenuBar();
- createToolBar();
+ /* Creates a tray icon with a context menu and adds it to the system's
+ * notification area. */
createTrayIcon();
+ /* Start with Tor initially stopped */
+ _status = Unset;
+ _isVidaliaRunningTor = false;
+ updateTorStatus(Stopped);
- // We need to create this tab at the beggining
- // and we must specify the statusBar
- _messageLog = new MessageLog(this->statusBar());
- _graph = new BandwidthGraph(this->statusBar());
-
- addTab(&_statusTab);
- ui.tabWidget->pinTab(0);
-}
-
-/** Creates the actions used in toolbars and menu */
-void
-MainWindow::createActions()
-{
- _actionShowControlPanel = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Control Panel"), this);
- _actionStartTor = new QAction(QIcon(IMG_START_TOR_16), tr("Start"), this);
- _actionStopTor = new QAction(QIcon(IMG_STOP_TOR_16), tr("Stop"), this);
- _actionRestartTor = new QAction(tr("Restart"), this);
- _actionReloadConfig = new QAction(tr("Reload Tor's config"), this);
- _actionNewIdentity = new QAction(QIcon(IMG_IDENTITY), tr("New Identity"), this);
- _actionStatus = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Status"), this);
- _actionNetworkMap = new QAction(QIcon(IMG_NETWORK), tr("Network Map"), this);
- _actionMessageLog= new QAction(QIcon(IMG_MESSAGELOG), tr("Message Log"), this);
- _actionBandwidthGraph = new QAction(QIcon(IMG_BWGRAPH), tr("Bandwidth Graph"), this);
- _actionConfigure = new QAction(QIcon(IMG_CONFIG), tr("Settings"), this);
- _actionVidaliaHelp = new QAction(QIcon(IMG_HELP), tr("Help"), this);
- _actionAbout = new QAction(QIcon(IMG_ABOUT), tr("About"), this);
- _actionStartStopTor = new QAction(QIcon(IMG_START_TOR_16), tr("Start Tor"), this);
- _actionExit = new QAction(QIcon(IMG_EXIT), tr("Exit"), this);
-}
-
-/** Creates the menu bar */
-void
-MainWindow::createMenuBar()
-{
- QMenuBar *menu = menuBar();
- menu->clear();
-
- QMenu *torMenu = menu->addMenu(tr("Tor"));
- torMenu->addAction(_actionStartTor);
- torMenu->addAction(_actionStopTor);
- torMenu->addAction(_actionRestartTor);
-#if !defined(Q_WS_WIN)
- torMenu->addAction(_actionReloadConfig);
-#endif
-
- QMenu *actionsMenu = menu->addMenu(tr("Actions"));
- actionsMenu->addAction(_actionNewIdentity);
-
- QMenu *viewMenu = menu->addMenu(tr("View"));
- viewMenu->addAction(_actionStatus);
- viewMenu->addAction(_actionNetworkMap);
- viewMenu->addAction(_actionMessageLog);
- viewMenu->addAction(_actionBandwidthGraph);
- viewMenu->addSeparator();
- viewMenu->addAction(_actionConfigure);
-
-// QMenu *pluginsMenu = menu->addMenu(tr("Plugins"));
-
- QMenu *helpMenu = menu->addMenu(tr("Help"));
- helpMenu->addAction(_actionVidaliaHelp);
- helpMenu->addSeparator();
- helpMenu->addAction(_actionAbout);
-}
-
-/** Creates the main toolbar */
-void
-MainWindow::createToolBar()
-{
- QToolBar *tool = ui.toolBar;
-
- tool->addAction(_actionStartStopTor);
- tool->addAction(_actionNewIdentity);
- tool->addAction(_actionConfigure);
-
- tool->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-}
-
-/** Creates a QMenu object that contains QActions which compose the system
- * tray menu. */
-QMenu*
-MainWindow::createTrayMenu()
-{
- QMenu *menu = new QMenu(this);
- menu->addAction(_actionStartStopTor);
- menu->addSeparator();
- menu->addAction(_actionBandwidthGraph);
- menu->addAction(_actionMessageLog);
- menu->addAction(_actionNetworkMap);
- menu->addAction(_actionNewIdentity);
- menu->addSeparator();
- menu->addAction(_actionShowControlPanel);
-
-#if !defined(Q_WS_MAC)
- /* These aren't added to the dock menu on Mac, since they are in the
- * standard Mac locations in the menu bar. */
- menu->addAction(_actionConfigure);
- menu->addAction(_actionVidaliaHelp);
- menu->addAction(_actionAbout);
- menu->addSeparator();
- menu->addAction(_actionExit);
-#endif
- return menu;
-}
-
-/** Creates a tray icon with a context menu and adds it to the system
- * notification area. On Mac, we also set up an application menubar. */
-void
-MainWindow::createTrayIcon()
-{
- QMenu *menu = createTrayMenu();
-
- /* Add the menu it to the tray icon */
- _trayIcon.setContextMenu(menu);
-
- connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
- this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
-
-#if defined(Q_WS_MAC)
- qt_mac_set_dock_menu(menu);
-#endif
-
- VidaliaSettings settings;
-
- _statusTab.checkShowOnStartup(settings.showMainWindowAtStart());
- if (_statusTab.isCheckedShowOnStartup())
- show();
- _trayIcon.show();
-}
-
-void
-MainWindow::setVisible(bool visible)
-{
- if (visible) {
- /* In Gnome, will hide buttons if Vidalia is run on startup. */
- if (!QSystemTrayIcon::isSystemTrayAvailable()) {
- /* Don't let people hide the main window, since that's all they have. */
- _statusTab.hideCheckShowOnStartup();
- /* Causes window to not appear in Enlightenment. */
- //setMinimumHeight(height()-ui.btnHide->height());
- //setMaximumHeight(height()-ui.btnHide->height());
- }
- }
- VidaliaWindow::setVisible(visible);
-}
-
-/** Respond to a double-click on the tray icon by opening the Control Panel
- * window. */
-void
-MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
-{
- if (reason == QSystemTrayIcon::DoubleClick)
- setVisible(true);
-}
-
-void
-MainWindow::retranslateUi()
-{
- updateTorStatus(_status);
-
- _actionShowControlPanel->setText(tr("Control Panel"));
- _actionStartTor->setText(tr("Start"));
- _actionStopTor->setText(tr("Stop"));
- _actionRestartTor->setText(tr("Restart"));
- _actionReloadConfig->setText(tr("Reload Tor's config"));
- _actionConfigure->setText(tr("Settings"));
-
- if (_status == Stopped) {
- _actionStartStopTor->setText(tr("Start Tor"));
- } else if (_status == Starting) {
- _actionStartStopTor->setText(tr("Starting Tor"));
- } else {
- _actionStartStopTor->setText(tr("Stop Tor"));
- }
-
- _actionBandwidthGraph->setText(tr("Bandwidth Graph"));
- _actionMessageLog->setText(tr("Message Log"));
- _actionNetworkMap->setText(tr("Network Map"));
- _actionStatus->setText(tr("Status"));
- _actionVidaliaHelp->setText(tr("Help"));
- _actionNewIdentity->setText(tr("New Identity"));
-
-#if !defined(Q_WS_MAC)
- _actionAbout->setText(tr("About"));
- _actionConfigure->setText(tr("Settings"));
- _actionExit->setText(tr("Exit"));
-#endif
-
- createMenuBar();
- ui.retranslateUi(this);
-}
-
-void
-MainWindow::createConnections()
-{
- connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
- connect(_actionStartTor, SIGNAL(triggered()), this, SLOT(start()));
- connect(_actionRestartTor, SIGNAL(triggered()), this, SLOT(restart()));
- connect(_actionReloadConfig, SIGNAL(triggered()), this, SLOT(sighup()));
- connect(_actionStopTor, SIGNAL(triggered()), this, SLOT(stop()));
- connect(_actionShowControlPanel, SIGNAL(triggered()), this, SLOT(show()));
- connect(_actionNewIdentity, SIGNAL(triggered()), this, SLOT(newIdentity()));
-
- connect(_actionMessageLog, SIGNAL(triggered()), this, SLOT(showMessageLogTab()));
- connect(_actionConfigure, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
- connect(_actionBandwidthGraph, SIGNAL(triggered()), this, SLOT(showBandwithTab()));
- connect(_actionAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
- connect(_actionVidaliaHelp, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
- connect(_actionStatus, SIGNAL(triggered()), this, SLOT(showStatusTab()));
- connect(_actionNetworkMap, SIGNAL(triggered()), this, SLOT(showNetViewerTab()));
-
- /* Catch signals when the application is running or shutting down */
- connect(vApp, SIGNAL(running()), this, SLOT(running()));
- connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
-
+ /* Create a new TorControl object, used to communicate with Tor */
+ _torControl = Vidalia::torControl();
connect(_torControl, SIGNAL(started()), this, SLOT(started()));
connect(_torControl, SIGNAL(startFailed(QString)),
this, SLOT(startFailed(QString)));
@@ -359,8 +159,28 @@ MainWindow::createConnections()
connect(_torControl, SIGNAL(dangerousPort(quint16, bool)),
this, SLOT(warnDangerousPort(quint16, bool)));
- connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)),
- this, SLOT(handleCloseTab(int)));
+ /* Create a new HelperProcess object, used to start the web browser */
+ _browserProcess = new HelperProcess(this);
+ connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
+ connect(_browserProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onBrowserFailed(QString)));
+
+ /* Create a new HelperProcess object, used to start the IM client */
+ _imProcess = new HelperProcess(this);
+ connect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
+ connect(_imProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onIMFailed(QString)));
+
+ /* Create a new HelperProcess object, used to start the proxy server */
+ _proxyProcess = new HelperProcess(this);
+ connect(_proxyProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onProxyFailed(QString)));
+
+ /* Catch signals when the application is running or shutting down */
+ connect(vApp, SIGNAL(running()), this, SLOT(running()));
+ connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
#if defined(USE_AUTOUPDATE)
/* Create a timer used to remind us to check for software updates */
@@ -387,47 +207,74 @@ MainWindow::createConnections()
#if defined(USE_MINIUPNPC)
/* Catch UPnP-related signals */
connect(UPNPControl::instance(), SIGNAL(error(UPNPControl::UPNPError)),
- this, SLOT(upnpError(UPNPControl::UPNPError)));
+ this, SLOT(upnpError(UPNPControl::UPNPError)));
#endif
- /* Create a new HelperProcess object, used to start the web browser */
- _browserProcess = new HelperProcess(this);
- connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
- this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
- connect(_browserProcess, SIGNAL(startFailed(QString)),
- this, SLOT(onBrowserFailed(QString)));
- /* Create a new HelperProcess object, used to start the IM client */
- _imProcess = new HelperProcess(this);
- connect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
- this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
- connect(_imProcess, SIGNAL(startFailed(QString)),
- this, SLOT(onIMFailed(QString)));
+ ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
+ if (ui.chkShowOnStartup->isChecked())
+ show();
+ /* Optimistically hope that the tray icon gets added. */
+ _trayIcon.show();
+}
- /* Create a new HelperProcess object, used to start the proxy server */
- _proxyProcess = new HelperProcess(this);
- connect(_proxyProcess, SIGNAL(startFailed(QString)),
- this, SLOT(onProxyFailed(QString)));
+/** Destructor. */
+MainWindow::~MainWindow()
+{
+ _trayIcon.hide();
+ delete _messageLog;
+ delete _bandwidthGraph;
+ delete _netViewer;
+ delete _configDialog;
}
-/** Called when the application is closing, by selecting "Exit" from the tray
- * menu. If we're running a Tor server, then ask if we want to kill Tor now,
- * or do a delayed shutdown. */
void
-MainWindow::close()
+MainWindow::setVisible(bool visible)
{
- if (_torControl->isVidaliaRunningTor()) {
- /* If we're running a server currently, ask if we want to do a delayed
- * shutdown. If we do, then close Vidalia only when Tor stops. Otherwise,
- * kill Tor and bail now. */
- ServerSettings settings(_torControl);
- if (_torControl->isConnected() && settings.isServerEnabled()) {
- connect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
- if (!stop())
- QObject::disconnect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
- return;
+ if (visible) {
+ /* In Gnome, will hide buttons if Vidalia is run on startup. */
+ if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+ /* Don't let people hide the main window, since that's all they have. */
+ ui.chkShowOnStartup->hide();
+ ui.btnHide->hide();
+ /* Causes window to not appear in Enlightenment. */
+ //setMinimumHeight(height()-ui.btnHide->height());
+ //setMaximumHeight(height()-ui.btnHide->height());
}
}
- vApp->quit();
+ VidaliaWindow::setVisible(visible);
+}
+
+void
+MainWindow::retranslateUi()
+{
+ ui.retranslateUi(this);
+
+ updateTorStatus(_status);
+ if (_status == Stopped) {
+ _actionStartStopTor->setText(tr("Start Tor"));
+ ui.lblStartStopTor->setText(tr("Start Tor"));
+ } else if (_status == Starting) {
+ _actionStartStopTor->setText(tr("Starting Tor"));
+ ui.lblStartStopTor->setText(tr("Starting Tor"));
+ } else {
+ _actionStartStopTor->setText(tr("Stop Tor"));
+ ui.lblStartStopTor->setText(tr("Stop Tor"));
+ }
+
+ _actionShowBandwidth->setText(tr("Bandwidth Graph"));
+ _actionShowMessageLog->setText(tr("Message Log"));
+ _actionShowNetworkMap->setText(tr("Network Map"));
+ _actionShowControlPanel->setText(tr("Control Panel"));
+ _actionShowHelp->setText(tr("Help"));
+ _actionNewIdentity->setText(tr("New Identity"));
+
+#if !defined(Q_WS_MAC)
+ _actionShowAbout->setText(tr("About"));
+ _actionShowConfig->setText(tr("Settings"));
+ _actionExit->setText(tr("Exit"));
+#else
+ createMenuBar();
+#endif
}
/** Called when the application has started and the main event loop is
@@ -535,438 +382,406 @@ MainWindow::aboutToQuit()
QObject::disconnect(_torControl, 0, 0, 0);
}
-
-/** Attempts to start Tor. If Tor fails to start, then startFailed() will be
- * called with an error message containing the reason. */
-void
-MainWindow::start()
+/** Called when the application is closing, by selecting "Exit" from the tray
+ * menu. If we're running a Tor server, then ask if we want to kill Tor now,
+ * or do a delayed shutdown. */
+void
+MainWindow::close()
{
- TorSettings settings;
- QStringList args;
-
- updateTorStatus(Starting);
-
- /* Check if Tor is already running separately */
- if(settings.getControlMethod() == ControlMethod::Port) {
- if (net_test_connect(settings.getControlAddress(),
- settings.getControlPort())) {
- started();
- return;
- }
- } else {
- if (socket_test_connect(settings.getSocketPath())) {
- started();
+ if (_torControl->isVidaliaRunningTor()) {
+ /* If we're running a server currently, ask if we want to do a delayed
+ * shutdown. If we do, then close Vidalia only when Tor stops. Otherwise,
+ * kill Tor and bail now. */
+ ServerSettings settings(_torControl);
+ if (_torControl->isConnected() && settings.isServerEnabled()) {
+ connect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
+ if (!stop())
+ QObject::disconnect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
return;
}
}
+ vApp->quit();
+}
- QString torrc = settings.getTorrc();
+/** Create and bind actions to events. Setup for initial
+ * tray menu configuration. */
+void
+MainWindow::createActions()
+{
+ _actionStartStopTor = new QAction(tr("Start Tor"), this);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
- if(settings.bootstrap()) {
- QString boottorrc = settings.bootstrapFrom();
- vNotice(tr("Bootstrapping torrc from %1 to %2")
- .arg(boottorrc).arg(torrc));
- if(QFileInfo(boottorrc).exists()) {
- if(QFile::copy(boottorrc, torrc)) {
- settings.setBootstrap(false);
- }
- }
- }
+ _actionExit = new QAction(tr("Exit"), this);
+ connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
- /* Make sure the torrc we want to use really exists. */
- if (!torrc.isEmpty()) {
- if (!QFileInfo(torrc).exists())
- touch_file(torrc, true);
- args << "-f" << torrc;
- }
+ _actionShowBandwidth = new QAction(tr("Bandwidth Graph"), this);
+ connect(_actionShowBandwidth, SIGNAL(triggered()),
+ _bandwidthGraph, SLOT(showWindow()));
+ connect(ui.lblBandwidthGraph, SIGNAL(clicked()),
+ _bandwidthGraph, SLOT(showWindow()));
+
+ _actionShowMessageLog = new QAction(tr("Message Log"), this);
+ connect(_actionShowMessageLog, SIGNAL(triggered()),
+ _messageLog, SLOT(showWindow()));
+ connect(ui.lblMessageLog, SIGNAL(clicked()),
+ _messageLog, SLOT(showWindow()));
+
+ _actionShowNetworkMap = new QAction(tr("Network Map"), this);
+ connect(_actionShowNetworkMap, SIGNAL(triggered()),
+ _netViewer, SLOT(showWindow()));
+ connect(ui.lblViewNetwork, SIGNAL(clicked()),
+ _netViewer, SLOT(showWindow()));
+
+ _actionShowControlPanel = new QAction(tr("Control Panel"), this);
+ connect(_actionShowControlPanel, SIGNAL(triggered()), this, SLOT(show()));
- /* Specify Tor's data directory, if different from the default */
- QString dataDirectory = settings.getDataDirectory();
- if (!dataDirectory.isEmpty())
- args << "DataDirectory" << expand_filename(dataDirectory);
+ _actionShowConfig = new QAction(tr("Settings"), this);
+ connect(_actionShowConfig, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
- if(settings.getControlMethod() == ControlMethod::Port) {
- /* Add the intended control port value */
- quint16 controlPort = settings.getControlPort();
- if (controlPort)
- args << "ControlPort" << QString::number(controlPort);
- } else {
- QString path = settings.getSocketPath();
- args << "ControlSocket" << path;
- }
-
- /* Add the control port authentication arguments */
- switch (settings.getAuthenticationMethod()) {
- case TorSettings::PasswordAuth:
- if (! vApp->readPasswordFromStdin()) {
- if (settings.useRandomPassword()) {
- _controlPassword = TorSettings::randomPassword();
- _useSavedPassword = false;
- } else {
- _controlPassword = settings.getControlPassword();
- _useSavedPassword = true;
- }
- }
- args << "HashedControlPassword"
- << TorSettings::hashPassword(_controlPassword);
- break;
- case TorSettings::CookieAuth:
- args << "CookieAuthentication" << "1";
- break;
- default:
- args << "CookieAuthentication" << "0";
- }
+ _actionShowAbout = new QAction(tr("About"), this);
+ connect(_actionShowAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
- /* This doesn't get set to false until Tor is actually up and running, so we
- * don't yell at users twice if their Tor doesn't even start, due to the fact
- * that QProcess::stopped() is emitted even if the process didn't even
- * start. */
- _isIntentionalExit = true;
- /* Kick off the Tor process */
- _torControl->start(settings.getExecutable(), args);
+ _actionShowHelp = new QAction(tr("Help"), this);
+ connect(_actionShowHelp, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
+ connect(ui.lblHelpBrowser, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
+
+ _actionNewIdentity = new QAction(tr("New Identity"), this);
+ _actionNewIdentity->setEnabled(false);
+ connect(_actionNewIdentity, SIGNAL(triggered()), this, SLOT(newIdentity()));
+
+#if !defined(Q_WS_MAC)
+ /* Don't give the menu items icons on OS X, since they end up in the
+ * application menu bar. Menu bar items on OS X typically do not have
+ * icons. */
+ _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16));
+ _actionExit->setIcon(QIcon(IMG_EXIT));
+ _actionShowBandwidth->setIcon(QIcon(IMG_BWGRAPH));
+ _actionShowMessageLog->setIcon(QIcon(IMG_MESSAGELOG));
+ _actionShowNetworkMap->setIcon(QIcon(IMG_NETWORK));
+ _actionShowControlPanel->setIcon(QIcon(IMG_CONTROL_PANEL));
+ _actionShowConfig->setIcon(QIcon(IMG_CONFIG));
+ _actionShowAbout->setIcon(QIcon(IMG_ABOUT));
+ _actionShowHelp->setIcon(QIcon(IMG_HELP));
+ _actionNewIdentity->setIcon(QIcon(IMG_IDENTITY));
+#endif
}
-/** Slot: Called when the Tor process is started. It will connect the control
- * socket and set the icons and tooltips accordingly. */
-void
-MainWindow::started()
+/** Creates a tray icon with a context menu and adds it to the system
+ * notification area. On Mac, we also set up an application menubar. */
+void
+MainWindow::createTrayIcon()
{
- TorSettings settings;
+ QMenu *menu = createTrayMenu();
- updateTorStatus(Started);
+ /* Add the menu it to the tray icon */
+ _trayIcon.setContextMenu(menu);
- /* Now that Tor is running, we want to know if it dies when we didn't want
- * it to. */
- _isIntentionalExit = false;
- /* We haven't started a delayed shutdown yet. */
- _delayedShutdownStarted = false;
- /* Remember whether we started Tor or not */
- _isVidaliaRunningTor = _torControl->isVidaliaRunningTor();
- /* Try to connect to Tor's control port */
- if(settings.getControlMethod() == ControlMethod::Port)
- _torControl->connect(settings.getControlAddress(),
- settings.getControlPort());
- else
- _torControl->connect(settings.getSocketPath());
- setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
+ connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+ this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
+
+#if defined(Q_WS_MAC)
+ createMenuBar();
+ qt_mac_set_dock_menu(menu);
+#endif
}
-/** Disconnects the control socket and stops the Tor process. */
-bool
-MainWindow::stop()
+/** Creates a QMenu object that contains QActions which compose the system
+ * tray menu. */
+QMenu*
+MainWindow::createTrayMenu()
{
- ServerSettings server(_torControl);
- QString errmsg;
- TorStatus prevStatus;
- bool rc;
-
- /* If we're running a server, give users the option of terminating
- * gracefully so clients have time to find new servers. */
- if (server.isServerEnabled() && !_delayedShutdownStarted) {
- /* Ask the user if they want to shutdown nicely. */
- int response = VMessageBox::question(this, tr("Relaying is Enabled"),
- tr("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?"),
- VMessageBox::Yes|VMessageBox::Default,
- VMessageBox::No,
- VMessageBox::Cancel|VMessageBox::Escape);
- if (response == VMessageBox::Yes)
- _delayedShutdownStarted = true;
- else if (response == VMessageBox::Cancel)
- return false;
- }
-
- prevStatus = updateTorStatus(Stopping);
- if (_delayedShutdownStarted) {
- /* Start a delayed shutdown */
- rc = _torControl->signal(TorSignal::Shutdown, &errmsg);
- } else {
- /* We want Tor to stop now, regardless of whether we're a server. */
- _isIntentionalExit = true;
- rc = _torControl->stop(&errmsg);
- }
+ QMenu *menu = new QMenu(this);
+ menu->addAction(_actionStartStopTor);
+ menu->addSeparator();
+ menu->addAction(_actionShowBandwidth);
+ menu->addAction(_actionShowMessageLog);
+ menu->addAction(_actionShowNetworkMap);
+ menu->addAction(_actionNewIdentity);
+ menu->addSeparator();
+ menu->addAction(_actionShowControlPanel);
- if (!rc) {
- /* We couldn't tell Tor to stop, for some reason. */
- int response = VMessageBox::warning(this, tr("Error Shutting Down"),
- p(tr("Vidalia was unable to stop the Tor software."))
- + p(errmsg),
- VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
- VMessageBox::Help);
-
- if (response == VMessageBox::Help) {
- /* Show some troubleshooting help */
- showHelpDialog("troubleshooting.stop");
- }
- /* Tor is still running since stopping failed */
- _isIntentionalExit = false;
- _delayedShutdownStarted = false;
- updateTorStatus(prevStatus);
- }
- return rc;
+#if !defined(Q_WS_MAC)
+ /* These aren't added to the dock menu on Mac, since they are in the
+ * standard Mac locations in the menu bar. */
+ menu->addAction(_actionShowConfig);
+ menu->addAction(_actionShowHelp);
+ menu->addAction(_actionShowAbout);
+ menu->addSeparator();
+ menu->addAction(_actionExit);
+#endif
+ return menu;
}
-/** Slot: Called when the Tor process has exited. It will adjust the tray
- * icons and tooltips accordingly. */
-void
-MainWindow::stopped(int exitCode, QProcess::ExitStatus exitStatus)
+/** Creates a new menubar with no parent, so Qt will use this as the "default
+ * menubar" on Mac. This adds on to the existing actions from the createMens()
+ * method. */
+void
+MainWindow::createMenuBar()
{
- updateTorStatus(Stopped);
-
- /* If we didn't intentionally close Tor, then check to see if it crashed or
- * if it closed itself and returned an error code. */
- if (!_isIntentionalExit) {
- /* A quick overview of Tor's code tells me that if it catches a SIGTERM or
- * SIGINT, Tor will exit(0). We might need to change this warning message
- * if this turns out to not be the case. */
- if (exitStatus == QProcess::CrashExit || exitCode != 0) {
- int ret = VMessageBox::warning(this, tr("Unexpected Error"),
- tr("Vidalia detected that the Tor software exited "
- "unexpectedly.\n\n"
- "Please check the message log for recent "
- "warning or error messages."),
- VMessageBox::Ok|VMessageBox::Escape,
- VMessageBox::ShowLog|VMessageBox::Default,
- VMessageBox::Help);
- if (ret == VMessageBox::ShowLog)
- showMessageLogTab();
- else if (ret == VMessageBox::Help)
- showHelpDialog("troubleshooting.torexited");
- }
- }
+#if defined(Q_WS_MAC)
+ /* Mac users sure like their shortcuts. Actions NOT mentioned below
+ * don't explicitly need shortcuts, since they are merged to the default
+ * menubar and get the default shortcuts anyway. */
+ _actionStartStopTor->setShortcut(tr("Ctrl+T"));
+ _actionShowBandwidth->setShortcut(tr("Ctrl+B"));
+ _actionShowMessageLog->setShortcut(tr("Ctrl+L"));
+ _actionShowNetworkMap->setShortcut(tr("Ctrl+N"));
+ _actionShowHelp->setShortcut(tr("Ctrl+?"));
+ _actionNewIdentity->setShortcut(tr("Ctrl+I"));
+ _actionShowControlPanel->setShortcut(tr("Ctrl+P"));
+
+ /* Force Qt to put merge the Exit, Configure, and About menubar options into
+ * the default menu, even if Vidalia is currently not speaking English. */
+ _actionShowConfig->setText("config");
+ _actionShowConfig->setMenuRole(QAction::PreferencesRole);
+ _actionShowAbout->setText("about");
+ _actionShowAbout->setMenuRole(QAction::AboutRole);
+ _actionExit->setText("quit");
+ _actionExit->setMenuRole(QAction::QuitRole);
+
+ /* The File, Help, and Configure menus will get merged into the application
+ * menu by Qt. */
+ if (_menuBar)
+ delete _menuBar;
+ _menuBar = new QMenuBar(0);
+ QMenu *fileMenu = _menuBar->addMenu("File");
+ fileMenu->addAction(_actionExit);
+ fileMenu->addAction(_actionShowConfig);
+
+ QMenu *torMenu = _menuBar->addMenu(tr("Tor"));
+ torMenu->addAction(_actionStartStopTor);
+ torMenu->addSeparator();
+ torMenu->addAction(_actionNewIdentity);
+
+ QMenu *viewMenu = _menuBar->addMenu(tr("View"));
+ viewMenu->addAction(_actionShowControlPanel);
+ viewMenu->addSeparator();
+ viewMenu->addAction(_actionShowBandwidth);
+ viewMenu->addAction(_actionShowMessageLog);
+ viewMenu->addAction(_actionShowNetworkMap);
+
+ QMenu *helpMenu = _menuBar->addMenu(tr("Help"));
+ _actionShowHelp->setText(tr("Vidalia Help"));
+ helpMenu->addAction(_actionShowHelp);
+ helpMenu->addAction(_actionShowAbout);
+#endif
}
-/** Called when the Tor process fails to start, for example, because the path
- * specified to the Tor executable didn't lead to an executable. */
+/** Sets the current tray or dock icon image to <b>iconFile</b>. */
void
-MainWindow::startFailed(QString errmsg)
+MainWindow::setTrayIcon(const QString &iconFile)
{
- /* We don't display the error message for now, because the error message
- * that Qt gives us in this instance is almost always "Unknown Error". That
- * will make users sad. */
- Q_UNUSED(errmsg);
-
- updateTorStatus(Stopped);
-
- /* Display an error message and see if the user wants some help */
- int response = VMessageBox::warning(this, tr("Error Starting Tor"),
- tr("Vidalia was unable to start Tor. Check your settings "
- "to ensure the correct name and location of your Tor "
- "executable is specified."),
- VMessageBox::ShowSettings|VMessageBox::Default,
- VMessageBox::Cancel|VMessageBox::Escape,
- VMessageBox::Help);
-
- if (response == VMessageBox::ShowSettings) {
- /* Show the settings dialog so the user can make sure they're pointing to
- * the correct Tor. */
- showConfigDialog();
- } else if (response == VMessageBox::Help) {
- /* Show troubleshooting information about starting Tor */
- showHelpDialog("troubleshooting.start");
- }
+#if defined(Q_WS_MAC)
+ QApplication::setWindowIcon(QPixmap(iconFile));
+#endif
+ _trayIcon.setIcon(QIcon(iconFile));
}
-/** Called when the control socket has successfully connected to Tor. */
+/** Respond to a double-click on the tray icon by opening the Control Panel
+ * window. */
void
-MainWindow::connected()
+MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
{
- authenticate();
+ if (reason == QSystemTrayIcon::DoubleClick)
+ setVisible(true);
}
-/** Called when the connection to the control socket fails. The reason will be
- * given in the errmsg parameter. */
+/** Start a web browser when given the directory containing the executable and profile */
void
-MainWindow::connectFailed(QString errmsg)
+MainWindow::launchBrowserFromDirectory()
{
- /* Ok, ok. It really isn't going to connect. I give up. */
- int response = VMessageBox::warning(this,
- tr("Connection Error"), p(errmsg),
- VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
- VMessageBox::Retry, VMessageBox::Help);
+ VidaliaSettings settings;
+ QString browserDirectory = settings.getBrowserDirectory();
+ QString browserDirectoryFilename = settings.getBrowserExecutable();
- if (response == VMessageBox::Retry) {
- /* Let's give it another try. */
- TorSettings settings;
- _torControl->connect(settings.getControlAddress(),
- settings.getControlPort());
- } else {
- /* Show the help browser (if requested) */
- if (response == VMessageBox::Help)
- showHelpDialog("troubleshooting.connect");
- /* Since Vidalia can't connect, we can't really do much, so stop Tor. */
- _torControl->stop();
- }
-}
+ _browserProcess->setEnvironment(updateBrowserEnv());
-/** Called when Vidalia has successfully authenticated to Tor. */
-void
-MainWindow::authenticated()
-{
- ServerSettings serverSettings(_torControl);
- QString errmsg;
+ /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */
+ QString browserExecutable =
+ QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename);
+ /* The profile is in <browserDirectory>/Data/profile */
+ QString profileDir =
+ QDir::toNativeSeparators(browserDirectory + "/Data/profile");
- updateTorStatus(Authenticated);
-
- /* If Tor doesn't have bootstrapping events, then update the current
- * status string and bump the progress bar along a bit. */
- if (_torControl->getTorVersion() < 0x020101) {
- setStartupProgress(STARTUP_PROGRESS_CIRCUITBUILD,
- tr("Connecting to the Tor network"));
+ /* Copy the profile directory if it's not already there */
+ QDir browserDirObj = QDir(browserDirectory);
+
+ /* Copy the profile directory if it's not already there */
+ if (!browserDirObj.exists("Data/profile")) {
+ browserDirObj.mkdir("Data/profile");
+ copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile");
}
-
- /* Let people click on their beloved "New Identity" button */
- _actionNewIdentity->setEnabled(true);
- /* Register for any pertinent asynchronous events. */
- if (!_torControl->setEvents(&errmsg)) {
- VMessageBox::warning(this, tr("Error Registering for Events"),
- p(tr("Vidalia was unable to register for some events. "
- "Many of Vidalia's features may be unavailable."))
- + p(errmsg),
- VMessageBox::Ok);
- } else {
- /* Stop reading from Tor's stdout immediately, since we successfully
- * registered for Tor events, including any desired log events. */
- _torControl->closeTorStdout();
+ /* Copy the plugins directory if it's not already there */
+ if (!browserDirObj.exists("Data/plugins")) {
+ browserDirObj.mkdir("Data/plugins");
+ copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins");
}
- /* Configure UPnP port forwarding if needed */
- serverSettings.configurePortForwarding();
+ /* Build the command line arguments */
+ QStringList commandLine;
+ // Is this better or worse than MOZ_NO_REMOTE?
+ commandLine << "-no-remote";
+ commandLine << "-profile";
+ commandLine << profileDir;
- /* Check if Tor has a circuit established */
- if (_torControl->isCircuitEstablished()) {
- circuitEstablished();
- }
- /* Check the status of Tor's version */
- if (_torControl->getTorVersion() >= 0x020001)
- checkTorVersion();
- if (_torControl->getTorVersion() >= 0x020102) {
- BootstrapStatus status = _torControl->bootstrapStatus();
- if (status.isValid())
- bootstrapStatusChanged(status);
- }
+ /* Launch the browser */
+ _browserProcess->start(browserExecutable, commandLine);
}
-/** Called when Vidalia fails to authenticate to Tor. The failure reason is
- * specified in <b>errmsg</b>. */
+/** Starts the web browser and IM client, if appropriately configured */
void
-MainWindow::authenticationFailed(QString errmsg)
+MainWindow::startSubprocesses()
{
- bool retry = false;
-
- vWarn("Authentication failed: %1").arg(errmsg);
-
- /* Parsing log messages is evil, but we're left with little option */
- if (errmsg.contains("Password did not match")) {
- ControlPasswordInputDialog dlg;
- connect(&dlg, SIGNAL(helpRequested(QString)),
- this, SLOT(showHelpDialog(QString)));
+ VidaliaSettings settings;
+ QString subprocess;
- qint64 torPid = 0;
+ /* Launch the web browser */
+ if (!(subprocess = settings.getBrowserDirectory()).isEmpty()) {
+ /* The user has set BrowserDirectory; use this */
+ launchBrowserFromDirectory();
+ } else if (!(subprocess = settings.getBrowserExecutable()).isEmpty()) {
+ /* BrowserDirectory is not set, but BrowserExecutable is; use this */
+ _browserProcess->setEnvironment(updateBrowserEnv());
+ _browserProcess->start(subprocess, QStringList());
+ }
- TorSettings settings;
- QHash<qint64, QString> procs = process_list(settings.getControlPort());
- foreach (qint64 pid, procs.keys()) {
- if (! procs.value(pid).compare("tor", Qt::CaseInsensitive)) {
- torPid = pid;
- break;
- }
- }
-
- dlg.setResetEnabled(torPid > 0);
+ /* Launch the IM client */
+ subprocess = settings.getIMExecutable();
- int ret = dlg.exec();
- if (ret == QDialogButtonBox::Reset) {
- if (! process_kill(torPid)) {
- VMessageBox::warning(this,
- tr("Password Reset Failed"),
- p(tr("Vidalia tried to restart Tor, but was not "
- "able to. Please check your Task Manager to "
- "ensure there are no other Tor processes running.")),
- VMessageBox::Ok|VMessageBox::Default);
- } else {
- retry = true;
- }
- }
- }
-
- if (_torControl->isRunning())
- if (_isVidaliaRunningTor)
- stop();
- else
- disconnect();
- if (retry)
- start();
+ if (!subprocess.isEmpty())
+ _imProcess->start(subprocess, QStringList());
}
-/** Called when Tor thinks its version is old or unrecommended, and displays
- * a message notifying the user. */
+/** Called when browser or IM client have exited */
void
-MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
- const QString ¤t,
- const QStringList &recommended)
+MainWindow::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus)
{
- Q_UNUSED(current);
- Q_UNUSED(recommended);
+ Q_UNUSED(exitCode)
+ Q_UNUSED(exitStatus)
- if (reason == tc::ObsoleteTorVersion
- || reason == tc::UnrecommendedTorVersion)
- displayTorVersionWarning();
+ /* Get path to browser and IM client */
+ VidaliaSettings settings;
+ QString browserExecutable = settings.getBrowserExecutable();
+ QString browserDirectory = settings.getBrowserDirectory();
+ QString imExecutable = settings.getIMExecutable();
+
+ /* A subprocess is finished if it successfully exited or was never asked to start */
+ bool browserDone = (browserExecutable.isEmpty()
+ && browserDirectory.isEmpty())
+ || _browserProcess->isDone();
+ bool imDone = imExecutable.isEmpty() || _imProcess->isDone();
+
+ /* Exit if both subprocesses are finished */
+ if (browserDone && imDone) {
+ if (browserDirectory.isEmpty()) {
+ /* We are using the standard launcher, exit immediately */
+ vApp->quit();
+ } else {
+ /* We are using the alternate launcher, wait until the browser has really died */
+ QTimer *browserWatcher = new QTimer(this);
+ connect(browserWatcher, SIGNAL(timeout()), this, SLOT(onCheckForBrowser()));
+ browserWatcher->start(2000);
+ }
+ }
}
-/** Called when Tor thinks its version is old or unrecommended, and displays a
- * message notifying the user. */
+/** Called periodically to check if the browser is running. If it is not,
+ * exit Vidalia cleanly */
void
-MainWindow::displayTorVersionWarning()
+MainWindow::onCheckForBrowser()
{
- static bool alreadyWarned = false;
+/* This only works on Windows for now */
+#if defined(Q_OS_WIN)
- if (!alreadyWarned) {
-#if !defined(USE_AUTOUPDATE)
- QString website = "https://www.torproject.org/";
-# if QT_VERSION >= 0x040200
- website = QString("<a href=\"%1\">%1</a>").arg(website);
-# endif
+ VidaliaSettings settings;
+ QString browserDirectoryFilename = settings.getBrowserExecutable();
- VMessageBox::information(this, tr("Tor Update Available"),
- p(tr("The currently installed version of Tor is out of date or no longer "
- "recommended. Please visit the Tor website to download the latest "
- "version.")) + p(tr("Tor website: %1").arg(website)),
- VMessageBox::Ok);
-#else
- int ret = VMessageBox::information(this,
- tr("Tor Update Available"),
- p(tr("The currently installed version of Tor is out of date "
- "or no longer recommended."))
- + p(tr("Would you like to check if a newer package is "
- "available for installation?")),
- VMessageBox::Yes|VMessageBox::Default,
- VMessageBox::No|VMessageBox::Escape);
+ /* Get list of running processes */
+ QHash<qint64, QString> procList = win32_process_list();
- if (ret == VMessageBox::Yes)
- checkForUpdatesWithUi();
-#endif
- alreadyWarned = true;
+ /* On old versions of Windows win32_process_list() will return
+ an empty list. In this case, just keep Vidalia open */
+ if (procList.isEmpty()) {
+ return;
+ }
+
+ /* Loop over all processes or until we find <browserDirectoryFilename> */
+ QHashIterator<qint64, QString> i(procList);
+ while (i.hasNext()) {
+ i.next();
+ if (i.value().toLower() == browserDirectoryFilename) {
+ /* The browser is still running, so Vidalia should keep running too */
+ return;
+ }
}
+
+ /* The browser isn't running, exit Vidalia */
+ vApp->quit();
+#endif
}
-/** Called when Tor's bootstrapping status changes. <b>bse</b> represents
- * Tor's current estimate of its bootstrapping progress. */
+/** Called when the web browser failed to start, for example, because the path
+ * specified to the web browser executable didn't lead to an executable. */
void
-MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs)
+MainWindow::onBrowserFailed(QString errmsg)
{
- int percentComplete = STARTUP_PROGRESS_BOOTSTRAPPING + bs.percentComplete();
- bool warn = (bs.severity() == tc::WarnSeverity &&
- bs.recommendedAction() != BootstrapStatus::RecommendIgnore);
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting web browser"),
+ tr("Vidalia was unable to start the configured web browser"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
- QString description;
- switch (bs.status()) {
- case BootstrapStatus::ConnectingToDirMirror:
+/** Called when the IM client failed to start, for example, because the path
+ * specified to the IM client executable didn't lead to an executable. */
+void
+MainWindow::onIMFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting IM client"),
+ tr("Vidalia was unable to start the configured IM client"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Starts the proxy server, if appropriately configured */
+void
+MainWindow::startProxy()
+{
+ VidaliaSettings settings;
+ QString executable = settings.getProxyExecutable();
+ _proxyProcess->start(executable, settings.getProxyExecutableArguments());
+}
+
+/** Called when the proxy server fails to start, for example, because
+ * the path specified didn't lead to an executable. */
+void
+MainWindow::onProxyFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting proxy server"),
+ tr("Vidalia was unable to start the configured proxy server"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Called when Tor's bootstrapping status changes. <b>bse</b> represents
+ * Tor's current estimate of its bootstrapping progress. */
+void
+MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs)
+{
+ int percentComplete = STARTUP_PROGRESS_BOOTSTRAPPING + bs.percentComplete();
+ bool warn = (bs.severity() == tc::WarnSeverity &&
+ bs.recommendedAction() != BootstrapStatus::RecommendIgnore);
+
+ QString description;
+ switch (bs.status()) {
+ case BootstrapStatus::ConnectingToDirMirror:
description = tr("Connecting to a relay directory");
break;
case BootstrapStatus::HandshakingWithDirMirror:
@@ -1038,116 +853,484 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs)
setStartupProgress(percentComplete, description);
}
-/** Called when Tor has successfully established a circuit. */
-void
-MainWindow::circuitEstablished()
+/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
+ * previously set TorStatus value.*/
+MainWindow::TorStatus
+MainWindow::updateTorStatus(TorStatus status)
{
- updateTorStatus(CircuitEstablished);
- // TODO: fix hardcoded total length
- setStartupProgress(130,
- tr("Connected to the Tor network!"));
- startSubprocesses();
+ QString statusText, actionText;
+ QString trayIconFile, statusIconFile;
+ TorStatus prevStatus = _status;
+
+ vNotice("Tor status changed from '%1' to '%2'.")
+ .arg(toString(prevStatus)).arg(toString(status));
+ _status = status;
-#if defined(USE_AUTOUPDATE)
+ if (status == Stopped) {
+ statusText = tr("Tor is not running");
+ actionText = tr("Start Tor");
+ trayIconFile = IMG_TOR_STOPPED;
+ statusIconFile = IMG_TOR_STOPPED_48;
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setText(actionText);
+ _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16));
+ ui.lblStartStopTor->setEnabled(true);
+ ui.lblStartStopTor->setText(actionText);
+ ui.lblStartStopTor->setPixmap(QPixmap(IMG_START_TOR_48));
+ ui.lblStartStopTor->setStatusTip(actionText);
+
+ /* XXX: This might need to be smarter if we ever start connecting other
+ * slots to these triggered() and clicked() signals. */
+ QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
+ QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
+ connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(start()));
+ setStartupProgressVisible(false);
+ } else if (status == Stopping) {
+ if (_delayedShutdownStarted) {
+ statusText = tr("Your relay is shutting down.\n"
+ "Click 'Stop' again to stop your relay now.");
+ } else {
+ statusText = tr("Tor is shutting down");
+ }
+ trayIconFile = IMG_TOR_STOPPING;
+ statusIconFile = IMG_TOR_STOPPING_48;
+
+ ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
+ } else if (status == Started) {
+ actionText = tr("Stop Tor");
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setText(actionText);
+ _actionStartStopTor->setIcon(QIcon(IMG_STOP_TOR_16));
+ ui.lblStartStopTor->setEnabled(true);
+ ui.lblStartStopTor->setText(actionText);
+ ui.lblStartStopTor->setPixmap(QPixmap(IMG_STOP_TOR_48));
+ ui.lblStartStopTor->setStatusTip(actionText);
+
+ /* XXX: This might need to be smarter if we ever start connecting other
+ * slots to these triggered() and clicked() signals. */
+ QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
+ QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(stop()));
+ connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(stop()));
+ } else if (status == Starting) {
+ statusText = tr("Starting the Tor software");
+ trayIconFile = IMG_TOR_STARTING;
+ statusIconFile = IMG_TOR_STARTING_48;
+ _actionStartStopTor->setEnabled(false);
+ ui.lblStartStopTor->setText(tr("Starting Tor"));
+ ui.lblStartStopTor->setEnabled(false);
+ ui.lblStartStopTor->setStatusTip(statusText);
+ setStartupProgressVisible(true);
+ setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
+ } else if (status == CircuitEstablished) {
+ statusText = tr("Connected to the Tor network!");
+ trayIconFile = IMG_TOR_RUNNING;
+ statusIconFile = IMG_TOR_RUNNING_48;
+ setStartupProgressVisible(false);
+ }
+
+ /* Update the tray icon */
+ if (!trayIconFile.isEmpty()) {
+ setTrayIcon(trayIconFile);
+ }
+ /* Update the status banner on the control panel */
+ if (!statusIconFile.isEmpty())
+ ui.lblTorStatusImg->setPixmap(QPixmap(statusIconFile));
+ if (!statusText.isEmpty()) {
+ _trayIcon.setToolTip(statusText);
+ ui.lblTorStatus->setText(statusText);
+ }
+ return prevStatus;
+}
+
+/** Called when the "show on startup" checkbox is toggled. */
+void
+MainWindow::toggleShowOnStartup(bool checked)
+{
VidaliaSettings settings;
- if (settings.isAutoUpdateEnabled()) {
- QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
- if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
- /* Initiate a background check for updates now */
- _updateTimer.stop();
- checkForUpdates();
- }
+ settings.setShowMainWindowAtStart(checked);
+}
+
+/** Sets the visibility of the startup status description and progress bar to
+ * <b>visible</b>. */
+void
+MainWindow::setStartupProgressVisible(bool visible)
+{
+ /* XXX: We force a repaint() to make sure the progress bar and onion status
+ * icon don't overlap briefly. This is pretty hacktastic. */
+ if (visible) {
+ ui.lblTorStatus->setVisible(false);
+ ui.lblTorStatusImg->setVisible(false);
+ repaint(ui.grpStatus->rect());
+ ui.lblStartupProgress->setVisible(true);
+ ui.progressBar->setVisible(true);
+ } else {
+ ui.lblStartupProgress->setVisible(false);
+ ui.progressBar->setVisible(false);
+ repaint(ui.grpStatus->rect());
+ ui.lblTorStatus->setVisible(true);
+ ui.lblTorStatusImg->setVisible(true);
}
-#endif
}
-/** Called when Tor thinks the user has tried to connect to a port that
- * typically is used for unencrypted applications. Warns the user and allows
- * them to ignore future warnings on <b>port</b>. It is possible that Tor
- * will produce multiple asynchronous status events warning of dangerous ports
- * while the message box is displayed (for example, while the user is away
- * from the keyboard), so subsequent messages will be discarded until the
- * first message box is dismissed. */
+/** Sets the progress bar completion value to <b>progressValue</b> and sets
+ * the status text to <b>description</b>. */
void
-MainWindow::warnDangerousPort(quint16 port, bool rejected)
+MainWindow::setStartupProgress(int progressValue,
+ const QString &description)
{
- static QMessageBox *dlg = 0;
+ ui.progressBar->setValue(progressValue);
+ ui.lblStartupProgress->setText(description);
+ _trayIcon.setToolTip(description);
+}
- /* Don't display another message box until the first one is dismissed */
- if (dlg)
- return;
+/** Attempts to start Tor. If Tor fails to start, then startFailed() will be
+ * called with an error message containing the reason. */
+void
+MainWindow::start()
+{
+ TorSettings settings;
+ QStringList args;
- QString application;
- switch (port) {
- case 23:
- application = tr("(probably Telnet)");
- break;
+ updateTorStatus(Starting);
- case 109:
- case 110:
- case 143:
- application = tr("(probably an email client)");
- break;
+ /* Check if Tor is already running separately */
+ if(settings.getControlMethod() == ControlMethod::Port) {
+ if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(),
+ settings.getControlPort())) {
+ started();
+ return;
+ }
+ } else {
+ if (socket_test_connect(settings.getSocketPath())) {
+ started();
+ return;
+ }
+ }
+
+ QString torrc = settings.getTorrc();
+ if(settings.bootstrap()) {
+ QString boottorrc = settings.bootstrapFrom();
+ vNotice(tr("Bootstrapping torrc from %1 to %2")
+ .arg(boottorrc).arg(torrc));
+ if(QFileInfo(boottorrc).exists()) {
+ if(QFile::copy(boottorrc, torrc)) {
+ settings.setBootstrap(false);
+ }
+ }
+ }
+
+ /* Make sure the torrc we want to use really exists. */
+ if (!torrc.isEmpty()) {
+ if (!QFileInfo(torrc).exists())
+ touch_file(torrc, true);
+ args << "-f" << torrc;
+ }
+
+ /* Specify Tor's data directory, if different from the default */
+ QString dataDirectory = settings.getDataDirectory();
+ QString expDataDirectory = expand_filename(dataDirectory);
+ if (!dataDirectory.isEmpty())
+ args << "DataDirectory" << expDataDirectory;
+
+ if(settings.getControlMethod() == ControlMethod::Port) {
+ if(settings.autoControlPort()) {
+ args << "ControlPort" << "auto";
+ args << "SocksPort" << "auto";
+ args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory);
+ } else {
+ /* Add the intended control port value */
+ quint16 controlPort = settings.getControlPort();
+ if (controlPort)
+ args << "ControlPort" << QString::number(controlPort);
+ }
+ } else {
+ QString path = settings.getSocketPath();
+ args << "ControlSocket" << path;
+ }
+
+ /* Add the control port authentication arguments */
+ switch (settings.getAuthenticationMethod()) {
+ case TorSettings::PasswordAuth:
+ if (! vApp->readPasswordFromStdin()) {
+ if (settings.useRandomPassword()) {
+ _controlPassword = TorSettings::randomPassword();
+ _useSavedPassword = false;
+ } else {
+ _controlPassword = settings.getControlPassword();
+ _useSavedPassword = true;
+ }
+ }
+ args << "HashedControlPassword"
+ << TorSettings::hashPassword(_controlPassword);
+ break;
+ case TorSettings::CookieAuth:
+ args << "CookieAuthentication" << "1";
+ break;
default:
- application = "";
+ args << "CookieAuthentication" << "0";
}
- QString text = tr("One of your applications %1 appears to be making a "
- "potentially unencrypted and unsafe connection to port %2.")
- .arg(application).arg(port);
+ /* This doesn't get set to false until Tor is actually up and running, so we
+ * don't yell at users twice if their Tor doesn't even start, due to the fact
+ * that QProcess::stopped() is emitted even if the process didn't even
+ * start. */
+ _isIntentionalExit = true;
+ /* Kick off the Tor process */
+ _torControl->start(settings.getExecutable(), args);
+}
- QString extraText = p(tr("Anything sent over this connection could be "
- "monitored. Please check your application's "
- "configuration and use only encrypted protocols, "
- "such as SSL, if possible."));
- if (rejected) {
- extraText.append(p(tr("Tor has automatically closed your connection in "
- "order to protect your anonymity.")));
+/** Called when the user changes a setting that needs Tor restarting */
+void
+MainWindow::restart()
+{
+ if(_torControl->stop()) {
+ start();
}
+}
- dlg = new QMessageBox(QMessageBox::Warning,
- tr("Potentially Unsafe Connection"), text,
- QMessageBox::Ok | QMessageBox::Ignore);
- dlg->setInformativeText(extraText);
- dlg->setDefaultButton(QMessageBox::Ok);
- dlg->setEscapeButton(QMessageBox::Ok);
+/** Called when the Tor process fails to start, for example, because the path
+ * specified to the Tor executable didn't lead to an executable. */
+void
+MainWindow::startFailed(QString errmsg)
+{
+ /* We don't display the error message for now, because the error message
+ * that Qt gives us in this instance is almost always "Unknown Error". That
+ * will make users sad. */
+ Q_UNUSED(errmsg);
+
+ updateTorStatus(Stopped);
- int ret = dlg->exec();
- if (ret == QMessageBox::Ignore) {
- TorControl *tc = Vidalia::torControl();
+ /* Display an error message and see if the user wants some help */
+ int response = VMessageBox::warning(this, tr("Error Starting Tor"),
+ tr("Vidalia was unable to start Tor. Check your settings "
+ "to ensure the correct name and location of your Tor "
+ "executable is specified."),
+ VMessageBox::ShowSettings|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape,
+ VMessageBox::Help);
+
+ if (response == VMessageBox::ShowSettings) {
+ /* Show the settings dialog so the user can make sure they're pointing to
+ * the correct Tor. */
+ showConfigDialog();
+ } else if (response == VMessageBox::Help) {
+ /* Show troubleshooting information about starting Tor */
+ showHelpDialog("troubleshooting.start");
+ }
+}
+
+/** Slot: Called when the Tor process is started. It will connect the control
+ * socket and set the icons and tooltips accordingly. */
+void
+MainWindow::started()
+{
+ TorSettings settings;
+
+ updateTorStatus(Started);
+
+ /* Now that Tor is running, we want to know if it dies when we didn't want
+ * it to. */
+ _isIntentionalExit = false;
+ /* We haven't started a delayed shutdown yet. */
+ _delayedShutdownStarted = false;
+ /* Remember whether we started Tor or not */
+ _isVidaliaRunningTor = _torControl->isVidaliaRunningTor();
+ /* Try to connect to Tor's control port */
+ if(settings.autoControlPort()) {
+ QString dataDirectory = settings.getDataDirectory();
+ QFile file(QString("%1/port.conf").arg(expand_filename(dataDirectory)));
+ int tries = 0, maxtries = 5;
+ while((!file.open(QIODevice::ReadOnly | QIODevice::Text)) and
+ (tries++ < maxtries)) {
+ vWarn(QString("This is try number: %1.").arg(tries));
+#if defined(Q_WS_WIN)
+ Sleep(1000);
+#else
+ sleep(1);
+#endif
+ }
+
+ if(tries >= maxtries) {
+ vWarn("Couldn't read port.conf file");
+ connectFailed(QString("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2")
+ .arg(file.fileName())
+ .arg(file.errorString()));
+ return;
+ }
+
+ QTextStream in(&file);
+ if(!in.atEnd()) {
+ QString line = in.readLine();
+ QStringList parts = line.split("=");
+ if(parts.size() != 2) return;
+ if(parts[0].trimmed() != "PORT") return;
+
+ QStringList addrPort = parts[1].split(":");
+ if(addrPort.size() != 2) return;
+
+ QHostAddress addr(addrPort.at(0));
+ _autoControlPort = addrPort.at(1).toInt();
+ _torControl->connect(addr, _autoControlPort);
+ }
+
+ file.close();
+ } else {
+ /* Try to connect to Tor's control port */
+ if(settings.getControlMethod() == ControlMethod::Port) {
+ _torControl->connect(settings.getControlAddress(),
+ settings.getControlPort());
+ _autoControlPort = settings.getControlPort();
+ } else
+ _torControl->connect(settings.getSocketPath());
+ }
+ setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
+}
+
+/** Called when the connection to the control socket fails. The reason will be
+ * given in the errmsg parameter. */
+void
+MainWindow::connectFailed(QString errmsg)
+{
+ /* Ok, ok. It really isn't going to connect. I give up. */
+ int response = VMessageBox::warning(this,
+ tr("Connection Error"), p(errmsg),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
+ VMessageBox::Retry, VMessageBox::Help);
+
+
+ if (response == VMessageBox::Retry) {
+ /* Let's give it another try. */
TorSettings settings;
- QStringList portList;
- QList<quint16> ports;
- int idx;
+ _torControl->connect(settings.getControlAddress(),
+ settings.getControlPort());
+ } else {
+ /* Show the help browser (if requested) */
+ if (response == VMessageBox::Help)
+ showHelpDialog("troubleshooting.connect");
+ /* Since Vidalia can't connect, we can't really do much, so stop Tor. */
+ _torControl->stop();
+ }
+}
- ports = settings.getWarnPlaintextPorts();
- idx = ports.indexOf(port);
- if (idx >= 0) {
- ports.removeAt(idx);
- settings.setWarnPlaintextPorts(ports);
+/** Disconnects the control socket and stops the Tor process. */
+bool
+MainWindow::stop()
+{
+ ServerSettings server(_torControl);
+ QString errmsg;
+ TorStatus prevStatus;
+ bool rc;
- foreach (quint16 port, ports) {
- portList << QString::number(port);
- }
- tc->setConf("WarnPlaintextPorts", portList.join(","));
- portList.clear();
+ /* If we're running a server, give users the option of terminating
+ * gracefully so clients have time to find new servers. */
+ if (server.isServerEnabled() && !_delayedShutdownStarted) {
+ /* Ask the user if they want to shutdown nicely. */
+ int response = VMessageBox::question(this, tr("Relaying is Enabled"),
+ tr("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?"),
+ VMessageBox::Yes|VMessageBox::Default,
+ VMessageBox::No,
+ VMessageBox::Cancel|VMessageBox::Escape);
+ if (response == VMessageBox::Yes)
+ _delayedShutdownStarted = true;
+ else if (response == VMessageBox::Cancel)
+ return false;
+ }
+
+ prevStatus = updateTorStatus(Stopping);
+ if (_delayedShutdownStarted) {
+ /* Start a delayed shutdown */
+ rc = _torControl->signal(TorSignal::Shutdown, &errmsg);
+ } else {
+ /* We want Tor to stop now, regardless of whether we're a server. */
+ _isIntentionalExit = true;
+ rc = _torControl->stop(&errmsg);
+ }
+
+ if (!rc) {
+ /* We couldn't tell Tor to stop, for some reason. */
+ int response = VMessageBox::warning(this, tr("Error Shutting Down"),
+ p(tr("Vidalia was unable to stop the Tor software."))
+ + p(errmsg),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
+ VMessageBox::Help);
+
+ if (response == VMessageBox::Help) {
+ /* Show some troubleshooting help */
+ showHelpDialog("troubleshooting.stop");
+ }
+ /* Tor is still running since stopping failed */
+ _isIntentionalExit = false;
+ _delayedShutdownStarted = false;
+ updateTorStatus(prevStatus);
+ }
+ return rc;
+}
+
+/** Slot: Called when the Tor process has exited. It will adjust the tray
+ * icons and tooltips accordingly. */
+void
+MainWindow::stopped(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ updateTorStatus(Stopped);
+
+ /* If we didn't intentionally close Tor, then check to see if it crashed or
+ * if it closed itself and returned an error code. */
+ if (!_isIntentionalExit) {
+ /* A quick overview of Tor's code tells me that if it catches a SIGTERM or
+ * SIGINT, Tor will exit(0). We might need to change this warning message
+ * if this turns out to not be the case. */
+ if (exitStatus == QProcess::CrashExit || exitCode != 0) {
+ int ret = VMessageBox::warning(this, tr("Unexpected Error"),
+ tr("Vidalia detected that the Tor software exited "
+ "unexpectedly.\n\n"
+ "Please check the message log for recent "
+ "warning or error messages."),
+ VMessageBox::Ok|VMessageBox::Escape,
+ VMessageBox::ShowLog|VMessageBox::Default,
+ VMessageBox::Help);
+ if (ret == VMessageBox::ShowLog)
+ _messageLog->showWindow();
+ else if (ret == VMessageBox::Help)
+ showHelpDialog("troubleshooting.torexited");
}
+ }
+}
- ports = settings.getRejectPlaintextPorts();
- idx = ports.indexOf(port);
- if (idx >= 0) {
- ports.removeAt(idx);
- settings.setRejectPlaintextPorts(ports);
+/** Called when the control socket has successfully connected to Tor. */
+void
+MainWindow::connected()
+{
+ authenticate();
+}
- foreach (quint16 port, ports) {
- portList << QString::number(port);
- }
- tc->setConf("RejectPlaintextPorts", portList.join(","));
- }
+/** Called when Vidalia wants to disconnect from a Tor it did not start. */
+void
+MainWindow::disconnect()
+{
+ _torControl->disconnect();
+}
+
+/** Called when the control socket has been disconnected. */
+void
+MainWindow::disconnected()
+{
+ if (!_isVidaliaRunningTor) {
+ /* If we didn't start our own Tor process, interpret losing the control
+ * connection as "Tor is stopped". */
+ updateTorStatus(Stopped);
}
- delete dlg;
- dlg = 0;
+
+ /*XXX We should warn here if we get disconnected when we didn't intend to */
+ _actionNewIdentity->setEnabled(false);
+ ui.lblNewIdentity->setEnabled(false);
+ _isVidaliaRunningTor = false;
}
/** Attempts to authenticate to Tor's control port, depending on the
@@ -1226,252 +1409,398 @@ cancel:
return false;
}
-/** Checks the status of the current version of Tor to see if it's old,
- * unrecommended, or obsolete. */
+/** Called when Vidalia has successfully authenticated to Tor. */
void
-MainWindow::checkTorVersion()
+MainWindow::authenticated()
{
- QString status;
- if (_torControl->getInfo("status/version/current", status)) {
- if (!status.compare("old", Qt::CaseInsensitive)
- || !status.compare("unrecommended", Qt::CaseInsensitive)
- || !status.compare("obsolete", Qt::CaseInsensitive)) {
- displayTorVersionWarning();
- }
- }
-}
+ ServerSettings serverSettings(_torControl);
+ QString errmsg;
-/** Searches for and attempts to load the control authentication cookie. This
- * assumes the cookie is named 'control_auth_cookie'. If <b>cookiePath</b> is
- * empty, this method will search some default locations depending on the
- * current platform. <b>cookiePath</b> can point to either a cookie file or a
- * directory containing the cookie file. */
-QByteArray
-MainWindow::loadControlCookie(QString cookiePath)
-{
- QFile authCookie;
- QStringList pathList;
+ updateTorStatus(Authenticated);
+
+ /* If Tor doesn't have bootstrapping events, then update the current
+ * status string and bump the progress bar along a bit. */
+ if (_torControl->getTorVersion() < 0x020101) {
+ setStartupProgress(STARTUP_PROGRESS_CIRCUITBUILD,
+ tr("Connecting to the Tor network"));
+ }
+
+ /* Let people click on their beloved "New Identity" button */
+ _actionNewIdentity->setEnabled(true);
+ ui.lblNewIdentity->setEnabled(true);
- if (!cookiePath.isEmpty()) {
- pathList << cookiePath;
+ /* Register for any pertinent asynchronous events. */
+ if (!_torControl->setEvents(&errmsg)) {
+ VMessageBox::warning(this, tr("Error Registering for Events"),
+ p(tr("Vidalia was unable to register for some events. "
+ "Many of Vidalia's features may be unavailable."))
+ + p(errmsg),
+ VMessageBox::Ok);
} else {
- /* Try some default locations */
- TorSettings settings;
- QString dataDir = settings.getDataDirectory();
- if (!dataDir.isEmpty())
- pathList << dataDir;
-
-#if defined(Q_WS_WIN)
- pathList << expand_filename("%APPDATA%\\Tor");
-#else
- pathList << expand_filename("~/.tor");
-#endif
+ /* Stop reading from Tor's stdout immediately, since we successfully
+ * registered for Tor events, including any desired log events. */
+ _torControl->closeTorStdout();
}
-
- /* Search for the cookie file */
- foreach (QString path, pathList) {
- QString cookieFile = QFileInfo(path).isFile() ?
- path : path + "/control_auth_cookie";
- vDebug("Checking for authentication cookie in '%1'").arg(cookieFile);
- if (!QFileInfo(cookieFile).exists())
- continue;
-
- authCookie.setFileName(cookieFile);
- if (authCookie.open(QIODevice::ReadOnly)) {
- vInfo("Reading authentication cookie from '%1'").arg(cookieFile);
- return authCookie.readAll();
- } else {
- vWarn("Couldn't open cookie file '%1': %2")
- .arg(cookieFile).arg(authCookie.errorString());
- }
+
+ /* Configure UPnP port forwarding if needed */
+ serverSettings.configurePortForwarding();
+
+ /* Check if Tor has a circuit established */
+ if (_torControl->isCircuitEstablished())
+ circuitEstablished();
+ /* Check the status of Tor's version */
+ if (_torControl->getTorVersion() >= 0x020001)
+ checkTorVersion();
+ if (_torControl->getTorVersion() >= 0x020102) {
+ BootstrapStatus status = _torControl->bootstrapStatus();
+ if (status.isValid())
+ bootstrapStatusChanged(status);
}
- vWarn("Couldn't find a readable authentication cookie.");
- return QByteArray();
}
-/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
- * previously set TorStatus value.*/
-MainWindow::TorStatus
-MainWindow::updateTorStatus(TorStatus status)
+/** Called when Vidalia fails to authenticate to Tor. The failure reason is
+ * specified in <b>errmsg</b>. */
+void
+MainWindow::authenticationFailed(QString errmsg)
{
- QString statusText, actionText;
- QString trayIconFile, statusIconFile;
- TorStatus prevStatus = _status;
-
- vNotice("Tor status changed from '%1' to '%2'.")
- .arg(toString(prevStatus)).arg(toString(status));
- _status = status;
+ bool retry = false;
+
+ vWarn("Authentication failed: %1").arg(errmsg);
- if (status == Stopped) {
- statusText = tr("Tor is not running");
- actionText = tr("Start Tor");
- trayIconFile = IMG_TOR_STOPPED;
- statusIconFile = IMG_TOR_STOPPED_48;
- _actionStartStopTor->setEnabled(true);
- _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16));
- _actionStartStopTor->setText(actionText);
- _actionStartTor->setEnabled(true);
+ /* Parsing log messages is evil, but we're left with little option */
+ if (errmsg.contains("Password did not match")) {
+ ControlPasswordInputDialog dlg;
+ connect(&dlg, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
- /* XXX: This might need to be smarter if we ever start connecting other
- * slots to these triggered() and clicked() signals. */
- QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
- connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
- setStartupProgressVisible(false);
- } else if (status == Stopping) {
- _actionStopTor->setEnabled(false);
- _actionRestartTor->setEnabled(false);
- if (_delayedShutdownStarted) {
- statusText = tr("Your relay is shutting down.\n"
- "Click 'Stop' again to stop your relay now.");
+ qint64 torPid = 0;
+
+#if defined(Q_OS_WIN32)
+ QHash<qint64, QString> procs = process_list();
+ foreach (qint64 pid, procs.keys()) {
+ if (! procs.value(pid).compare("tor.exe", Qt::CaseInsensitive)) {
+ torPid = pid;
+ break;
+ }
+ }
+ dlg.setResetEnabled(torPid > 0);
+#else
+ dlg.setResetEnabled(false);
+#endif
+
+ int ret = dlg.exec();
+ if (ret == QDialogButtonBox::Ok) {
+ if (dlg.isSavePasswordChecked()) {
+ TorSettings settings;
+ settings.setAuthenticationMethod(TorSettings::PasswordAuth);
+ settings.setUseRandomPassword(false);
+ settings.setControlPassword(dlg.password());
+ _useSavedPassword = true;
} else {
- statusText = tr("Tor is shutting down");
+ _controlPassword = dlg.password();
+ _useSavedPassword = false;
}
- trayIconFile = IMG_TOR_STOPPING;
- statusIconFile = IMG_TOR_STOPPING_48;
-
-// ui.btnStartStopTor->setStatusTip(tr("Stop Tor Now"));
- } else if (status == Started) {
- actionText = tr("Stop Tor");
- _actionStartStopTor->setEnabled(true);
- _actionStartStopTor->setIcon(QIcon(IMG_STOP_TOR_16));
- _actionStartStopTor->setText(actionText);
-
- /* XXX: This might need to be smarter if we ever start connecting other
- * slots to these triggered() and clicked() signals. */
- QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
- connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(stop()));
- } else if (status == Starting) {
- statusText = tr("Starting the Tor software");
- trayIconFile = IMG_TOR_STARTING;
- statusIconFile = IMG_TOR_STARTING_48;
- _actionStartStopTor->setEnabled(false);
- _actionStartTor->setEnabled(false);
- setStartupProgressVisible(true);
- setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
- } else if (status == CircuitEstablished) {
- statusText = tr("Connected to the Tor network!");
- trayIconFile = IMG_TOR_RUNNING;
- statusIconFile = IMG_TOR_RUNNING_48;
- setStartupProgressVisible(false);
+ retry = true;
+ } else if (ret == QDialogButtonBox::Reset) {
+ if (! process_kill(torPid)) {
+ VMessageBox::warning(this,
+ tr("Password Reset Failed"),
+ p(tr("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.")),
+ VMessageBox::Ok|VMessageBox::Default);
+ } else {
+ retry = true;
+ }
+ }
+ } else {
+ /* Something else went wrong */
+ int ret = VMessageBox::warning(this,
+ tr("Authentication Error"),
+ p(tr("Vidalia was unable to authenticate to the Tor software. "
+ "(%1)").arg(errmsg)) +
+ p(tr("Please check your control port authentication "
+ "settings.")),
+ VMessageBox::ShowSettings|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape);
+
+ if (ret == VMessageBox::ShowSettings)
+ showConfigDialog(ConfigDialog::Advanced);
}
+
+ if (_torControl->isRunning())
+ if (_isVidaliaRunningTor)
+ stop();
+ else
+ disconnect();
+ if (retry)
+ start();
+}
- /* Update the tray icon */
- if (!trayIconFile.isEmpty()) {
- setTrayIcon(trayIconFile);
+/** Searches for and attempts to load the control authentication cookie. This
+ * assumes the cookie is named 'control_auth_cookie'. If <b>cookiePath</b> is
+ * empty, this method will search some default locations depending on the
+ * current platform. <b>cookiePath</b> can point to either a cookie file or a
+ * directory containing the cookie file. */
+QByteArray
+MainWindow::loadControlCookie(QString cookiePath)
+{
+ QFile authCookie;
+ QStringList pathList;
+
+ if (!cookiePath.isEmpty()) {
+ pathList << cookiePath;
+ } else {
+ /* Try some default locations */
+ TorSettings settings;
+ QString dataDir = settings.getDataDirectory();
+ if (!dataDir.isEmpty())
+ pathList << dataDir;
+
+#if defined(Q_WS_WIN)
+ pathList << expand_filename("%APPDATA%\\Tor");
+#else
+ pathList << expand_filename("~/.tor");
+#endif
}
- /* Update the status banner on the control panel */
- if (!statusIconFile.isEmpty())
- _statusTab.setTorStatus(QPixmap(statusIconFile));
- if (!statusText.isEmpty()) {
- _trayIcon.setToolTip(statusText);
- _statusTab.setTorStatus(statusText);
+
+ /* Search for the cookie file */
+ foreach (QString path, pathList) {
+ QString cookieFile = QFileInfo(path).isFile() ?
+ path : path + "/control_auth_cookie";
+ vDebug("Checking for authentication cookie in '%1'").arg(cookieFile);
+ if (!QFileInfo(cookieFile).exists())
+ continue;
+
+ authCookie.setFileName(cookieFile);
+ if (authCookie.open(QIODevice::ReadOnly)) {
+ vInfo("Reading authentication cookie from '%1'").arg(cookieFile);
+ return authCookie.readAll();
+ } else {
+ vWarn("Couldn't open cookie file '%1': %2")
+ .arg(cookieFile).arg(authCookie.errorString());
+ }
}
- return prevStatus;
+ vWarn("Couldn't find a readable authentication cookie.");
+ return QByteArray();
}
-/** Sets the current tray or dock icon image to <b>iconFile</b>. */
+/** Called when Tor has successfully established a circuit. */
void
-MainWindow::setTrayIcon(const QString &iconFile)
+MainWindow::circuitEstablished()
{
-#if defined(Q_WS_MAC)
- QApplication::setWindowIcon(QPixmap(iconFile));
+ updateTorStatus(CircuitEstablished);
+ setStartupProgress(ui.progressBar->maximum(),
+ tr("Connected to the Tor network!"));
+ startSubprocesses();
+
+#if defined(USE_AUTOUPDATE)
+ VidaliaSettings settings;
+ if (settings.isAutoUpdateEnabled()) {
+ QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
+ if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
+ /* Initiate a background check for updates now */
+ _updateTimer.stop();
+ checkForUpdates();
+ }
+ }
#endif
- _trayIcon.setIcon(QIcon(iconFile));
}
-/** Converts a TorStatus enum value to a string for debug logging purposes. */
-QString
-MainWindow::toString(TorStatus status)
+/** Checks the status of the current version of Tor to see if it's old,
+ * unrecommended, or obsolete. */
+void
+MainWindow::checkTorVersion()
{
- switch (status) {
- /* These strings only appear in debug logs, so they should not be
- * translated. */
- case Unset: return "Unset";
- case Stopping: return "Stopping";
- case Stopped: return "Stopped";
- case Starting: return "Starting";
- case Started: return "Started";
- case Authenticating: return "Authenticating";
- case Authenticated: return "Authenticated";
- case CircuitEstablished: return "Circuit Established";
- default: break;
+ QString status;
+ if (_torControl->getInfo("status/version/current", status)) {
+ if (!status.compare("old", Qt::CaseInsensitive)
+ || !status.compare("unrecommended", Qt::CaseInsensitive)
+ || !status.compare("obsolete", Qt::CaseInsensitive)) {
+ displayTorVersionWarning();
+ }
}
- return "Unknown";
}
-/** Called when the user changes a setting that needs Tor restarting */
+/** Called when Tor thinks its version is old or unrecommended, and displays
+ * a message notifying the user. */
void
-MainWindow::restart()
+MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString ¤t,
+ const QStringList &recommended)
{
- if(_torControl->stop()) {
- start();
- }
+ Q_UNUSED(current);
+ Q_UNUSED(recommended);
+
+ if (reason == tc::ObsoleteTorVersion
+ || reason == tc::UnrecommendedTorVersion)
+ displayTorVersionWarning();
}
-/** Sends a sighup signal to Tor on platforms other than Windows */
+/** Called when Tor thinks its version is old or unrecommended, and displays a
+ * message notifying the user. */
void
-MainWindow::sighup()
+MainWindow::displayTorVersionWarning()
{
- bool rc;
- QString errmsg;
- rc = _torControl->signal(TorSignal::Reload, &errmsg);
+ static bool alreadyWarned = false;
- if (!rc) {
- int response = VMessageBox::warning(this, tr("Error reloading configuration"),
- p(tr("Vidalia was unable to reload Tor's configuration."))
- + p(errmsg),
- VMessageBox::Ok);
+ if (!alreadyWarned) {
+#if !defined(USE_AUTOUPDATE)
+ QString website = "https://www.torproject.org/";
+# if QT_VERSION >= 0x040200
+ website = QString("<a href=\"%1\">%1</a>").arg(website);
+# endif
+
+ VMessageBox::information(this, tr("Tor Update Available"),
+ p(tr("The currently installed version of Tor is out of date or no longer "
+ "recommended. Please visit the Tor website to download the latest "
+ "version.")) + p(tr("Tor website: %1").arg(website)),
+ VMessageBox::Ok);
+#else
+ int ret = VMessageBox::information(this,
+ tr("Tor Update Available"),
+ p(tr("The currently installed version of Tor is out of date "
+ "or no longer recommended."))
+ + p(tr("Would you like to check if a newer package is "
+ "available for installation?")),
+ VMessageBox::Yes|VMessageBox::Default,
+ VMessageBox::No|VMessageBox::Escape);
+
+ if (ret == VMessageBox::Yes)
+ checkForUpdatesWithUi();
+#endif
+ alreadyWarned = true;
}
}
-/** Sets the visibility of the startup status description and progress bar to
- * <b>visible</b>. */
+/** Called when Tor thinks the user has tried to connect to a port that
+ * typically is used for unencrypted applications. Warns the user and allows
+ * them to ignore future warnings on <b>port</b>. It is possible that Tor
+ * will produce multiple asynchronous status events warning of dangerous ports
+ * while the message box is displayed (for example, while the user is away
+ * from the keyboard), so subsequent messages will be discarded until the
+ * first message box is dismissed. */
void
-MainWindow::setStartupProgressVisible(bool visible)
+MainWindow::warnDangerousPort(quint16 port, bool rejected)
{
- _statusTab.setTorStatusVisible(!visible);
- _statusTab.setProgressVisible(visible);
+ static QMessageBox *dlg = 0;
+
+ /* Don't display another message box until the first one is dismissed */
+ if (dlg)
+ return;
+
+ QString application;
+ switch (port) {
+ case 23:
+ application = tr("(probably Telnet)");
+ break;
+
+ case 109:
+ case 110:
+ case 143:
+ application = tr("(probably an email client)");
+ break;
+
+ default:
+ application = "";
+ }
+
+ QString text = tr("One of your applications %1 appears to be making a "
+ "potentially unencrypted and unsafe connection to port %2.")
+ .arg(application).arg(port);
+
+ QString extraText = p(tr("Anything sent over this connection could be "
+ "monitored. Please check your application's "
+ "configuration and use only encrypted protocols, "
+ "such as SSL, if possible."));
+ if (rejected) {
+ extraText.append(p(tr("Tor has automatically closed your connection in "
+ "order to protect your anonymity.")));
+ }
+
+ dlg = new QMessageBox(QMessageBox::Warning,
+ tr("Potentially Unsafe Connection"), text,
+ QMessageBox::Ok | QMessageBox::Ignore);
+ dlg->setInformativeText(extraText);
+ dlg->setDefaultButton(QMessageBox::Ok);
+ dlg->setEscapeButton(QMessageBox::Ok);
+
+ int ret = dlg->exec();
+ if (ret == QMessageBox::Ignore) {
+ TorControl *tc = Vidalia::torControl();
+ TorSettings settings;
+ QStringList portList;
+ QList<quint16> ports;
+ int idx;
+
+ ports = settings.getWarnPlaintextPorts();
+ idx = ports.indexOf(port);
+ if (idx >= 0) {
+ ports.removeAt(idx);
+ settings.setWarnPlaintextPorts(ports);
+
+ foreach (quint16 port, ports) {
+ portList << QString::number(port);
+ }
+ tc->setConf("WarnPlaintextPorts", portList.join(","));
+ portList.clear();
+ }
+
+ ports = settings.getRejectPlaintextPorts();
+ idx = ports.indexOf(port);
+ if (idx >= 0) {
+ ports.removeAt(idx);
+ settings.setRejectPlaintextPorts(ports);
+
+ foreach (quint16 port, ports) {
+ portList << QString::number(port);
+ }
+ tc->setConf("RejectPlaintextPorts", portList.join(","));
+ }
+ }
+ delete dlg;
+ dlg = 0;
}
-/** Sets the progress bar completion value to <b>progressValue</b> and sets
- * the status text to <b>description</b>. */
+/** Creates and displays Vidalia's About dialog. */
void
-MainWindow::setStartupProgress(int progressValue,
- const QString &description)
+MainWindow::showAboutDialog()
{
- _statusTab.setProgress(progressValue, description);
- _trayIcon.setToolTip(description);
+ AboutDialog dlg(this);
+ dlg.exec();
}
-/** Called when Vidalia wants to disconnect from a Tor it did not start. */
+/** Displays the help browser and displays the most recently viewed help
+ * topic. */
void
-MainWindow::disconnect()
+MainWindow::showHelpDialog()
{
- _torControl->disconnect();
+ showHelpDialog(QString());
}
-/** Called when the control socket has been disconnected. */
+/**< Shows the help browser and displays the given help <b>topic</b>. */
void
-MainWindow::disconnected()
+MainWindow::showHelpDialog(const QString &topic)
{
- if (!_isVidaliaRunningTor) {
- /* If we didn't start our own Tor process, interpret losing the control
- * connection as "Tor is stopped". */
- updateTorStatus(Stopped);
- }
-
- /*XXX We should warn here if we get disconnected when we didn't intend to */
- _actionNewIdentity->setEnabled(false);
- _isVidaliaRunningTor = false;
+ static HelpBrowser *helpBrowser = 0;
+ if (!helpBrowser)
+ helpBrowser = new HelpBrowser(this);
+ helpBrowser->showWindow(topic);
}
+/** Creates and displays the Configuration dialog with the current page set to
+ * <b>page</b>. */
void
MainWindow::showConfigDialog(ConfigDialog::Page page)
{
- ConfigDialog *configDialog = new ConfigDialog();
- connect(configDialog, SIGNAL(helpRequested(QString)),
- this, SLOT(showHelpDialog(QString)));
- configDialog->showWindow(page);
+ _configDialog->showWindow(page);
+}
+
+/** Displays the Configuration dialog, set to the Server page. */
+void
+MainWindow::showServerConfigDialog()
+{
+ showConfigDialog(ConfigDialog::Server);
}
/** Called when the user selects the "New Identity" action from the menu. */
@@ -1492,7 +1821,7 @@ MainWindow::newIdentity()
/* Disable the New Identity button for MIN_NEWIDENTITY_INTERVAL */
_actionNewIdentity->setEnabled(false);
-// ui.lblNewIdentity->setEnabled(false);
+ ui.lblNewIdentity->setEnabled(false);
QTimer::singleShot(MIN_NEWIDENTITY_INTERVAL,
this, SLOT(enableNewIdentity()));
@@ -1514,112 +1843,28 @@ MainWindow::enableNewIdentity()
{
if (_torControl->isConnected()) {
_actionNewIdentity->setEnabled(true);
+ ui.lblNewIdentity->setEnabled(true);
}
}
-void
-MainWindow::handleCloseTab(int index)
-{
- /* If the tab that's going to be closed is the status one
- * don't do it */
- if(index == 0)
- return;
-
- delTab(index);
-}
-
-void
-MainWindow::addTab(VidaliaTab *tab)
-{
- /** If the tab's already open, display it and delete the
- * instanse passed */
- if(_tabMap.contains(tab->getTitle())) {
- ui.tabWidget->setCurrentIndex(_tabMap.indexOf(tab->getTitle()));
- /** Exception for tabs that need to be always created */
- if (tab != _messageLog &&
- tab != &_statusTab &&
- tab != &_netViewer &&
- tab != _graph)
- tab->deleteLater();
- return;
- }
-
- ui.tabWidget->addTab(tab, tab->getTitle());
- ui.tabWidget->setCurrentIndex(ui.tabWidget->count() - 1);
- /** The new tab is added to the last position */
- _tabMap << tab->getTitle();
- connect(tab, SIGNAL(helpRequested(QString)),
- this, SLOT(showHelpDialog(QString)));
-}
-
-void
-MainWindow::delTab(int index)
+/** Converts a TorStatus enum value to a string for debug logging purposes. */
+QString
+MainWindow::toString(TorStatus status)
{
- if(index == -1)
- index = ui.tabWidget->currentIndex();
-
- VidaliaTab *tab = qobject_cast<VidaliaTab*>(ui.tabWidget->widget(index));
- // if it isn't one of the tabs that's supposed to be open at every moment
- if (tab != _messageLog &&
- tab != &_statusTab &&
- tab != &_netViewer &&
- tab != _graph) {
- QObject::disconnect(ui.tabWidget->widget(index), 0, 0, 0);
- tab->deleteLater();
+ switch (status) {
+ /* These strings only appear in debug logs, so they should not be
+ * translated. */
+ case Unset: return "Unset";
+ case Stopping: return "Stopping";
+ case Stopped: return "Stopped";
+ case Starting: return "Starting";
+ case Started: return "Started";
+ case Authenticating: return "Authenticating";
+ case Authenticated: return "Authenticated";
+ case CircuitEstablished: return "Circuit Established";
+ default: break;
}
- ui.tabWidget->removeTab(index);
- QString key = _tabMap.at(index);
- _tabMap.removeAll(key);
-}
-
-void
-MainWindow::showStatusTab()
-{
- addTab(&_statusTab);
-}
-
-void
-MainWindow::showMessageLogTab()
-{
- addTab(_messageLog);
-}
-
-void
-MainWindow::showBandwithTab()
-{
- addTab(_graph);
-}
-
-/** Creates and displays Vidalia's About dialog. */
-void
-MainWindow::showAboutDialog()
-{
- AboutDialog dlg(this);
- dlg.exec();
-}
-
-/** Displays the help browser and displays the most recently viewed help
- * topic. */
-void
-MainWindow::showHelpDialog()
-{
- showHelpDialog(QString());
-}
-
-/**< Shows the help browser and displays the given help <b>topic</b>. */
-void
-MainWindow::showHelpDialog(const QString &topic)
-{
- static HelpBrowser *helpBrowser = 0;
- if (!helpBrowser)
- helpBrowser = new HelpBrowser(this);
- helpBrowser->showWindow(topic);
-}
-
-void
-MainWindow::showNetViewerTab()
-{
- addTab(&_netViewer);
+ return "Unknown";
}
#if defined(USE_MINIUPNPC)
@@ -1782,192 +2027,41 @@ MainWindow::installUpdatesFailed(const QString &errmsg)
#endif
-/** Called when browser or IM client have exited */
-void
-MainWindow::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus)
-{
- Q_UNUSED(exitCode)
- Q_UNUSED(exitStatus)
-
- /* Get path to browser and IM client */
- VidaliaSettings settings;
- QString browserExecutable = settings.getBrowserExecutable();
- QString browserDirectory = settings.getBrowserDirectory();
- QString imExecutable = settings.getIMExecutable();
-
- /* A subprocess is finished if it successfully exited or was never asked to start */
- bool browserDone = (browserExecutable.isEmpty()
- && browserDirectory.isEmpty())
- || _browserProcess->isDone();
- bool imDone = imExecutable.isEmpty() || _imProcess->isDone();
-
- /* Exit if both subprocesses are finished */
- if (browserDone && imDone) {
- if (browserDirectory.isEmpty()) {
- /* We are using the standard launcher, exit immediately */
- vApp->quit();
- } else {
- /* We are using the alternate launcher, wait until the browser has really died */
- QTimer *browserWatcher = new QTimer(this);
- connect(browserWatcher, SIGNAL(timeout()), this, SLOT(onCheckForBrowser()));
- browserWatcher->start(2000);
- }
- }
-}
-
-/** Called periodically to check if the browser is running. If it is not,
- * exit Vidalia cleanly */
-void
-MainWindow::onCheckForBrowser()
-{
-/* This only works on Windows for now */
-#if defined(Q_OS_WIN)
-
- VidaliaSettings settings;
- QString browserDirectoryFilename = settings.getBrowserExecutable();
-
- /* Get list of running processes */
- QHash<qint64, QString> procList = win32_process_list();
-
- /* On old versions of Windows win32_process_list() will return
- an empty list. In this case, just keep Vidalia open */
- if (procList.isEmpty()) {
- return;
- }
-
- /* Loop over all processes or until we find <browserDirectoryFilename> */
- QHashIterator<qint64, QString> i(procList);
- while (i.hasNext()) {
- i.next();
- if (i.value().toLower() == browserDirectoryFilename) {
- /* The browser is still running, so Vidalia should keep running too */
- return;
- }
- }
-
- /* The browser isn't running, exit Vidalia */
- vApp->quit();
-#endif
-}
-
-/** Called when the web browser failed to start, for example, because the path
- * specified to the web browser executable didn't lead to an executable. */
-void
-MainWindow::onBrowserFailed(QString errmsg)
-{
- Q_UNUSED(errmsg);
-
- /* Display an error message and see if the user wants some help */
- VMessageBox::warning(this, tr("Error starting web browser"),
- tr("Vidalia was unable to start the configured web browser"),
- VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
-}
-
-/** Called when the IM client failed to start, for example, because the path
- * specified to the IM client executable didn't lead to an executable. */
-void
-MainWindow::onIMFailed(QString errmsg)
-{
- Q_UNUSED(errmsg);
-
- /* Display an error message and see if the user wants some help */
- VMessageBox::warning(this, tr("Error starting IM client"),
- tr("Vidalia was unable to start the configured IM client"),
- VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
-}
-
-/** Starts the proxy server, if appropriately configured */
-void
-MainWindow::startProxy()
-{
- VidaliaSettings settings;
- QString executable = settings.getProxyExecutable();
- _proxyProcess->start(executable, settings.getProxyExecutableArguments());
-}
-
-/** Called when the proxy server fails to start, for example, because
- * the path specified didn't lead to an executable. */
-void
-MainWindow::onProxyFailed(QString errmsg)
-{
- Q_UNUSED(errmsg);
-
- /* Display an error message and see if the user wants some help */
- VMessageBox::warning(this, tr("Error starting proxy server"),
- tr("Vidalia was unable to start the configured proxy server"),
- VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
-}
-
-/** Start a web browser when given the directory containing the executable and profile */
-void
-MainWindow::launchBrowserFromDirectory()
-{
- VidaliaSettings settings;
-
- QString browserDirectory = settings.getBrowserDirectory();
- QString browserDirectoryFilename = settings.getBrowserExecutable();
-
- /* Set TZ=UTC (to stop leaking timezone information) and
- * MOZ_NO_REMOTE=1 (to allow multiple instances of Firefox */
+QStringList
+MainWindow::updateBrowserEnv() {
+ TorSettings settings;
QStringList env = QProcess::systemEnvironment();
env << "TZ=UTC";
env << "MOZ_NO_REMOTE=1";
- _browserProcess->setEnvironment(env);
-
- /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */
- QString browserExecutable =
- QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename);
- /* The profile is in <browserDirectory>/Data/profile */
- QString profileDir =
- QDir::toNativeSeparators(browserDirectory + "/Data/profile");
-
- /* Copy the profile directory if it's not already there */
- QDir browserDirObj = QDir(browserDirectory);
-
- /* Copy the profile directory if it's not already there */
- if (!browserDirObj.exists("Data/profile")) {
- browserDirObj.mkdir("Data/profile");
- copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile");
- }
- /* Copy the plugins directory if it's not already there */
- if (!browserDirObj.exists("Data/plugins")) {
- browserDirObj.mkdir("Data/plugins");
- copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins");
- }
+ if(settings.autoControlPort()) {
+ QString errmsg, socks;
+ if(!(_torControl->getInfo("net/listeners/socks", socks, &errmsg))) {
+ vInfo(errmsg);
+ return env;
+ }
- /* Build the command line arguments */
- QStringList commandLine;
- // Is this better or worse than MOZ_NO_REMOTE?
- //commandLine << "-no-remote";
- commandLine << "-profile";
- commandLine << profileDir;
+ QStringList addrPort = socks.split(":");
+ if(addrPort.size() != 2) return env;
- /* Launch the browser */
- _browserProcess->start(browserExecutable, commandLine);
-}
+ QHostAddress addr(addrPort.at(0));
+ quint16 port = addrPort.at(1).toInt();
-/** Starts the web browser and IM client, if appropriately configured */
-void
-MainWindow::startSubprocesses()
-{
- VidaliaSettings settings;
- QString subprocess;
+ env << QString("TOR_SOCKS_HOST=%1").arg(addr.toString());
+ env << QString("TOR_SOCKS_PORT=%1").arg(port);
- /* Launch the web browser */
- if (!(subprocess = settings.getBrowserDirectory()).isEmpty()) {
- /* The user has set BrowserDirectory; use this */
- launchBrowserFromDirectory();
- } else if (!(subprocess = settings.getBrowserExecutable()).isEmpty()) {
- /* BrowserDirectory is not set, but BrowserExecutable is; use this */
- _browserProcess->setEnvironment(QProcess::systemEnvironment() << "TZ=UTC");
- _browserProcess->start(subprocess, QStringList());
+ vInfo(QString("Using automatic ControlPort and SocksPort configuration:\n"
+ " ControlPort=%1\n SocksPort=%2\n Host=%3\n Configuration file:%4")
+ .arg(_autoControlPort)
+ .arg(port)
+ .arg(addrPort.at(0))
+ .arg(QString("%1/port.conf").arg(expand_filename(settings.getDataDirectory()))));
}
- /* Launch the IM client */
- subprocess = settings.getIMExecutable();
+ if(settings.getAuthenticationMethod() == TorSettings::PasswordAuth) {
+ env << QString("TOR_CONTROL_PASSWD=%1").arg(QString(_controlPassword.toAscii().toHex()));
+ env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort);
+ }
- if (!subprocess.isEmpty())
- _imProcess->start(subprocess, QStringList());
+ return env;
}
-
diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
index a01f167..dc251e1 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
@@ -20,12 +20,16 @@
#include "ui_MainWindow.h"
#include "VidaliaWindow.h"
-#include "StatusTab.h"
-#include "ConfigDialog.h"
+#include "HelperProcess.h"
+#include "AboutDialog.h"
#include "MessageLog.h"
-#include "NetViewer.h"
#include "BandwidthGraph.h"
-#include "HelperProcess.h"
+#include "ConfigDialog.h"
+#include "HelpBrowser.h"
+#include "NetViewer.h"
+
+#include "TorControl.h"
+
#if defined(USE_AUTOUPDATE)
#include "UpdateProcess.h"
#include "UpdateProgressDialog.h"
@@ -34,8 +38,6 @@
#include "UPNPControl.h"
#endif
-#include "TorControl.h"
-
#include <QMainWindow>
#include <QTimer>
#include <QSystemTrayIcon>
@@ -62,12 +64,15 @@ private slots:
/** Respond to a double-click on the tray icon by opening the Control Panel
* window. */
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
+ /** Displays the help browser and displays the most recently viewed help
+ * topic. */
+ void showHelpDialog();
+ /** Called when a child window requests the given help <b>topic</b>. */
+ void showHelpDialog(const QString &topic);
/** Called when the user selects "Start" from the menu. */
void start();
/** Called when the user changes a setting that needs Tor restarting */
void restart();
- /** Called when the user wants to reload Tor's config */
- void sighup();
/** Called when the Tor process fails to start. */
void startFailed(QString errmsg);
/** Called when the Tor process has successfully started. */
@@ -102,6 +107,26 @@ private slots:
/** Terminate the Tor process if it is being run under Vidalia, disconnect
* all TorControl signals, and exit Vidalia. */
void aboutToQuit();
+ /** Creates and displays Vidalia's About dialog. */
+ void showAboutDialog();
+ /** Creates and displays the Configuration dialog with the current page set
+ * to <b>page</b>. */
+ void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
+ /** Displays the Configuration dialog, set to the Server page. */
+ void showServerConfigDialog();
+ /** Called when the "show on startup" checkbox is toggled. */
+ void toggleShowOnStartup(bool checked);
+ /** Called when the web browser or IM client have stopped */
+ void onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus);
+ /** Called periodically to check if the browser is running. If it is not,
+ * exit Vidalia cleanly */
+ void onCheckForBrowser();
+ /** Called web the web browser failed to start */
+ void onBrowserFailed(QString errmsg);
+ /** Called web the IM client failed to start */
+ void onIMFailed(QString errmsg);
+ /** Called when the proxy server fails to start */
+ void onProxyFailed(QString errmsg);
/** Called when Tor has successfully established a circuit. */
void circuitEstablished();
@@ -117,42 +142,6 @@ private slots:
void dangerousTorVersion(tc::TorVersionStatus reason,
const QString &version,
const QStringList &recommended);
- void handleCloseTab(int index);
- /** Creates and displays the Configuration dialog with the current page set
- * to <b>page</b>. */
- void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
- /** Displays the Message Log tab */
- void showMessageLogTab();
- /** Displays the General Tor Status tab */
- void showStatusTab();
- /** Displays the Bandwidth graph tab */
- void showBandwithTab();
- /** Displays the Network map tab */
- void showNetViewerTab();
- /** Creates and displays Vidalia's About dialog. */
- void showAboutDialog();
- /** Displays the help browser and displays the most recently viewed help
- * topic. */
- void showHelpDialog();
- /** Called when a child window requests the given help <b>topic</b>. */
- void showHelpDialog(const QString &topic);
-
- /** Adds a new tab to the MainWindow */
- void addTab(VidaliaTab *tab);
- /** Deletes the tab at index if it exists and it isn't the Status tab */
- void delTab(int index = -1);
-
- /** Called when the web browser or IM client have stopped */
- void onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus);
- /** Called periodically to check if the browser is running. If it is not,
- * exit Vidalia cleanly */
- void onCheckForBrowser();
- /** Called web the web browser failed to start */
- void onBrowserFailed(QString errmsg);
- /** Called web the IM client failed to start */
- void onIMFailed(QString errmsg);
- /** Called when the proxy server fails to start */
- void onProxyFailed(QString errmsg);
#if defined(USE_AUTOUPDATE)
/** Called when the user clicks the 'Check Now' button in the General
@@ -177,7 +166,6 @@ private slots:
void installUpdatesFailed(const QString &errmsg);
#endif
-
#if defined(USE_MINIUPNPC)
/** Called when a UPnP error occurs. */
void upnpError(UPNPControl::UPNPError error);
@@ -194,9 +182,6 @@ private:
Authenticated, /**< Vidalia has authenticated to Tor. */
CircuitEstablished /**< Tor has built a circuit. */
};
-
- void createGUI();
- void createConnections();
/** Create the actions on the tray menu or menubar */
void createActions();
/** Creates a tray icon with a context menu and adds it to the system
@@ -204,15 +189,19 @@ private:
void createTrayIcon();
/** Create the tray popup menu and it's submenus */
QMenu* createTrayMenu();
- /** Creates a menubar */
+ /** Creates a default menubar on Mac */
void createMenuBar();
- /** Creates a toolbar */
- void createToolBar();
/** Sets the current tray or dock icon image to <b>iconFile</b>. */
void setTrayIcon(const QString &iconFile);
/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
* previously set TorStatus value. */
TorStatus updateTorStatus(TorStatus status);
+ /** Start a web browser when given the directory containing the executable and profile */
+ void launchBrowserFromDirectory();
+ /** Starts the web browser, if appropriately configured */
+ void startSubprocesses();
+ /** Starts the proxy server, if appropriately configured */
+ void startProxy();
/** Converts a TorStatus enum value to a string for debug logging purposes. */
QString toString(TorStatus status);
/** Authenticates Vidalia to Tor's control port. */
@@ -236,6 +225,9 @@ private:
/** Sets the progress bar completion value to <b>progressValue</b> and sets
* the status text to <b>description</b>. */
void setStartupProgress(int percentComplete, const QString &description);
+ /** Adds the needed variables to the environment that the browser will
+ * need */
+ QStringList updateBrowserEnv();
/** The current status of Tor. */
TorStatus _status;
@@ -245,8 +237,22 @@ private:
bool _delayedShutdownStarted;
/** Set to true if Vidalia started its own Tor process. */
bool _isVidaliaRunningTor;
+ /** A MessageLog object which handles logging Tor messages */
+ MessageLog* _messageLog;
+ /** A BandwidthGraph object which handles monitoring Tor bandwidth usage */
+ BandwidthGraph* _bandwidthGraph;
+ /** A NetViewer object which displays the Tor network graphically */
+ NetViewer* _netViewer;
+ /** A ConfigDialog object which lets the user configure Tor and Vidalia */
+ ConfigDialog* _configDialog;
/** A TorControl object that handles communication with Tor */
TorControl* _torControl;
+ /** A HelperProcess object that manages the web browser */
+ HelperProcess* _browserProcess;
+ /** A HelperProcess object that manages the IM client */
+ HelperProcess* _imProcess;
+ /** A HelperProcess object that manages the proxy server */
+ HelperProcess* _proxyProcess;
/** Remembers the control password between when we start Tor with a hash of
* the password and when we need to provide the password itself. */
QString _controlPassword;
@@ -256,20 +262,6 @@ private:
/** The Vidalia icon that sits in the tray. */
QSystemTrayIcon _trayIcon;
- /** Start a web browser when given the directory containing the executable and profile */
- void launchBrowserFromDirectory();
- /** Starts the web browser, if appropriately configured */
- void startSubprocesses();
- /** Starts the proxy server, if appropriately configured */
- void startProxy();
-
- /** A HelperProcess object that manages the web browser */
- HelperProcess* _browserProcess;
- /** A HelperProcess object that manages the IM client */
- HelperProcess* _imProcess;
- /** A HelperProcess object that manages the proxy server */
- HelperProcess* _proxyProcess;
-
#if defined(USE_AUTOUPDATE)
/** Timer used to remind us to check for software updates. */
QTimer _updateTimer;
@@ -281,32 +273,26 @@ private:
/** Set to true if Vidalia should restart Tor after a software upgrade. */
bool _restartTorAfterUpgrade;
#endif
+ /** The menubar (Mac OS X only). */
+ QMenuBar *_menuBar;
/** Defines the actions for the tray menu */
- QAction *_actionShowControlPanel;
- QAction *_actionStartStopTor;
- QAction *_actionStartTor;
- QAction *_actionStopTor;
- QAction *_actionRestartTor;
- QAction *_actionReloadConfig;
- QAction *_actionNewIdentity;
- QAction *_actionStatus;
- QAction *_actionNetworkMap;
- QAction *_actionMessageLog;
- QAction *_actionBandwidthGraph;
- QAction *_actionConfigure;
- QAction *_actionVidaliaHelp;
- QAction *_actionAbout;
- QAction *_actionExit;
+ QAction* _actionShowControlPanel;
+ QAction* _actionStartStopTor;
+ QAction* _actionShowConfig;
+ QAction* _actionShowAbout;
+ QAction* _actionExit;
+ QAction* _actionShowBandwidth;
+ QAction* _actionShowMessageLog;
+ QAction* _actionShowHelp;
+ QAction* _actionShowNetworkMap;
+ QAction* _actionNewIdentity;
- Ui::MainWindow ui; /**< Qt Designer generated object. */
+ quint16 _autoControlPort;
- StatusTab _statusTab; /**< Status tab that displays the load progress and a short log */
- MessageLog *_messageLog; /**< Message log that displays a more detailed log from Tor */
- NetViewer _netViewer; /**< Network map that draws circuits */
- QStringList _tabMap; /**< Map to handle opened tabs */
- BandwidthGraph *_graph; /**< Graph that draws bandwidth usage */
+ Ui::MainWindow ui; /**< Qt Designer generated object. */
};
#endif
+
diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui
index d8bb5ce..5668cdc 100644
--- a/src/vidalia/MainWindow.ui
+++ b/src/vidalia/MainWindow.ui
@@ -1,73 +1,603 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>800</width>
- <height>600</height>
- </rect>
+ <widget class="QMainWindow" name="MainWindow" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="windowTitle">
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>1</height>
+ </size>
+ </property>
+ <property name="windowTitle" >
<string>Vidalia Control Panel</string>
</property>
- <property name="windowIcon">
- <iconset resource="res/vidalia.qrc">
- <normaloff>:/images/128x128/tor-logo.png</normaloff>:/images/128x128/tor-logo.png</iconset>
+ <property name="windowIcon" >
+ <iconset resource="res/vidalia.qrc" >:/images/32x32/tor-logo.png</iconset>
</property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="VTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>-1</number>
+ <widget class="QWidget" name="centralwidget" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>20</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="grpStatus" >
+ <property name="geometry" >
+ <rect>
+ <x>20</x>
+ <y>10</y>
+ <width>400</width>
+ <height>72</height>
+ </rect>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="title" >
+ <string>Status</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>4</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="lblStartupProgress" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>Starting Tor</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QProgressBar" name="progressBar" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ <property name="minimum" >
+ <number>0</number>
+ </property>
+ <property name="maximum" >
+ <number>130</number>
+ </property>
+ <property name="textVisible" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>4</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>4</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblTorStatusImg" >
+ <property name="pixmap" >
+ <pixmap>:/images/48x48/tor-off.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblTorStatus" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>Tor is not running</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpShortcuts" >
+ <property name="geometry" >
+ <rect>
+ <x>20</x>
+ <y>10</y>
+ <width>400</width>
+ <height>225</height>
+ </rect>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="title" >
+ <string>Vidalia Shortcuts</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="0" column="0" colspan="2" >
+ <widget class="VClickLabel" native="1" name="lblStartStopTor" >
+ <property name="text" >
+ <string>Start Tor</string>
+ </property>
+ <property name="statusTip" >
+ <string>Start Tor</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/48x48/start-tor.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" colspan="2" >
+ <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
+ <property name="text" >
+ <string>Setup Relaying</string>
+ </property>
+ <property name="statusTip" >
+ <string>Set up a relay and help the network grow</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/48x48/preferences-system-network-sharing.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="VClickLabel" native="1" name="lblViewNetwork" >
+ <property name="text" >
+ <string>View the Network</string>
+ </property>
+ <property name="statusTip" >
+ <string>View a map of the Tor network</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/48x48/applications-internet.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" colspan="2" >
+ <widget class="VClickLabel" native="1" name="lblNewIdentity" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Use a New Identity</string>
+ </property>
+ <property name="statusTip" >
+ <string>Make subsequent connections appear new</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/48x48/view-media-artist.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="4" >
+ <widget class="Line" name="line" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="4" >
+ <widget class="QWidget" name="lowerLayout" >
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QWidget" name="leftVerticalLayout" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="VClickLabel" name="lblBandwidthGraph" >
+ <property name="text" >
+ <string>Bandwidth Graph</string>
+ </property>
+ <property name="statusTip" >
+ <string>View recent bandwidth usage</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/22x22/utilities-system-monitor.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="VClickLabel" name="lblMessageLog" >
+ <property name="text" >
+ <string>Message Log</string>
+ </property>
+ <property name="statusTip" >
+ <string>View log message history</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/22x22/format-justify-fill.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>18</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QWidget" name="midVerticalLayout" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="VClickLabel" name="lblHelpBrowser" >
+ <property name="text" >
+ <string>Help</string>
+ </property>
+ <property name="statusTip" >
+ <string>View help documentation</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/22x22/system-help.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="VClickLabel" name="lblSettings" >
+ <property name="text" >
+ <string>Settings</string>
+ </property>
+ <property name="statusTip" >
+ <string>Configure Vidalia</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/22x22/preferences-system.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>18</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QWidget" name="rightVerticalLayout" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="VClickLabel" name="lblAboutVidalia" >
+ <property name="text" >
+ <string>About</string>
+ </property>
+ <property name="statusTip" >
+ <string>View version and license information</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/22x22/help-about.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="VClickLabel" name="lblExit" >
+ <property name="text" >
+ <string>Exit</string>
+ </property>
+ <property name="statusTip" >
+ <string>Exit Vidalia</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/22x22/application-exit.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>18</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="chkShowOnStartup" >
+ <property name="text" >
+ <string>Show this window on startup</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>18</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnHide" >
+ <property name="text" >
+ <string>Hide</string>
</property>
- <property name="tabsClosable">
- <bool>true</bool>
+ <property name="statusTip" >
+ <string>Hide this window</string>
</property>
</widget>
</item>
</layout>
</item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
- <widget class="QMenuBar" name="menubar">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>800</width>
- <height>21</height>
- </rect>
- </property>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
- <widget class="QToolBar" name="toolBar">
- <property name="windowTitle">
- <string>toolBar</string>
- </property>
- <attribute name="toolBarArea">
- <enum>TopToolBarArea</enum>
- </attribute>
- <attribute name="toolBarBreak">
- <bool>false</bool>
- </attribute>
- </widget>
+ <widget class="QStatusBar" name="statusbar" />
</widget>
<customwidgets>
<customwidget>
- <class>VTabWidget</class>
- <extends>QTabWidget</extends>
- <header>VTabWidget.h</header>
- <container>1</container>
+ <class>VClickLabel</class>
+ <extends>QWidget</extends>
+ <header>VClickLabel.h</header>
</customwidget>
</customwidgets>
<resources>
- <include location="res/vidalia.qrc"/>
+ <include location="res/vidalia.qrc" />
</resources>
- <connections/>
+ <connections>
+ <connection>
+ <sender>lblStartStopTor</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>start()</slot>
+ </connection>
+ <connection>
+ <sender>lblNewIdentity</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>newIdentity()</slot>
+ </connection>
+ <connection>
+ <sender>lblSetupRelaying</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>showServerConfigDialog()</slot>
+ </connection>
+ <connection>
+ <sender>lblSettings</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>showConfigDialog()</slot>
+ </connection>
+ <connection>
+ <sender>lblAboutVidalia</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>showAboutDialog()</slot>
+ </connection>
+ <connection>
+ <sender>lblExit</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>close()</slot>
+ </connection>
+ <connection>
+ <sender>chkShowOnStartup</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>MainWindow</receiver>
+ <slot>toggleShowOnStartup(bool)</slot>
+ </connection>
+ <connection>
+ <sender>btnHide</sender>
+ <signal>clicked()</signal>
+ <receiver>MainWindow</receiver>
+ <slot>hide()</slot>
+ </connection>
+ </connections>
</ui>
diff --git a/src/vidalia/StatusTab.cpp b/src/vidalia/StatusTab.cpp
deleted file mode 100644
index f32924b..0000000
--- a/src/vidalia/StatusTab.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "StatusTab.h"
-#include "VidaliaSettings.h"
-
-#define DEFAULT_MAX_MSG_COUNT 50
-#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
-
-StatusTab::StatusTab(QWidget *parent)
- : VidaliaTab(tr("Status"), "MessageLog", parent)
-{
- ui.setupUi(this);
- ui.listNotifications->sortItems(0, Qt::AscendingOrder);
- uint maxMsgCount = getSetting(SETTING_MAX_MSG_COUNT,
- DEFAULT_MAX_MSG_COUNT).toUInt();
- ui.listNotifications->setMaximumItemCount(maxMsgCount);
-}
-
-StatusTab::~StatusTab()
-{
-
-}
-
-void
-StatusTab::setTorStatus(const QString &text)
-{
- ui.lblTorStatus->setText(text);
-}
-
-void
-StatusTab::setTorStatus(const QPixmap &icon)
-{
- ui.lblTorStatusImg->setPixmap(icon);
-}
-
-void
-StatusTab::setTorStatus(const QPixmap &icon, const QString &text)
-{
- ui.lblTorStatusImg->setPixmap(icon);
- ui.lblTorStatus->setText(text);
-}
-
-void
-StatusTab::setTorStatusVisible(bool visible)
-{
- ui.lblTorStatusImg->setVisible(visible);
- ui.lblTorStatus->setVisible(visible);
-}
-
-void
-StatusTab::setProgress(int progress, const QString &description)
-{
- ui.progressBar->setValue(progress);
- ui.lblStartupProgress->setText(description);
-}
-
-void
-StatusTab::setProgressVisible(bool visible)
-{
- ui.progressBar->setVisible(visible);
- ui.lblStartupProgress->setVisible(visible);
-}
-
-bool
-StatusTab::isCheckedShowOnStartup()
-{
- return ui.chkShowOnStartup->isChecked();
-}
-
-void
-StatusTab::checkShowOnStartup(bool check)
-{
- ui.chkShowOnStartup->setChecked(check);
-}
-
-void
-StatusTab::hideCheckShowOnStartup()
-{
- ui.chkShowOnStartup->hide();
-}
-
-/** Called when the "show on startup" checkbox is toggled. */
-void
-StatusTab::toggleShowOnStartup(bool checked)
-{
- VidaliaSettings settings;
- settings.setShowMainWindowAtStart(checked);
-}
-
-void
-StatusTab::retranslateUi()
-{
- ui.retranslateUi(this);
- setTitle(tr("Status"));
-}
diff --git a/src/vidalia/StatusTab.h b/src/vidalia/StatusTab.h
deleted file mode 100644
index 440c2b7..0000000
--- a/src/vidalia/StatusTab.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file StatusTab.h
-** \brief Main tab that shows the current Tor status
-*/
-
-#ifndef _STATUSTAB_H
-#define _STATUSTAB_H
-
-#include "ui_StatusTab.h"
-#include "VidaliaTab.h"
-
-class StatusTab : public VidaliaTab
-{
- Q_OBJECT
-
-public:
- /** Default constructor */
- StatusTab(QWidget *parent = 0);
- /** Destructor. */
- ~StatusTab();
-
- /** Sets the icon to the general Tor status display */
- void setTorStatus(const QPixmap &icon);
- /** Sets the text to the general Tor status display */
- void setTorStatus(const QString &text);
- /** Wrapper for the first two methods for ease of use */
- void setTorStatus(const QPixmap &icon, const QString &text);
- /** Sets the Tor status display to visible or hidden */
- void setTorStatusVisible(bool visible);
-
- /** Sets the progress bar and its description */
- void setProgress(int progress, const QString &description);
- /** Sets the visibility of the progress bar */
- void setProgressVisible(bool visible);
-
- /** Returns true if the "Show on start up" checkbox is checked */
- bool isCheckedShowOnStartup();
- /** Sets "Show on start up" checkbox checked if check is true */
- void checkShowOnStartup(bool check);
- /** Hides the "Show on start up" checkbox */
- void hideCheckShowOnStartup();
-
-private slots:
- /** Called when the "show on startup" checkbox is toggled. */
- void toggleShowOnStartup(bool checked);
-
-protected:
- /** Called when the user changes the UI translation. */
- void retranslateUi();
-
-private:
- Ui::StatusTab ui;
-};
-
-#endif
diff --git a/src/vidalia/StatusTab.ui b/src/vidalia/StatusTab.ui
deleted file mode 100644
index a89f303..0000000
--- a/src/vidalia/StatusTab.ui
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>StatusTab</class>
- <widget class="QWidget" name="StatusTab">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>513</width>
- <height>421</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string notr="true"/>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QGroupBox" name="grpStatus">
- <property name="title">
- <string>Status</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="lblTorStatusImg">
- <property name="text">
- <string notr="true"/>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="lblTorStatus">
- <property name="text">
- <string notr="true">Tor is not running</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="0">
- <widget class="QLabel" name="lblStartupProgress">
- <property name="text">
- <string notr="true">Starting Tor</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QProgressBar" name="progressBar">
- <property name="maximum">
- <number>130</number>
- </property>
- <property name="value">
- <number>24</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QGroupBox" name="grpLog">
- <property name="title">
- <string>Message Log</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="StatusEventWidget" name="listNotifications">
- <property name="contextMenuPolicy">
- <enum>Qt::CustomContextMenu</enum>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="selectionBehavior">
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <property name="indentation">
- <number>0</number>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="itemsExpandable">
- <bool>false</bool>
- </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
- <attribute name="headerShowSortIndicator" stdset="0">
- <bool>true</bool>
- </attribute>
- <column>
- <property name="text">
- <string>Tor Status</string>
- </property>
- </column>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QCheckBox" name="chkShowOnStartup">
- <property name="text">
- <string>Show on startup</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>StatusEventWidget</class>
- <extends>QTreeWidget</extends>
- <header>StatusEventWidget.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections>
- <connection>
- <sender>chkShowOnStartup</sender>
- <signal>toggled(bool)</signal>
- <receiver>StatusTab</receiver>
- <slot>toggleShowOnStartup(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>256</x>
- <y>368</y>
- </hint>
- <hint type="destinationlabel">
- <x>256</x>
- <y>210</y>
- </hint>
- </hints>
- </connection>
- </connections>
- <slots>
- <slot>toggleShowOnStartup(bool)</slot>
- </slots>
-</ui>
diff --git a/src/vidalia/VClickLabel.cpp b/src/vidalia/VClickLabel.cpp
new file mode 100644
index 0000000..9691a52
--- /dev/null
+++ b/src/vidalia/VClickLabel.cpp
@@ -0,0 +1,95 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+*/
+
+/*
+** \file VClickLabel.cpp
+** \brief Custom widget to create a clickable label with both an image and text.
+*/
+
+#include "VClickLabel.h"
+#include "Vidalia.h"
+
+#include <QPainter>
+
+
+/** Default constructor. */
+VClickLabel::VClickLabel(QWidget *parent)
+ : QWidget(parent)
+{
+ setCursor(Qt::PointingHandCursor);
+}
+
+/** Returns the current size hint for this widget's current contents. */
+QSize
+VClickLabel::sizeHint() const
+{
+ int height = qMax(_pixmap.height(), fontMetrics().height())+2;
+ int width = _pixmap.width() + fontMetrics().width(_text)+2;
+ return QSize(width, height);
+}
+
+/** Returns the minimum size hint for this widget's current contents. */
+QSize
+VClickLabel::minimumSizeHint() const
+{
+ return sizeHint();
+}
+
+/** Overloaded paint event to draw a pixmap and a text label. */
+void
+VClickLabel::paintEvent(QPaintEvent *e)
+{
+ QPainter p(this);
+ QRect rect = this->rect();
+
+ if (vApp->isLeftToRight()) {
+ if (!_pixmap.isNull())
+ p.drawPixmap(0, qMax((rect.height()-_pixmap.height())/2, 0), _pixmap);
+ if (!_text.isEmpty())
+ p.drawText(_pixmap.width()+2, (rect.height()+fontInfo().pixelSize())/2, _text);
+ } else {
+ if (!_pixmap.isNull())
+ p.drawPixmap(qMax(rect.right()-_pixmap.width(), 0),
+ qMax((rect.height()-_pixmap.height())/2, 0), _pixmap);
+ if (!_text.isEmpty()) {
+ int textWidth = fontMetrics().width(_text);
+ p.drawText(qMax(rect.right()-_pixmap.width()-textWidth-2, 0),
+ (rect.height()+fontInfo().pixelSize())/2, _text);
+ }
+ }
+ e->accept();
+}
+
+/** Overloaded mouse event to catch left mouse button clicks. */
+void
+VClickLabel::mouseReleaseEvent(QMouseEvent *e)
+{
+ if (e->button() == Qt::LeftButton) {
+ emit clicked();
+ }
+ e->accept();
+}
+
+/** Sets the label text to <b>text</b>. */
+void
+VClickLabel::setText(const QString &text)
+{
+ _text = text;
+ update();
+}
+
+/** Sets the widget's image to <b>img</b>. */
+void
+VClickLabel::setPixmap(const QPixmap &pixmap)
+{
+ _pixmap = pixmap;
+ update();
+}
+
diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h
new file mode 100644
index 0000000..daa7559
--- /dev/null
+++ b/src/vidalia/VClickLabel.h
@@ -0,0 +1,59 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+*/
+
+/*
+** \file VClickLabel.h
+** \brief Custom widget to create a clickable label with both an image and text.
+*/
+
+#ifndef _VCLICKLABEL_H
+#define _VCLICKLABEL_H
+
+#include <QWidget>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QSize>
+
+
+class VClickLabel : public QWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ VClickLabel(QWidget *parent = 0);
+
+ /** Returns the current size hint for this widget's current contents. */
+ virtual QSize sizeHint() const;
+ /** Returns the minimum size hint for this widget's current contents. */
+ virtual QSize minimumSizeHint() const;
+
+ /** Sets the label text to <b>text</b>. */
+ void setText(const QString &text);
+ /** Sets the widget's image to <b>img</b>. */
+ void setPixmap(const QPixmap &img);
+
+signals:
+ /** Emitted when the widget is left-clicked. */
+ void clicked();
+
+protected:
+ /** Overloaded paint event to draw a pixmap and a text label. */
+ virtual void paintEvent(QPaintEvent *e);
+ /** Overloaded mouse event to catch left mouse button clicks. */
+ virtual void mouseReleaseEvent(QMouseEvent *e);
+
+private:
+ QString _text; /**< Text label to display in the widget. */
+ QPixmap _pixmap; /**< Image to display in the widget. */
+};
+
+#endif
+
diff --git a/src/vidalia/VTabWidget.cpp b/src/vidalia/VTabWidget.cpp
deleted file mode 100644
index 421f069..0000000
--- a/src/vidalia/VTabWidget.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <QTabBar>
-
-#include "VTabWidget.h"
-#include "VidaliaTab.h"
-
-VTabWidget::VTabWidget(QWidget *parent) : QTabWidget(parent)
-{
- connect(this, SIGNAL(currentChanged(int)), this, SLOT(updateTop(int)));
-}
-
-VTabWidget::~VTabWidget()
-{
-
-}
-
-void
-VTabWidget::pinTab(int position)
-{
- tabBar()->setTabButton(position, QTabBar::RightSide, 0);
-}
-
-void
-VTabWidget::updateTop(int index)
-{
- for(int i=0; i<count(); i++)
- if(widget(i))
- qobject_cast<VidaliaTab *>(widget(i))->setOnTop(false);
- if(widget(index))
- qobject_cast<VidaliaTab *>(widget(index))->setOnTop(true);
-}
-
-void
-VTabWidget::changeEvent(QEvent *e)
-{
- if (e->type() == QEvent::LanguageChange) {
- retranslateUi();
- e->accept();
- return;
- }
- QTabWidget::changeEvent(e);
-}
-
-void
-VTabWidget::retranslateUi()
-{
- for(int i=0; i<count(); i++) {
- // We have to translate twice the tabs because otherwise the titles won't
- // get updated
- QApplication::sendEvent(qobject_cast<VidaliaTab *>(widget(i)), new QEvent(QEvent::LanguageChange));
- setTabText(i, qobject_cast<VidaliaTab *>(widget(i))->getTitle());
- }
-}
diff --git a/src/vidalia/VTabWidget.h b/src/vidalia/VTabWidget.h
deleted file mode 100644
index c3eb8ce..0000000
--- a/src/vidalia/VTabWidget.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file VTabWidget.h
-** \brief Implements a tab bar for more flexible handle of tabs
-*/
-
-#ifndef _VTABWIDGET_H
-#define _VTABWIDGET_H
-
-#include <QTabWidget>
-
-class VTabWidget : public QTabWidget
-{
- Q_OBJECT
-
-public:
- /** Default constructor */
- VTabWidget(QWidget *parent = 0);
- /** Destructor */
- ~VTabWidget();
-
- /** Makes the tab at position unclosable */
- void pinTab(int position);
-
-protected:
- void changeEvent(QEvent *e);
- void retranslateUi();
-
-private slots:
- void updateTop(int index);
-};
-
-#endif
-
diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp
index c763fac..53b41c9 100644
--- a/src/vidalia/Vidalia.cpp
+++ b/src/vidalia/Vidalia.cpp
@@ -252,6 +252,12 @@ Vidalia::parseArguments(QStringList args)
if (arg.startsWith("-")) {
arg = arg.mid((arg.startsWith("--") ? 2 : 1));
}
+ /* Argument names do not include equal sign. Assume value follows. */
+ if (arg.indexOf("=") > -1) {
+ value = arg.right(arg.length() - (arg.indexOf("=")+1));
+ arg = arg.left(arg.indexOf("="));
+ }
+ else
/* Check if it takes a value and there is one on the command-line */
if (i < args.size()-1 && argNeedsValue(arg)) {
value = args.at(++i);
@@ -265,6 +271,16 @@ Vidalia::parseArguments(QStringList args)
bool
Vidalia::validateArguments(QString &errmsg)
{
+ /* Check for missing parameter values */
+ QMapIterator<QString, QString> _i(_args);
+ QString tmp;
+ while(_i.hasNext()) {
+ _i.next();
+ if(argNeedsValue(_i.key()) && (_i.value() == "")) {
+ errmsg = tr("Value required for parameter :") + _i.key();
+ return false;
+ }
+ }
/* Check for a language that Vidalia recognizes. */
if (_args.contains(ARG_LANGUAGE) &&
!LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) {
diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h
index 421ae68..b7d09f4 100644
--- a/src/vidalia/Vidalia.h
+++ b/src/vidalia/Vidalia.h
@@ -54,7 +54,7 @@ public:
~Vidalia();
/** Validates that all arguments were well-formed. */
- static bool validateArguments(QString &errmsg);
+ bool validateArguments(QString &errmsg);
/** Displays usage information for command-line args. */
static void showUsageMessageBox();
/** Returns true if the user wants to see usage information. */
diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp
deleted file mode 100644
index ec5f1bf..0000000
--- a/src/vidalia/VidaliaTab.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "VidaliaTab.h"
-#include "Vidalia.h"
-
-VidaliaTab::VidaliaTab(const QString &title, const QString &name, QWidget *parent)
- : QWidget(parent), _title(title)
-{
- _settings = NULL;
- if(!name.isEmpty())
- _settings = new VSettings(name);
-}
-
-VidaliaTab::~VidaliaTab()
-{
- if(_settings)
- delete _settings;
-}
-
-/** Gets the saved value of a property associated with this window object.
- * If no value was saved, the default value is returned. */
-QVariant
-VidaliaTab::getSetting(QString setting, QVariant defaultValue)
-{
- return _settings->value(setting, defaultValue);
-}
-
-/** Saves a value associated with a property name for this window object. */
-void
-VidaliaTab::saveSetting(QString prop, QVariant value)
-{
- _settings->setValue(prop, value);
-}
-
-/** Associates a shortcut key sequence with a slot. */
-void
-VidaliaTab::setShortcut(const QString &shortcut, const char *slot)
-{
- vApp->createShortcut(QKeySequence(shortcut), this, this, slot);
-}
-
-/** Reimplement the windows' changeEvent() method to check if the event
- * is a QEvent::LanguageChange event. If so, call retranslateUi(), which
- * subclasses of VidaliaWindow can reimplement to update their UI. */
-void
-VidaliaTab::changeEvent(QEvent *e)
-{
- if (e->type() == QEvent::LanguageChange) {
- retranslateUi();
- e->accept();
- return;
- }
- QWidget::changeEvent(e);
-}
-
-/** Called when the user wants to change the currently visible language.
- * Subclasses can reimplement this to update their UI. */
-void
-VidaliaTab::retranslateUi()
-{
- /* The default retranslateUi() implementation does nothing */
-}
-
-void
-VidaliaTab::setOnTop(bool top)
-{
- _onTop = top;
-}
diff --git a/src/vidalia/VidaliaTab.h b/src/vidalia/VidaliaTab.h
deleted file mode 100644
index ac6edb1..0000000
--- a/src/vidalia/VidaliaTab.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file VidaliaTab.h
-** \brief Main tab that shows the current Tor status
-*/
-
-#ifndef _VIDALIATAB_H
-#define _VIDALIATAB_H
-
-#include "VSettings.h"
-
-#include <QtGui>
-
-class VidaliaTab : public QWidget
-{
- Q_OBJECT
-
-public:
- /** Default constructor. */
- VidaliaTab(const QString &title, const QString &name = "", QWidget *parent = 0);
- /** Destructor. */
- ~VidaliaTab();
-
- /** Returns the tab's title */
- QString getTitle() const { return _title; }
- /** Sets the tab's title to title */
- void setTitle(const QString &title) { _title = title; }
-
- /** Associates a shortcut key sequence with a slot. */
- void setShortcut(const QString &shortcut, const char *slot);
-
- /** Gets the saved value of a property associated with this window object.
- * If no value was saved, the default value is returned. */
- QVariant getSetting(QString name, QVariant defaultValue);
- /** Saves a value associated with a setting name for this window object. */
- void saveSetting(QString name, QVariant value);
- /** Sets the onTop property of the tab to top */
- void setOnTop(bool top);
-
-signals:
- /** Emitted when a VidaliaWindow requests help information on the specified
- * <b>topic</b>. */
- void helpRequested(const QString &topic);
-
-protected:
- /** Reimplement the windows' changeEvent() method to check if the event
- * is a QEvent::LanguageChange event. If so, call retranslateUi(), which
- * subclasses of VidaliaWindow can reimplement to update their UI. */
- virtual void changeEvent(QEvent *e);
- /** Called when the user wants to change the currently visible language. */
- virtual void retranslateUi();
-
- bool _onTop; /**< True if the current tab is the one being displayed */
-
-private:
- QString _title; /**< Title displayed in the tab */
- VSettings* _settings; /**< Object used to store window properties */
-};
-
-#endif
-
diff --git a/src/vidalia/bwgraph/BandwidthGraph.cpp b/src/vidalia/bwgraph/BandwidthGraph.cpp
index 7ea82de..c6c896a 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.cpp
+++ b/src/vidalia/bwgraph/BandwidthGraph.cpp
@@ -38,9 +38,8 @@
/** Default constructor */
-BandwidthGraph::BandwidthGraph(QStatusBar *st, QWidget *parent)
- : VidaliaTab(tr("Bandwidth Graph"), "BandwidthGraph", parent),
- _statusBar(st)
+BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
+ : VidaliaWindow("BandwidthGraph", parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -51,8 +50,8 @@ BandwidthGraph::BandwidthGraph(QStatusBar *st, QWidget *parent)
this, SLOT(updateGraph(quint64,quint64)));
/* Pressing 'Esc' or 'Ctrl+W' will close the window */
-// setShortcut("Esc", SLOT(close()));
-// setShortcut("Ctrl+W", SLOT(close()));
+ setShortcut("Esc", SLOT(close()));
+ setShortcut("Ctrl+W", SLOT(close()));
/* Bind events to actions */
createActions();
@@ -82,7 +81,6 @@ void
BandwidthGraph::retranslateUi()
{
ui.retranslateUi(this);
- setTitle(tr("Bandwidth Graph"));
}
/** Binds events to actions. */
@@ -153,10 +151,9 @@ void
BandwidthGraph::reset()
{
/* Set to current time */
- if(_statusBar && _onTop)
- _statusBar->showMessage(tr("Since:") + " " +
- QDateTime::currentDateTime()
- .toString(DATETIME_FMT));
+ ui.statusbar->showMessage(tr("Since:") + " " +
+ QDateTime::currentDateTime()
+ .toString(DATETIME_FMT));
/* Reset the graph */
ui.frmGraph->resetGraph();
}
@@ -258,3 +255,13 @@ BandwidthGraph::setOpacity(int value)
#endif
}
+/** Overloads the default show() slot so we can set opacity. */
+void
+BandwidthGraph::showWindow()
+{
+ /* Load saved settings */
+ loadSettings();
+ /* Show the window */
+ VidaliaWindow::showWindow();
+}
+
diff --git a/src/vidalia/bwgraph/BandwidthGraph.h b/src/vidalia/bwgraph/BandwidthGraph.h
index a1beda2..35989fb 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.h
+++ b/src/vidalia/bwgraph/BandwidthGraph.h
@@ -17,7 +17,7 @@
#define _BWGRAPH_H
#include "ui_BandwidthGraph.h"
-#include "VidaliaTab.h"
+#include "VidaliaWindow.h"
#include "VidaliaSettings.h"
#include "TorControl.h"
@@ -28,13 +28,17 @@
#define REFRESH_RATE 1000
-class BandwidthGraph : public VidaliaTab
+class BandwidthGraph : public VidaliaWindow
{
Q_OBJECT
public:
/** Default constructor */
- BandwidthGraph(QStatusBar *st = 0, QWidget *parent = 0);
+ BandwidthGraph(QWidget *parent = 0, Qt::WFlags flags = 0);
+
+public slots:
+ /** Overloaded QWidget.show */
+ void showWindow();
protected:
/** Called when the user changes the UI translation. */
@@ -64,8 +68,6 @@ private:
TorControl* _torControl;
/** A VidaliaSettings object that handles getting/saving settings */
VidaliaSettings* _settings;
-
- QStatusBar *_statusBar;
/** Qt Designer generated object */
Ui::BandwidthGraph ui;
diff --git a/src/vidalia/bwgraph/BandwidthGraph.ui b/src/vidalia/bwgraph/BandwidthGraph.ui
index 76a5a31..fb7fc94 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.ui
+++ b/src/vidalia/bwgraph/BandwidthGraph.ui
@@ -1,489 +1,364 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BandwidthGraph</class>
- <widget class="QWidget" name="BandwidthGraph">
+ <widget class="QMainWindow" name="BandwidthGraph">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>588</width>
- <height>437</height>
+ <width>553</width>
+ <height>381</height>
</rect>
</property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
<property name="windowTitle">
- <string notr="true"/>
+ <string>Tor Bandwidth Usage</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="GraphFrame" name="frmGraph">
- <property name="minimumSize">
- <size>
- <width>120</width>
- <height>80</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="btnToggleSettings">
- <property name="text">
- <string>Show Settings</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>21</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnReset">
- <property name="text">
- <string>Reset</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QFrame" name="frmSettings">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>355</width>
- <height>85</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>82</height>
- </size>
+ <property name="windowIcon">
+ <iconset>
+ <normaloff>:/images/32x32/utilities-system-monitor.png</normaloff>:/images/32x32/utilities-system-monitor.png</iconset>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QGridLayout">
+ <item row="1" column="0">
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QPushButton" name="btnToggleSettings">
+ <property name="text">
+ <string>Show Settings</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnReset">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="GraphFrame" name="frmGraph">
+ <property name="minimumSize">
+ <size>
+ <width>120</width>
+ <height>80</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>100</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0">
+ <widget class="QFrame" name="frmSettings">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
+ <property name="horizontalSpacing">
+ <number>10</number>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
+ <property name="verticalSpacing">
+ <number>0</number>
</property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
+ <property name="margin">
+ <number>5</number>
</property>
- <layout class="QHBoxLayout" name="_2">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>9</number>
- </property>
- <item>
- <layout class="QVBoxLayout" name="_3">
- <property name="spacing">
- <number>6</number>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkReceiveRate">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>Receive Rate</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="chkSendRate">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>Send Rate</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="chkAlwaysOnTop">
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>Always on Top</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="3">
+ <widget class="QLabel" name="lblGraphStyle">
+ <property name="text">
+ <string>Style</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <widget class="QComboBox" name="cmbGraphStyle">
+ <item>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/images/16x16/graph-line.png</normaloff>:/images/16x16/graph-line.png</iconset>
</property>
+ </item>
+ <item>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/images/16x16/graph-area.png</normaloff>:/images/16x16/graph-area.png</iconset>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="3" column="6">
+ <widget class="QPushButton" name="btnCancelSettings">
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="6">
+ <widget class="QPushButton" name="btnSaveSettings">
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="5">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1" rowspan="2" colspan="4">
+ <widget class="QFrame" name="frmOpacity">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QGridLayout" name="gridLayout3">
<property name="margin">
- <number>3</number>
+ <number>0</number>
</property>
- <item>
- <widget class="QCheckBox" name="chkReceiveRate">
+ <property name="spacing">
+ <number>-1</number>
+ </property>
+ <item row="0" column="0" colspan="4">
+ <widget class="QSlider" name="sldrOpacity">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string/>
+ <string>Changes the transparency of the Bandwidth Graph</string>
</property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
+ <property name="minimum">
+ <number>30</number>
</property>
- <property name="text">
- <string>Receive Rate</string>
+ <property name="maximum">
+ <number>100</number>
</property>
- <property name="checked">
+ <property name="value">
+ <number>100</number>
+ </property>
+ <property name="sliderPosition">
+ <number>100</number>
+ </property>
+ <property name="tracking">
+ <bool>false</bool>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="invertedAppearance">
<bool>false</bool>
</property>
+ <property name="tickPosition">
+ <enum>QSlider::NoTicks</enum>
+ </property>
+ <property name="tickInterval">
+ <number>10</number>
+ </property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="chkSendRate">
+ <item row="1" column="1">
+ <widget class="QLabel" name="lblPercentOpacity">
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="toolTip">
- <string/>
- </property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
- <string>Send Rate</string>
+ <string>100</string>
</property>
- <property name="checked">
- <bool>false</bool>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="chkAlwaysOnTop">
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
+ <item row="1" column="2">
+ <widget class="QLabel" name="label">
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
<property name="text">
- <string>Always on Top</string>
+ <string>% Opaque</string>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="3">
<spacer>
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>21</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="_4">
- <property name="spacing">
- <number>1</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <layout class="QHBoxLayout" name="_5">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="lblGraphStyle">
- <property name="text">
- <string>Style</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cmbGraphStyle">
- <item>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/graph-line.png</normaloff>:/images/16x16/graph-line.png</iconset>
- </property>
- </item>
- <item>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/graph-area.png</normaloff>:/images/16x16/graph-area.png</iconset>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QFrame" name="frmOpacity">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- <layout class="QVBoxLayout" name="_6">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QSlider" name="sldrOpacity">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Changes the transparency of the Bandwidth Graph</string>
- </property>
- <property name="minimum">
- <number>30</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- <property name="sliderPosition">
- <number>100</number>
- </property>
- <property name="tracking">
- <bool>false</bool>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="invertedAppearance">
- <bool>false</bool>
- </property>
- <property name="tickPosition">
- <enum>QSlider::NoTicks</enum>
- </property>
- <property name="tickInterval">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_7">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>21</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="lblPercentOpacity">
- <property name="minimumSize">
- <size>
- <width>25</width>
- <height>0</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string>100</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label">
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text">
- <string>% Opaque</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>21</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer>
+ <item row="1" column="0">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>21</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>21</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QVBoxLayout" name="_8">
- <property name="spacing">
- <number>1</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="btnSaveSettings">
- <property name="text">
- <string>Save</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnCancelSettings">
- <property name="text">
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
</widget>
<customwidgets>
<customwidget>
@@ -493,8 +368,12 @@
<container>1</container>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>btnToggleSettings</tabstop>
+ <tabstop>btnReset</tabstop>
+ </tabstops>
<resources>
- <include location="../res/vidalia.qrc"/>
+ <include location="../res/vidalia_common.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp
index 1fda8ad..12842bc 100644
--- a/src/vidalia/config/AdvancedPage.cpp
+++ b/src/vidalia/config/AdvancedPage.cpp
@@ -64,6 +64,7 @@ AdvancedPage::AdvancedPage(QWidget *parent)
this, SLOT(displayTorrcDialog()));
connect(ui.rdoControlPort, SIGNAL(toggled(bool)), this, SLOT(toggleControl(bool)));
connect(ui.btnBrowseSocketPath, SIGNAL(clicked()), this, SLOT(browseSocketPath()));
+ connect(ui.chkAuto, SIGNAL(toggled(bool)), this, SLOT(toggleAuto(bool)));
/* Hide platform specific features */
#if defined(Q_WS_WIN)
@@ -165,16 +166,18 @@ AdvancedPage::save(QString &errmsg)
/* Only remember the torrc and datadir values if Vidalia started Tor, or
* if the user changed the displayed values. */
- if (Vidalia::torControl()->isVidaliaRunningTor() or
- not Vidalia::torControl()->isRunning()) {
+ if (Vidalia::torControl()->isVidaliaRunningTor() or
+ !Vidalia::torControl()->isConnected()) {
QString torrc = ui.lineTorConfig->text();
if (torrc != _settings->getTorrc()) {
_settings->setTorrc(torrc);
- QMessageBox::StandardButtons res = QMessageBox::question(this, tr("Warning"),
- tr("You changed torrc path, would you like to restart Tor?"),
- QMessageBox::Yes | QMessageBox::No);
- if(res == QMessageBox::Yes)
- emit restartTor();
+ if(Vidalia::torControl()->isConnected()) {
+ QMessageBox::StandardButtons res = QMessageBox::question(this, tr("Warning"),
+ tr("You changed torrc path, would you like to restart Tor?"),
+ QMessageBox::Yes | QMessageBox::No);
+ if(res == QMessageBox::Yes)
+ emit restartTor();
+ }
}
QString dataDir = ui.lineTorDataDirectory->text();
@@ -182,9 +185,12 @@ AdvancedPage::save(QString &errmsg)
_settings->setDataDirectory(dataDir);
}
- _settings->setControlAddress(controlAddress);
- _settings->setControlPort(ui.lineControlPort->text().toUShort());
+ if(!ui.chkAuto->isChecked()) {
+ _settings->setControlAddress(controlAddress);
+ _settings->setControlPort(ui.lineControlPort->text().toUShort());
+ }
_settings->setSocketPath(ui.lineSocketPath->text());
+ _settings->setAutoControlPort(ui.chkAuto->isChecked());
_settings->setAuthenticationMethod(authMethod);
_settings->setUseRandomPassword(ui.chkRandomPassword->isChecked());
@@ -210,6 +216,7 @@ AdvancedPage::load()
ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
ui.lineTorConfig->setText(_settings->getTorrc());
ui.lineTorDataDirectory->setText(_settings->getDataDirectory());
+ ui.chkAuto->setChecked(_settings->autoControlPort());
ui.cmbAuthMethod->setCurrentIndex(
authMethodToIndex(_settings->getAuthenticationMethod()));
@@ -389,6 +396,7 @@ AdvancedPage::toggleControl(bool)
ui.lblPath->setEnabled(false);
ui.lineSocketPath->setEnabled(false);
ui.btnBrowseSocketPath->setEnabled(false);
+ ui.chkAuto->setEnabled(true);
} else {
#if !defined(Q_OS_WIN32)
ui.lblAddress->setEnabled(false);
@@ -397,6 +405,16 @@ AdvancedPage::toggleControl(bool)
ui.lblPath->setEnabled(true);
ui.lineSocketPath->setEnabled(true);
ui.btnBrowseSocketPath->setEnabled(true);
+ ui.chkAuto->setEnabled(false);
#endif
}
}
+
+void
+AdvancedPage::toggleAuto(bool)
+{
+ ui.lblAddress->setVisible(!ui.chkAuto->isChecked());
+ ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked());
+ ui.label->setVisible(!ui.chkAuto->isChecked());
+ ui.lineControlPort->setVisible(!ui.chkAuto->isChecked());
+}
diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h
index 4ba26cc..4510310 100644
--- a/src/vidalia/config/AdvancedPage.h
+++ b/src/vidalia/config/AdvancedPage.h
@@ -75,6 +75,9 @@ private slots:
* a more advanced way */
void displayTorrcDialog();
+ /** Called when the user checks "Configure ControlPort automatically" */
+ void toggleAuto(bool);
+
private:
/** Returns the authentication method for the given <b>index</b>. */
TorSettings::AuthenticationMethod indexToAuthMethod(int index);
diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui
index 2d06162..fbaac49 100644
--- a/src/vidalia/config/AdvancedPage.ui
+++ b/src/vidalia/config/AdvancedPage.ui
@@ -14,12 +14,6 @@
<enum>Qt::NoContextMenu</enum>
</property>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>9</number>
- </property>
<item>
<widget class="QGroupBox" name="grpControlPort">
<property name="contextMenuPolicy">
@@ -29,21 +23,15 @@
<string>Tor Control</string>
</property>
<layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>9</number>
- </property>
<item>
<layout class="QGridLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <property name="spacing">
+ <property name="horizontalSpacing">
<number>2</number>
</property>
- <item row="5" column="0">
+ <property name="verticalSpacing">
+ <number>6</number>
+ </property>
+ <item row="6" column="0">
<widget class="QLabel" name="lblAuth">
<property name="text">
<string>Authentication:</string>
@@ -53,7 +41,7 @@
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="lblAddress">
<property name="text">
<string>Address:</string>
@@ -63,14 +51,11 @@
</property>
</widget>
</item>
- <item row="5" column="2" colspan="3">
+ <item row="6" column="2" colspan="3">
<layout class="QHBoxLayout">
<property name="spacing">
<number>2</number>
</property>
- <property name="margin">
- <number>0</number>
- </property>
<item>
<widget class="QComboBox" name="cmbAuthMethod">
<property name="minimumSize">
@@ -118,7 +103,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint">
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -128,14 +113,8 @@
</item>
</layout>
</item>
- <item row="2" column="2">
+ <item row="1" column="2">
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
<item>
<widget class="QLineEdit" name="lineControlAddress">
<property name="maximumSize">
@@ -186,26 +165,16 @@
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- <item row="2" column="3">
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- </layout>
- </item>
<item row="0" column="2">
<widget class="QRadioButton" name="rdoControlPort">
<property name="text">
@@ -216,7 +185,7 @@
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="lblPath">
<property name="enabled">
<bool>false</bool>
@@ -229,7 +198,7 @@
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2">
+ <item row="5" column="1" colspan="2">
<widget class="QLineEdit" name="lineSocketPath">
<property name="enabled">
<bool>false</bool>
@@ -243,7 +212,7 @@
</property>
</widget>
</item>
- <item row="4" column="3">
+ <item row="5" column="3">
<widget class="QPushButton" name="btnBrowseSocketPath">
<property name="enabled">
<bool>false</bool>
@@ -253,6 +222,13 @@
</property>
</widget>
</item>
+ <item row="2" column="2">
+ <widget class="QCheckBox" name="chkAuto">
+ <property name="text">
+ <string>Configure ControlPort automatically</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
@@ -267,9 +243,6 @@
<string>Tor Configuration File</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <property name="margin">
- <number>9</number>
- </property>
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
@@ -338,7 +311,7 @@
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>20</height>
@@ -360,12 +333,6 @@
<string>Data Directory</string>
</property>
<layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>9</number>
- </property>
<item>
<widget class="QLineEdit" name="lineTorDataDirectory">
<property name="enabled">
@@ -412,7 +379,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint">
+ <property name="sizeHint" stdset="0">
<size>
<width>489</width>
<height>141</height>
diff --git a/src/vidalia/config/BridgeUsageDialog.ui b/src/vidalia/config/BridgeUsageDialog.ui
index e3c0056..66ef1df 100644
--- a/src/vidalia/config/BridgeUsageDialog.ui
+++ b/src/vidalia/config/BridgeUsageDialog.ui
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>BridgeUsageDialog</class>
- <widget class="QDialog" name="BridgeUsageDialog">
- <property name="geometry">
+ <widget class="QDialog" name="BridgeUsageDialog" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,53 +9,49 @@
<height>408</height>
</rect>
</property>
- <property name="windowTitle">
+ <property name="windowTitle" >
<string>Bridge Usage Summary</string>
</property>
- <property name="windowIcon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/128x128/tor-logo.png</normaloff>:/images/128x128/tor-logo.png</iconset>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
<string>Client Summary</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout" >
<item>
- <widget class="QLabel" name="lblClientSummary">
- <property name="text">
- <string/>
+ <widget class="QLabel" name="lblClientSummary" >
+ <property name="text" >
+ <string></string>
</property>
- <property name="alignment">
+ <property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
- <property name="wordWrap">
+ <property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QTreeWidget" name="treeClientSummary">
- <property name="alternatingRowColors">
+ <widget class="QTreeWidget" name="treeClientSummary" >
+ <property name="alternatingRowColors" >
<bool>false</bool>
</property>
- <property name="sortingEnabled">
+ <property name="sortingEnabled" >
<bool>true</bool>
</property>
<column>
- <property name="text">
- <string/>
+ <property name="text" >
+ <string></string>
</property>
</column>
<column>
- <property name="text">
+ <property name="text" >
<string>Country</string>
</property>
</column>
<column>
- <property name="text">
+ <property name="text" >
<string># Clients</string>
</property>
</column>
@@ -66,20 +61,18 @@
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons">
+ <property name="standardButtons" >
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
</layout>
</widget>
- <resources>
- <include location="../res/vidalia.qrc"/>
- </resources>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
@@ -87,11 +80,11 @@
<receiver>BridgeUsageDialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel">
+ <hint type="sourcelabel" >
<x>248</x>
<y>254</y>
</hint>
- <hint type="destinationlabel">
+ <hint type="destinationlabel" >
<x>157</x>
<y>274</y>
</hint>
@@ -103,11 +96,11 @@
<receiver>BridgeUsageDialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel">
+ <hint type="sourcelabel" >
<x>316</x>
<y>260</y>
</hint>
- <hint type="destinationlabel">
+ <hint type="destinationlabel" >
<x>286</x>
<y>274</y>
</hint>
diff --git a/src/vidalia/config/ConfigDialog.h b/src/vidalia/config/ConfigDialog.h
index fe63954..499a9ae 100644
--- a/src/vidalia/config/ConfigDialog.h
+++ b/src/vidalia/config/ConfigDialog.h
@@ -33,9 +33,9 @@ public:
General = 0, /** General configuration page. */
Network, /** Network configuration page. */
Server, /** Server configuration page. */
- Service, /** Service Configuration page */
Appearance, /** Appearance configuration page. */
- Advanced /** Advanced configuration page. */
+ Advanced, /** Advanced configuration page. */
+ Service /** Service Configuration page */
};
/** Default Constructor */
diff --git a/src/vidalia/config/GeneralPage.ui b/src/vidalia/config/GeneralPage.ui
index 8aa494b..80cc819 100644
--- a/src/vidalia/config/GeneralPage.ui
+++ b/src/vidalia/config/GeneralPage.ui
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>GeneralPage</class>
- <widget class="QWidget" name="GeneralPage">
- <property name="geometry">
+ <widget class="QWidget" name="GeneralPage" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,63 +9,63 @@
<height>402</height>
</rect>
</property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy">
+ <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
- <layout class="QVBoxLayout">
- <property name="spacing">
+ <layout class="QVBoxLayout" >
+ <property name="spacing" >
<number>6</number>
</property>
<item>
- <widget class="QCheckBox" name="chkRunVidaliaAtSystemStartup">
- <property name="text">
+ <widget class="QCheckBox" name="chkRunVidaliaAtSystemStartup" >
+ <property name="text" >
<string>Start Vidalia when my system starts</string>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="lineHorizontalSeparator">
- <property name="orientation">
+ <widget class="Line" name="lineHorizontalSeparator" >
+ <property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpTorLocation">
- <property name="minimumSize">
+ <widget class="QGroupBox" name="grpTorLocation" >
+ <property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="contextMenuPolicy">
+ <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="title">
+ <property name="title" >
<string>Tor</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout" >
<item>
- <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup">
- <property name="text">
- <string>Connect to Tor automatically</string>
+ <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
+ <property name="text" >
+ <string>Start the Tor software when Vidalia starts</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" >
<item>
- <widget class="QLineEdit" name="lineTorExecutable"/>
+ <widget class="QLineEdit" name="lineTorExecutable" />
</item>
<item>
- <widget class="QPushButton" name="btnBrowseTorExecutable">
- <property name="text">
+ <widget class="QPushButton" name="btnBrowseTorExecutable" >
+ <property name="text" >
<string>Browse</string>
</property>
</widget>
@@ -77,48 +76,48 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpProxyExecutable">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <widget class="QGroupBox" name="grpProxyExecutable" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="title">
+ <property name="title" >
<string>Proxy Application (optional)</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
- <widget class="QCheckBox" name="chkRunProxyAtTorStartup">
- <property name="text">
+ <widget class="QCheckBox" name="chkRunProxyAtTorStartup" >
+ <property name="text" >
<string>Start a proxy application when Tor starts</string>
</property>
- <property name="checked">
+ <property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" >
<item>
- <widget class="QLineEdit" name="lineProxyExecutable">
- <property name="enabled">
+ <widget class="QLineEdit" name="lineProxyExecutable" >
+ <property name="enabled" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="btnBrowseProxyExecutable">
- <property name="enabled">
+ <widget class="QPushButton" name="btnBrowseProxyExecutable" >
+ <property name="enabled" >
<bool>true</bool>
</property>
- <property name="text">
+ <property name="text" >
<string>Browse</string>
</property>
</widget>
@@ -126,13 +125,13 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" >
<item>
- <widget class="QLabel" name="lblProxyExecutableArguments">
- <property name="enabled">
+ <widget class="QLabel" name="lblProxyExecutableArguments" >
+ <property name="enabled" >
<bool>true</bool>
</property>
- <property name="text">
+ <property name="text" >
<string>Proxy Application Arguments:</string>
</property>
</widget>
@@ -140,8 +139,8 @@
</layout>
</item>
<item>
- <widget class="QLineEdit" name="lineProxyExecutableArguments">
- <property name="enabled">
+ <widget class="QLineEdit" name="lineProxyExecutableArguments" >
+ <property name="enabled" >
<bool>true</bool>
</property>
</widget>
@@ -150,21 +149,21 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpSoftwareUpdates">
- <property name="title">
+ <widget class="QGroupBox" name="grpSoftwareUpdates" >
+ <property name="title" >
<string>Software Updates</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout" >
<item>
- <widget class="QCheckBox" name="chkAutoUpdates">
- <property name="text">
+ <widget class="QCheckBox" name="chkAutoUpdates" >
+ <property name="text" >
<string>Check for new software updates automatically</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
+ <spacer name="horizontalSpacer_2" >
+ <property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
@@ -189,8 +188,8 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="btnUpdateNow">
- <property name="text">
+ <widget class="QPushButton" name="btnUpdateNow" >
+ <property name="text" >
<string>Check Now</string>
</property>
</widget>
diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp
index f15268f..5e8e2b6 100644
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@ -89,8 +89,6 @@ ServerPage::ServerPage(QWidget *parent)
this, SLOT(customRateChanged()));
connect(ui.rdoClientMode, SIGNAL(toggled(bool)),
this, SLOT(serverModeChanged(bool)));
- connect(ui.rdoNonExitMode, SIGNAL(toggled(bool)),
- this, SLOT(serverModeChanged(bool)));
connect(ui.rdoServerMode, SIGNAL(toggled(bool)),
this, SLOT(serverModeChanged(bool)));
connect(ui.rdoBridgeMode, SIGNAL(toggled(bool)),
@@ -121,6 +119,9 @@ ServerPage::ServerPage(QWidget *parent)
ui.chkEnableUpnp->setVisible(false);
ui.btnTestUpnp->setVisible(false);
#endif
+
+ _tmpDirPort = "9030";
+ _tmpMirror = true;
}
/** Destructor */
@@ -219,12 +220,13 @@ ServerPage::serverModeChanged(bool enabled)
{
Q_UNUSED(enabled);
bool bridgeEnabled = ui.rdoBridgeMode->isChecked();
- bool relayEnabled = ui.rdoServerMode->isChecked() ||
- ui.rdoNonExitMode->isChecked();
/* Show the tab menu only if the user is running a normal relay or a bridge
* relay. */
- ui.tabsMenu->setVisible(relayEnabled || bridgeEnabled);
+ ui.tabsMenu->setVisible(ui.rdoServerMode->isChecked() || bridgeEnabled);
+
+ /* Disable the Exit Policies tab when bridge relay mode is selected */
+ ui.tabsMenu->setTabEnabled(2, !bridgeEnabled);
/* Display the widgets that show the user their bridge identity if bridge
* relay mode is selected. */
@@ -235,12 +237,23 @@ ServerPage::serverModeChanged(bool enabled)
ui.lblBridgeUsage->setVisible(bridgeEnabled
&& Vidalia::torControl()->isConnected());
- ui.lineDirPort->setEnabled(!bridgeEnabled);
- ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
+ if(bridgeEnabled) {
+ if(ui.lineDirPort->text().length() != 0) {
+ _tmpDirPort = ui.lineDirPort->text();
+ _tmpMirror = ui.chkMirrorDirectory->isChecked();
+ }
+ ui.lineDirPort->clear();
+ ui.chkMirrorDirectory->setChecked(false);
+ } else {
+ ui.lineDirPort->setText(_tmpDirPort);
+ ui.chkMirrorDirectory->setChecked(_tmpMirror);
+ }
- /* Disable the Exit Policies tab when bridge or non-exit relay mode is
- * selected */
- ui.tabsMenu->setTabEnabled(2, !bridgeEnabled and !ui.rdoNonExitMode->isChecked());
+ ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
+ if(ui.chkMirrorDirectory->isChecked()) {
+ ui.lblDirPort->setEnabled(!bridgeEnabled);
+ ui.lineDirPort->setEnabled(!bridgeEnabled);
+ }
}
/** Returns true if the user has changed their server settings since the
@@ -275,9 +288,7 @@ ServerPage::save(QString &errmsg)
/* Force the bandwidth rate limits to validate */
customRateChanged();
- if (ui.rdoServerMode->isChecked() ||
- ui.rdoNonExitMode->isChecked() ||
- ui.rdoBridgeMode->isChecked()) {
+ if (ui.rdoServerMode->isChecked() || ui.rdoBridgeMode->isChecked()) {
/* A server must have an ORPort and a nickname */
if (ui.lineServerPort->text().isEmpty() ||
ui.lineServerNickname->text().isEmpty()) {
@@ -296,9 +307,7 @@ ServerPage::save(QString &errmsg)
/* "Server" is enabled whether we're a bridge or normal relay. "Bridge" is
* only enabled if we're a bridge (obviously). */
_settings->setServerEnabled(ui.rdoServerMode->isChecked()
- || ui.rdoNonExitMode->isChecked()
|| ui.rdoBridgeMode->isChecked());
- _settings->setNonExitEnabled(ui.rdoNonExitMode->isChecked());
_settings->setBridgeEnabled(ui.rdoBridgeMode->isChecked());
if (ui.rdoBridgeMode->isChecked())
_settings->setPublishServerDescriptor(ui.chkPublishBridgeAddress->isChecked());
@@ -329,8 +338,6 @@ ServerPage::load()
{
if (_settings->isBridgeEnabled())
ui.rdoBridgeMode->setChecked(true);
- else if (_settings->isNonExitEnabled())
- ui.rdoNonExitMode->setChecked(true);
else if (_settings->isServerEnabled())
ui.rdoServerMode->setChecked(true);
else
@@ -471,46 +478,41 @@ ServerPage::loadExitPolicies()
void
ServerPage::saveExitPolicies()
{
- ExitPolicy *exitPolicy;
- if(ui.rdoNonExitMode->isChecked()) {
- exitPolicy = new ExitPolicy(ExitPolicy::Middleman);
- } else {
- exitPolicy = new ExitPolicy();
- bool rejectUnchecked = ui.chkMisc->isChecked();
-
- /* If misc is checked, then reject unchecked items and leave the default exit
- * policy alone. Else, accept only checked items and end with reject *:*,
- * replacing the default exit policy. */
- if (ui.chkWebsites->isChecked() && !rejectUnchecked) {
- exitPolicy->addAcceptedPorts(PORTS_HTTP);
- } else if (!ui.chkWebsites->isChecked() && rejectUnchecked) {
- exitPolicy->addRejectedPorts(PORTS_HTTP);
- }
- if (ui.chkSecWebsites->isChecked() && !rejectUnchecked) {
- exitPolicy->addAcceptedPorts(PORTS_HTTPS);
- } else if (!ui.chkSecWebsites->isChecked() && rejectUnchecked) {
- exitPolicy->addRejectedPorts(PORTS_HTTPS);
- }
- if (ui.chkMail->isChecked() && !rejectUnchecked) {
- exitPolicy->addAcceptedPorts(PORTS_MAIL);
- } else if (!ui.chkMail->isChecked() && rejectUnchecked) {
- exitPolicy->addRejectedPorts(PORTS_MAIL);
- }
- if (ui.chkIRC->isChecked() && !rejectUnchecked) {
- exitPolicy->addAcceptedPorts(PORTS_IRC);
- } else if (!ui.chkIRC->isChecked() && rejectUnchecked) {
- exitPolicy->addRejectedPorts(PORTS_IRC);
- }
- if (ui.chkIM->isChecked() && !rejectUnchecked) {
- exitPolicy->addAcceptedPorts(PORTS_IM);
- } else if (!ui.chkIM->isChecked() && rejectUnchecked) {
- exitPolicy->addRejectedPorts(PORTS_IM);
- }
- if (!ui.chkMisc->isChecked()) {
- exitPolicy->addPolicy(Policy(Policy::RejectAll));
- }
+ ExitPolicy exitPolicy;
+ bool rejectUnchecked = ui.chkMisc->isChecked();
+
+ /* If misc is checked, then reject unchecked items and leave the default exit
+ * policy alone. Else, accept only checked items and end with reject *:*,
+ * replacing the default exit policy. */
+ if (ui.chkWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_HTTP);
+ } else if (!ui.chkWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_HTTP);
+ }
+ if (ui.chkSecWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_HTTPS);
+ } else if (!ui.chkSecWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_HTTPS);
+ }
+ if (ui.chkMail->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_MAIL);
+ } else if (!ui.chkMail->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_MAIL);
+ }
+ if (ui.chkIRC->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_IRC);
+ } else if (!ui.chkIRC->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_IRC);
+ }
+ if (ui.chkIM->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_IM);
+ } else if (!ui.chkIM->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_IM);
+ }
+ if (!ui.chkMisc->isChecked()) {
+ exitPolicy.addPolicy(Policy(Policy::RejectAll));
}
- _settings->setExitPolicy(*exitPolicy);
+ _settings->setExitPolicy(exitPolicy);
}
/** Called when the user selects a new value from the rate combo box. */
diff --git a/src/vidalia/config/ServerPage.h b/src/vidalia/config/ServerPage.h
index 03e4938..54549a2 100644
--- a/src/vidalia/config/ServerPage.h
+++ b/src/vidalia/config/ServerPage.h
@@ -120,6 +120,12 @@ private:
/** Qt Designer generated object */
Ui::ServerPage ui;
+
+ /** Used to store the dirport value and if the user wants to mirror the
+ * directory so that they can be emptied when selecting being a bridge and
+ * re-added when selecting relay */
+ QString _tmpDirPort;
+ bool _tmpMirror;
};
#endif
diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui
index c922710..a642471 100644
--- a/src/vidalia/config/ServerPage.ui
+++ b/src/vidalia/config/ServerPage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>546</width>
- <height>463</height>
+ <width>548</width>
+ <height>507</height>
</rect>
</property>
<property name="contextMenuPolicy">
@@ -15,51 +15,44 @@
</property>
<layout class="QVBoxLayout">
<item>
- <widget class="QRadioButton" name="rdoClientMode">
- <property name="text">
- <string>Run as a client only</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="rdoNonExitMode">
- <property name="text">
- <string>Relay traffic inside the Tor network (non-exit relay)</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="rdoServerMode">
- <property name="text">
- <string>Relay traffic for the Tor network (exit relay)</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="3">
+ <widget class="QRadioButton" name="rdoClientMode">
+ <property name="text">
+ <string>Run as a client only</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="3">
+ <widget class="QRadioButton" name="rdoServerMode">
+ <property name="text">
+ <string>Relay traffic for the Tor network</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
<widget class="QRadioButton" name="rdoBridgeMode">
<property name="text">
<string>Help censored users reach the Tor network</string>
</property>
</widget>
</item>
- <item>
+ <item row="2" column="1">
<widget class="QLabel" name="lblWhatsThis">
<property name="text">
<string><a href="#bridgeHelp">What's this?</a></string>
</property>
</widget>
</item>
- <item>
+ <item row="2" column="2" colspan="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
</spacer>
@@ -134,7 +127,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -195,7 +188,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -294,7 +287,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>321</width>
<height>20</height>
@@ -307,7 +300,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -320,7 +313,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>41</width>
<height>20</height>
@@ -508,7 +501,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -535,7 +528,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -661,7 +654,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>20</height>
@@ -693,7 +686,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -835,7 +828,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>42</height>
@@ -850,7 +843,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -907,7 +900,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -998,7 +991,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -1023,7 +1016,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>420</width>
<height>16</height>
diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp
index 76e3361..91f8600 100644
--- a/src/vidalia/config/ServerSettings.cpp
+++ b/src/vidalia/config/ServerSettings.cpp
@@ -43,7 +43,6 @@
#define SETTING_BANDWIDTH_RATE "BandwidthRate"
#define SETTING_BANDWIDTH_BURST "BandwidthBurst"
#define SETTING_BRIDGE_RELAY "BridgeRelay"
-#define SETTING_NONEXIT_RELAY "NonExitRelay"
#define SETTING_ENABLE_UPNP "EnableUPnP"
#define SETTING_RELAY_BANDWIDTH_RATE "RelayBandwidthRate"
#define SETTING_RELAY_BANDWIDTH_BURST "RelayBandwidthBurst"
@@ -72,7 +71,7 @@ ServerSettings::ServerSettings(TorControl *torControl)
setDefault(SETTING_BANDWIDTH_BURST, 10485760);
setDefault(SETTING_RELAY_BANDWIDTH_BURST, 10485760);
setDefault(SETTING_EXITPOLICY,
- ExitPolicy(ExitPolicy::Middleman).toString());
+ ExitPolicy(ExitPolicy::Default).toString());
setDefault(SETTING_ENABLE_UPNP, false);
setDefault(SETTING_BRIDGE_RELAY, false);
setDefault(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
@@ -259,21 +258,6 @@ ServerSettings::isBridgeEnabled()
return value(SETTING_BRIDGE_RELAY).toBool() && isServerEnabled();
}
-/** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting as
- * a server. */
-void
-ServerSettings::setNonExitEnabled(bool enabled)
-{
- setValue(SETTING_NONEXIT_RELAY, enabled);
-}
-
-/** Returns true if Tor is configured to act as a non-exit node. */
-bool
-ServerSettings::isNonExitEnabled()
-{
- return value(SETTING_NONEXIT_RELAY).toBool() && isServerEnabled();
-}
-
/** Sets the server's ORPort. */
void
ServerSettings::setORPort(quint16 orPort)
diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h
index 9479c5a..775c92d 100644
--- a/src/vidalia/config/ServerSettings.h
+++ b/src/vidalia/config/ServerSettings.h
@@ -42,12 +42,6 @@ public:
/** Returns true if Tor is configured to act as a bridge node. */
bool isBridgeEnabled();
- /** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting
- * as a server. */
- void setNonExitEnabled(bool enable);
- /** Returns true if Tor is configured to act as a non-exit node. */
- bool isNonExitEnabled();
-
/** Sets the server's ORPort value. */
void setORPort(quint16 orPort);
/** Gets the server's ORPort value. */
diff --git a/src/vidalia/config/ServicePage.h b/src/vidalia/config/ServicePage.h
index 622673f..70c53cf 100644
--- a/src/vidalia/config/ServicePage.h
+++ b/src/vidalia/config/ServicePage.h
@@ -16,6 +16,7 @@
#include "TorSettings.h"
#include "ServiceSettings.h"
#include "ExitPolicy.h"
+#include "HelpBrowser.h"
#include "TorControl.h"
diff --git a/src/vidalia/config/ServicePage.ui b/src/vidalia/config/ServicePage.ui
index 8fc6c57..8be3a59 100644
--- a/src/vidalia/config/ServicePage.ui
+++ b/src/vidalia/config/ServicePage.ui
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>ServicePage</class>
- <widget class="QWidget" name="ServicePage">
- <property name="geometry">
+ <widget class="QWidget" name="ServicePage" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,137 +9,133 @@
<height>400</height>
</rect>
</property>
- <property name="minimumSize">
+ <property name="minimumSize" >
<size>
<width>600</width>
<height>400</height>
</size>
</property>
- <property name="windowTitle">
- <string notr="true"/>
+ <property name="windowTitle" >
+ <string>Form</string>
</property>
- <layout class="QVBoxLayout">
+ <layout class="QVBoxLayout" >
<item>
- <widget class="QGroupBox" name="groupBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title">
+ <property name="title" >
<string>Provided Hidden Services</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0" rowspan="5">
- <widget class="QTableWidget" name="serviceWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <layout class="QGridLayout" >
+ <item rowspan="5" row="0" column="0" >
+ <widget class="QTableWidget" name="serviceWidget" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="selectionMode">
+ <property name="selectionMode" >
<enum>QAbstractItemView::SingleSelection</enum>
</property>
- <property name="selectionBehavior">
+ <property name="selectionBehavior" >
<enum>QAbstractItemView::SelectRows</enum>
</property>
- <property name="textElideMode">
+ <property name="textElideMode" >
<enum>Qt::ElideLeft</enum>
</property>
- <property name="showGrid">
+ <property name="showGrid" >
<bool>true</bool>
</property>
<column>
- <property name="text">
+ <property name="text" >
<string>Onion Address</string>
</property>
</column>
<column>
- <property name="text">
+ <property name="text" >
<string>Virtual Port</string>
</property>
</column>
<column>
- <property name="text">
+ <property name="text" >
<string>Target</string>
</property>
</column>
<column>
- <property name="text">
+ <property name="text" >
<string>Directory Path</string>
</property>
</column>
<column>
- <property name="text">
+ <property name="text" >
<string>Enabled</string>
</property>
</column>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QToolButton" name="addButton">
- <property name="toolTip">
+ <item row="0" column="1" >
+ <widget class="QToolButton" name="addButton" >
+ <property name="toolTip" >
<string>Add new service to list</string>
</property>
- <property name="text">
+ <property name="text" >
<string/>
</property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/list-add.png</normaloff>:/images/22x22/list-add.png</iconset>
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-add.png</iconset>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QToolButton" name="removeButton">
- <property name="toolTip">
+ <item row="1" column="1" >
+ <widget class="QToolButton" name="removeButton" >
+ <property name="toolTip" >
<string>Remove selected service from list</string>
</property>
- <property name="text">
+ <property name="text" >
<string/>
</property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/list-remove.png</normaloff>:/images/22x22/list-remove.png</iconset>
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-remove.png</iconset>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QToolButton" name="copyButton">
- <property name="toolTip">
+ <item row="2" column="1" >
+ <widget class="QToolButton" name="copyButton" >
+ <property name="toolTip" >
<string>Copy onion address of selected service to clipboard</string>
</property>
- <property name="text">
+ <property name="text" >
<string/>
</property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/edit-copy.png</iconset>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QToolButton" name="browseButton">
- <property name="toolTip">
+ <item row="3" column="1" >
+ <widget class="QToolButton" name="browseButton" >
+ <property name="toolTip" >
<string>Browse in local file system and choose directory for selected service</string>
</property>
- <property name="text">
+ <property name="text" >
<string/>
</property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/folder.png</normaloff>:/images/22x22/folder.png</iconset>
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/folder.png</iconset>
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="4" column="1" >
<spacer>
- <property name="orientation">
+ <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" >
<size>
<width>21</width>
<height>46</height>
@@ -153,10 +148,10 @@
</item>
<item>
<spacer>
- <property name="orientation">
+ <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" >
<size>
<width>20</width>
<height>141</height>
@@ -166,8 +161,6 @@
</item>
</layout>
</widget>
- <resources>
- <include location="../res/vidalia.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
index b05b428..d45d88e 100644
--- a/src/vidalia/config/TorSettings.cpp
+++ b/src/vidalia/config/TorSettings.cpp
@@ -44,6 +44,7 @@
#define SETTING_REJECT_PLAINTEXT_PORTS "RejectPlaintextPorts"
#define SETTING_BOOTSTRAP "Bootstrap"
#define SETTING_BOOTSTRAP_FROM "BootstrapFrom"
+#define SETTING_AUTOCONTROL "AutoControl"
/** Default to using hashed password authentication */
#define DEFAULT_AUTH_METHOD PasswordAuth
@@ -92,6 +93,7 @@ TorSettings::TorSettings(TorControl *torControl)
setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>());
setDefault(SETTING_BOOTSTRAP, false);
setDefault(SETTING_BOOTSTRAP_FROM, "");
+ setDefault(SETTING_AUTOCONTROL, false);
}
/** Applies any changes to Tor's control port or authentication settings. */
@@ -450,3 +452,15 @@ TorSettings::bootstrapFrom() const
{
return QDir::convertSeparators(value(SETTING_BOOTSTRAP_FROM).toString());
}
+
+bool
+TorSettings::autoControlPort() const
+{
+ return value(SETTING_AUTOCONTROL).toBool();
+}
+
+void
+TorSettings::setAutoControlPort(const bool autoControl)
+{
+ setValue(SETTING_AUTOCONTROL, autoControl);
+}
diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h
index a4f8ec9..5038c3d 100644
--- a/src/vidalia/config/TorSettings.h
+++ b/src/vidalia/config/TorSettings.h
@@ -72,6 +72,13 @@ public:
/** Get the current control method */
ControlMethod::Method getControlMethod() const;
+ /** Returns true if Vidalia will get the ControlPort automatically from
+ * Tor */
+ bool autoControlPort() const;
+
+ /** Sets whether Vidalia should get the ControlPort from Tor */
+ void setAutoControlPort(const bool auto);
+
/** Set the control method */
void setControlMethod(ControlMethod::Method method);
diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp
index a1ad569..08dd6a0 100644
--- a/src/vidalia/config/TorrcDialog.cpp
+++ b/src/vidalia/config/TorrcDialog.cpp
@@ -19,7 +19,6 @@
#include "Vidalia.h"
#include <QMessageBox>
-#include <QToolBar>
void
TorHighlighter::highlightBlock(const QString &text)
@@ -44,8 +43,6 @@ TorrcDialog::TorrcDialog(QWidget *parent)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
- loadToolBar();
-
TorHighlighter *highlighter = new TorHighlighter(ui.teditTorrc);
/* Retrieve the global TorControl instance */
@@ -64,21 +61,6 @@ TorrcDialog::~TorrcDialog()
}
-void
-TorrcDialog::loadToolBar()
-{
- QToolBar *tb = new QToolBar(this);
- tb->addAction(ui.actionCut);
- tb->addAction(ui.actionCopy);
- tb->addAction(ui.actionPaste);
- tb->addAction(ui.actionUndo);
- tb->addAction(ui.actionRedo);
- tb->addAction(ui.actionSelect_All);
-
- tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- ui.verticalLayout->insertWidget(0, tb);
-}
-
/** Gives a shallow parse phase to the settings to catch most errors
* and passes on the error messages from Tor if the setting's value isn't
* valid. It returns false if something went wrong.
diff --git a/src/vidalia/config/TorrcDialog.h b/src/vidalia/config/TorrcDialog.h
index fb11574..0d60804 100644
--- a/src/vidalia/config/TorrcDialog.h
+++ b/src/vidalia/config/TorrcDialog.h
@@ -49,7 +49,6 @@ private slots:
void saveTorrc();
private:
- void loadToolBar();
/** Loads the contents of the torrc file that Tor has loaded */
void loadTorrc();
/** Parses the options edited and sets them through SETCONF
diff --git a/src/vidalia/config/TorrcDialog.ui b/src/vidalia/config/TorrcDialog.ui
index 42971b4..c72a255 100644
--- a/src/vidalia/config/TorrcDialog.ui
+++ b/src/vidalia/config/TorrcDialog.ui
@@ -19,11 +19,158 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="1" column="0">
<widget class="QTextEdit" name="teditTorrc"/>
</item>
- <item>
+ <item row="5" column="0">
+ <widget class="QCheckBox" name="chkSave">
+ <property name="text">
+ <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="btnCut">
+ <property name="text">
+ <string>Cut</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/editcut.png</normaloff>:/images/22x22/editcut.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCopy">
+ <property name="text">
+ <string>Copy</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnPaste">
+ <property name="text">
+ <string>Paste</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/editpaste.png</normaloff>:/images/22x22/editpaste.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnUndo">
+ <property name="text">
+ <string>Undo</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit_undo.png</normaloff>:/images/22x22/edit_undo.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnRedo">
+ <property name="text">
+ <string>Redo</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit_redo.png</normaloff>:/images/22x22/edit_redo.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSelectAll">
+ <property name="text">
+ <string>Select All</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit_select_all.png</normaloff>:/images/22x22/edit_select_all.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="rdoAll">
@@ -44,16 +191,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="QCheckBox" name="chkSave">
- <property name="text">
- <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
<item row="1" column="0">
@@ -67,78 +204,6 @@
</widget>
</item>
</layout>
- <action name="actionCut">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/editcut.png</normaloff>:/images/22x22/editcut.png</iconset>
- </property>
- <property name="text">
- <string>Cut</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+X</string>
- </property>
- </action>
- <action name="actionCopy">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
- </property>
- <property name="text">
- <string>Copy</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+C</string>
- </property>
- </action>
- <action name="actionPaste">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/editpaste.png</normaloff>:/images/22x22/editpaste.png</iconset>
- </property>
- <property name="text">
- <string>Paste</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+V</string>
- </property>
- </action>
- <action name="actionUndo">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_undo.png</normaloff>:/images/22x22/edit_undo.png</iconset>
- </property>
- <property name="text">
- <string>Undo</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+Z</string>
- </property>
- </action>
- <action name="actionRedo">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_redo.png</normaloff>:/images/22x22/edit_redo.png</iconset>
- </property>
- <property name="text">
- <string>Redo</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+Shift+Z</string>
- </property>
- </action>
- <action name="actionSelect_All">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_select_all.png</normaloff>:/images/22x22/edit_select_all.png</iconset>
- </property>
- <property name="text">
- <string>Select All</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+A</string>
- </property>
- </action>
</widget>
<resources>
<include location="../res/vidalia.qrc"/>
@@ -161,8 +226,8 @@
</hints>
</connection>
<connection>
- <sender>actionUndo</sender>
- <signal>triggered()</signal>
+ <sender>btnUndo</sender>
+ <signal>clicked()</signal>
<receiver>teditTorrc</receiver>
<slot>undo()</slot>
<hints>
@@ -177,8 +242,8 @@
</hints>
</connection>
<connection>
- <sender>actionRedo</sender>
- <signal>triggered()</signal>
+ <sender>btnRedo</sender>
+ <signal>clicked()</signal>
<receiver>teditTorrc</receiver>
<slot>redo()</slot>
<hints>
@@ -193,8 +258,8 @@
</hints>
</connection>
<connection>
- <sender>actionSelect_All</sender>
- <signal>triggered()</signal>
+ <sender>btnSelectAll</sender>
+ <signal>clicked()</signal>
<receiver>teditTorrc</receiver>
<slot>selectAll()</slot>
<hints>
@@ -209,8 +274,8 @@
</hints>
</connection>
<connection>
- <sender>actionCopy</sender>
- <signal>triggered()</signal>
+ <sender>btnCopy</sender>
+ <signal>clicked()</signal>
<receiver>teditTorrc</receiver>
<slot>copy()</slot>
<hints>
@@ -225,8 +290,8 @@
</hints>
</connection>
<connection>
- <sender>actionPaste</sender>
- <signal>triggered()</signal>
+ <sender>btnPaste</sender>
+ <signal>clicked()</signal>
<receiver>teditTorrc</receiver>
<slot>paste()</slot>
<hints>
@@ -241,8 +306,8 @@
</hints>
</connection>
<connection>
- <sender>actionCut</sender>
- <signal>triggered()</signal>
+ <sender>btnCut</sender>
+ <signal>clicked()</signal>
<receiver>teditTorrc</receiver>
<slot>cut()</slot>
<hints>
diff --git a/src/vidalia/help/content/cs/bridges.html b/src/vidalia/help/content/cs/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/cs/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/config.html b/src/vidalia/help/content/cs/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/cs/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+ </li>
+ <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy. Otherwise, you can leave those fields blank.
+ </li>
+ <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+ Below are examples of valid bridge address formats:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay. </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+ </li>
+ <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor. This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+ <ul>
+ <li>
+ <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+ </li>
+ <li>
+ <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/index.html b/src/vidalia/help/content/cs/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/cs/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/links.html b/src/vidalia/help/content/cs/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/cs/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>FAQ</td>
+ <td>
+ <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/log.html b/src/vidalia/help/content/cs/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/cs/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/netview.html b/src/vidalia/help/content/cs/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/cs/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/running.html b/src/vidalia/help/content/cs/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/cs/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/server.html b/src/vidalia/help/content/cs/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/cs/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own. <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+ <li>
+ Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+ </li>
+ <li>Select the <i>Relay</i> configuration page.</li>
+ <li>
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly. Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+ </li>
+ <li>Enter the following information:</li>
+ <ul>
+ <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+ </li>
+ <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+ </li>
+ <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+ </li>
+ </ul>
+ <li>
+ If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>. If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network.
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. Other Services</td>
+ <td valign="middle">*</td>
+ <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network. Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection. Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall.
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/services.html b/src/vidalia/help/content/cs/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/cs/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/troubleshooting.html b/src/vidalia/help/content/cs/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/cs/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/bridges.html b/src/vidalia/help/content/eo/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/eo/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/config.html b/src/vidalia/help/content/eo/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/eo/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+ </li>
+ <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy. Otherwise, you can leave those fields blank.
+ </li>
+ <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+ Below are examples of valid bridge address formats:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay. </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+ </li>
+ <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor. This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+ <ul>
+ <li>
+ <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+ </li>
+ <li>
+ <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/index.html b/src/vidalia/help/content/eo/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/eo/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/links.html b/src/vidalia/help/content/eo/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/eo/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>FAQ</td>
+ <td>
+ <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/log.html b/src/vidalia/help/content/eo/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/eo/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/netview.html b/src/vidalia/help/content/eo/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/eo/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/running.html b/src/vidalia/help/content/eo/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/eo/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/server.html b/src/vidalia/help/content/eo/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/eo/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own. <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+ <li>
+ Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+ </li>
+ <li>Select the <i>Relay</i> configuration page.</li>
+ <li>
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly. Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+ </li>
+ <li>Enter the following information:</li>
+ <ul>
+ <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+ </li>
+ <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+ </li>
+ <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+ </li>
+ </ul>
+ <li>
+ If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>. If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network.
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. Other Services</td>
+ <td valign="middle">*</td>
+ <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network. Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection. Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall.
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/services.html b/src/vidalia/help/content/eo/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/eo/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/troubleshooting.html b/src/vidalia/help/content/eo/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/eo/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/bridges.html b/src/vidalia/help/content/eu/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/eu/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/config.html b/src/vidalia/help/content/eu/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/eu/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+ </li>
+ <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy. Otherwise, you can leave those fields blank.
+ </li>
+ <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+ Below are examples of valid bridge address formats:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay. </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+ </li>
+ <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor. This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+ <ul>
+ <li>
+ <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+ </li>
+ <li>
+ <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/index.html b/src/vidalia/help/content/eu/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/eu/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/links.html b/src/vidalia/help/content/eu/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/eu/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>FAQ</td>
+ <td>
+ <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/log.html b/src/vidalia/help/content/eu/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/eu/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/netview.html b/src/vidalia/help/content/eu/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/eu/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/running.html b/src/vidalia/help/content/eu/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/eu/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/server.html b/src/vidalia/help/content/eu/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/eu/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own. <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+ <li>
+ Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+ </li>
+ <li>Select the <i>Relay</i> configuration page.</li>
+ <li>
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly. Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+ </li>
+ <li>Enter the following information:</li>
+ <ul>
+ <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+ </li>
+ <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+ </li>
+ <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+ </li>
+ </ul>
+ <li>
+ If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>. If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network.
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. Other Services</td>
+ <td valign="middle">*</td>
+ <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network. Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection. Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall.
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/services.html b/src/vidalia/help/content/eu/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/eu/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/troubleshooting.html b/src/vidalia/help/content/eu/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/eu/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/bridges.html b/src/vidalia/help/content/fo/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/fo/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/log.html b/src/vidalia/help/content/fo/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/fo/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/netview.html b/src/vidalia/help/content/fo/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/fo/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/running.html b/src/vidalia/help/content/fo/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/fo/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/services.html b/src/vidalia/help/content/fo/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/fo/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/troubleshooting.html b/src/vidalia/help/content/fo/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/fo/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/bridges.html b/src/vidalia/help/content/he/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/he/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/config.html b/src/vidalia/help/content/he/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/he/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+ </li>
+ <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy. Otherwise, you can leave those fields blank.
+ </li>
+ <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+ Below are examples of valid bridge address formats:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay. </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+ </li>
+ <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor. This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+ <ul>
+ <li>
+ <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+ </li>
+ <li>
+ <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/index.html b/src/vidalia/help/content/he/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/he/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/links.html b/src/vidalia/help/content/he/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/he/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>FAQ</td>
+ <td>
+ <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/log.html b/src/vidalia/help/content/he/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/he/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/netview.html b/src/vidalia/help/content/he/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/he/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/running.html b/src/vidalia/help/content/he/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/he/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/server.html b/src/vidalia/help/content/he/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/he/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own. <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+ <li>
+ Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+ </li>
+ <li>Select the <i>Relay</i> configuration page.</li>
+ <li>
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly. Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+ </li>
+ <li>Enter the following information:</li>
+ <ul>
+ <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+ </li>
+ <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+ </li>
+ <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+ </li>
+ </ul>
+ <li>
+ If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>. If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network.
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. Other Services</td>
+ <td valign="middle">*</td>
+ <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network. Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection. Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall.
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/services.html b/src/vidalia/help/content/he/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/he/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/troubleshooting.html b/src/vidalia/help/content/he/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/he/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/bridges.html b/src/vidalia/help/content/ka/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/ka/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/config.html b/src/vidalia/help/content/ka/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/ka/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+ </li>
+ <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy. Otherwise, you can leave those fields blank.
+ </li>
+ <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+ Below are examples of valid bridge address formats:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay. </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+ </li>
+ <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor. This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+ <ul>
+ <li>
+ <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+ </li>
+ <li>
+ <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/index.html b/src/vidalia/help/content/ka/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/ka/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/links.html b/src/vidalia/help/content/ka/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/ka/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>FAQ</td>
+ <td>
+ <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/log.html b/src/vidalia/help/content/ka/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/ka/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/netview.html b/src/vidalia/help/content/ka/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/ka/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/running.html b/src/vidalia/help/content/ka/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/ka/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/server.html b/src/vidalia/help/content/ka/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/ka/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own. <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+ <li>
+ Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+ </li>
+ <li>Select the <i>Relay</i> configuration page.</li>
+ <li>
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly. Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+ </li>
+ <li>Enter the following information:</li>
+ <ul>
+ <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+ </li>
+ <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+ </li>
+ <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+ </li>
+ </ul>
+ <li>
+ If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>. If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network.
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. Other Services</td>
+ <td valign="middle">*</td>
+ <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network. Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection. Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall.
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/services.html b/src/vidalia/help/content/ka/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/ka/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/troubleshooting.html b/src/vidalia/help/content/ka/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/ka/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/bridges.html b/src/vidalia/help/content/nap/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/nap/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>. The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/config.html b/src/vidalia/help/content/nap/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/nap/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+ </li>
+ <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy. Otherwise, you can leave those fields blank.
+ </li>
+ <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+ Below are examples of valid bridge address formats:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay. </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+ </li>
+ <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor. This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+ <ul>
+ <li>
+ <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+ </li>
+ <li>
+ <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/index.html b/src/vidalia/help/content/nap/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/nap/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/links.html b/src/vidalia/help/content/nap/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/nap/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>FAQ</td>
+ <td>
+ <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki and Bugtracker</td>
+ <td>
+ <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/log.html b/src/vidalia/help/content/nap/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/nap/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process. <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information. <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+ </li>
+ <li>
+ <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+ </li>
+ <li>
+ <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+ </li>
+ <li>
+ <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+ </li>
+ <li>
+ <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+ </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>
+ Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+ </li>
+ <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+ <li>Open the message log from the Vidalia tray menu.</li>
+ <li>Click on <i>Settings</i> at the top of the message log window.</li>
+ <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+ <li>
+ If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/netview.html b/src/vidalia/help/content/nap/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/nap/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The relay is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ The relay is online, but has shown only minimal throughput.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ The relay is online and has shown a throughput >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Location</b></td>
+ <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/running.html b/src/vidalia/help/content/nap/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/nap/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+ <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+ <li>
+ Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+ </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+ <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+ <li>
+ Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+ </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/server.html b/src/vidalia/help/content/nap/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/nap/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own. <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+ <li>
+ Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+ </li>
+ <li>Select the <i>Relay</i> configuration page.</li>
+ <li>
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly. Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+ </li>
+ <li>Enter the following information:</li>
+ <ul>
+ <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+ </li>
+ <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+ </li>
+ <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+ </li>
+ </ul>
+ <li>
+ If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>. If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network.
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. Other Services</td>
+ <td valign="middle">*</td>
+ <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network. Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection. Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall.
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/services.html b/src/vidalia/help/content/nap/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/nap/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback. <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+ <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+ <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+ <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+ <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+ <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+ <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+ <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+ <li>Add service: Creates a new empty service configuration.</li>
+ <li>Remove service: Permanently removes a hidden service configuration. (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+ <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+ <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/troubleshooting.html b/src/vidalia/help/content/nap/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/nap/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+** $Id$
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information. <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>.
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <li>
+ You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+ </li>
+
+ <li>
+ <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+
+ <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+ </p>
+
+ <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+ </li>
+
+ <li>
+ <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+
+ <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>Tor Exited Unexpectedly</h3>
+<p>
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/po/af/links.po b/src/vidalia/help/content/po/af/links.po
index 1a9ffda..5f49d8b 100644
--- a/src/vidalia/help/content/po/af/links.po
+++ b/src/vidalia/help/content/po/af/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/af/netview.po b/src/vidalia/help/content/po/af/netview.po
index 41a9038..e99126d 100644
--- a/src/vidalia/help/content/po/af/netview.po
+++ b/src/vidalia/help/content/po/af/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ak/links.po b/src/vidalia/help/content/po/ak/links.po
index 257d8ac..ba585d2 100644
--- a/src/vidalia/help/content/po/ak/links.po
+++ b/src/vidalia/help/content/po/ak/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ak/netview.po b/src/vidalia/help/content/po/ak/netview.po
index c3d32d8..5242225 100644
--- a/src/vidalia/help/content/po/ak/netview.po
+++ b/src/vidalia/help/content/po/ak/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/am/links.po b/src/vidalia/help/content/po/am/links.po
index 354628e..b9d92c0 100644
--- a/src/vidalia/help/content/po/am/links.po
+++ b/src/vidalia/help/content/po/am/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/am/netview.po b/src/vidalia/help/content/po/am/netview.po
index 7ae44b2..897a666 100644
--- a/src/vidalia/help/content/po/am/netview.po
+++ b/src/vidalia/help/content/po/am/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ar/links.po b/src/vidalia/help/content/po/ar/links.po
index 14f0e24..74d57e0 100644
--- a/src/vidalia/help/content/po/ar/links.po
+++ b/src/vidalia/help/content/po/ar/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ar/netview.po b/src/vidalia/help/content/po/ar/netview.po
index 7ff8e18..d3d4e06 100644
--- a/src/vidalia/help/content/po/ar/netview.po
+++ b/src/vidalia/help/content/po/ar/netview.po
@@ -1,30 +1,18 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-# No part of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-02 18:34+0200\n"
-"Last-Translator: shadi <shadi at 35point5.com>\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -79,13 +67,13 @@ msgstr "خريطة الشبكة"
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
"خريطة الشبكة تتكون من خريطة العالم, مع بروز باللون الأحمر يشير إلى الموقع "
-"الجغرافي للمرحّلات في شبكة تور. يتم رسم خطوط خضراء بين المرحّلات للإشارة إلى "
-"مسار الدوائر التي أنشأها عميل تور خاصتك من خلال شبكة تور."
+"الجغرافي للمرحّلات في شبكة تور. يتم رسم خطوط خضراء بين المرحّلات للإشارة إلى"
+" مسار الدوائر التي أنشأها عميل تور خاصتك من خلال شبكة تور."
#. type: Content of: <html><body><p>
#: en/netview.html:44
@@ -114,22 +102,22 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
"في منتصف صندوق الحوار, أسقل خريطة الشبكة, سترى قائمة من الدوائر الحالية "
"بالاضافة الى أي حركة مرور حاليا للتطبيق على تلك الدوائر. عند تحميل خريطة "
"الشبكة لأول مرة, فإنك على الاغلب سترى اتصال الى geoip.vidalia-project.net, "
-"الذي يحدث عندما يقوم فيداليا بالبحث عن معلومات جغرافية لقائمة مرحلات تور. من "
-"المهم ملاحظة أن هذا الطلب تم من خلال تور, بحيث لا يتم كشف موقعك لمرحل "
-"الموقع الجغرافي لعنوان بروتوكول الانترنت (GeoIP).نتائج عمليات البحث سوف تكون "
-"محلية مؤقتا من اجل الحد من الحمل على مرحلات الموقع الجغرافي لعنوان بروتوكول "
-"الانترنت (GeoIP) لفيداليا."
+"الذي يحدث عندما يقوم فيداليا بالبحث عن معلومات جغرافية لقائمة مرحلات تور. من"
+" المهم ملاحظة أن هذا الطلب تم من خلال تور, بحيث لا يتم كشف موقعك لمرحل "
+"الموقع الجغرافي لعنوان بروتوكول الانترنت (GeoIP).نتائج عمليات البحث سوف تكون"
+" محلية مؤقتا من اجل الحد من الحمل على مرحلات الموقع الجغرافي لعنوان بروتوكول"
+" الانترنت (GeoIP) لفيداليا."
#. type: Content of: <html><body>
#: en/netview.html:66
@@ -148,8 +136,8 @@ msgid ""
"Tor network. Next to each relay is an icon indicating that relay's status. "
"The following table summarizes the possible relay status icons:"
msgstr ""
-"على الجانب الأيسر من الخريطة، سترى قائمة المرحلات في شبكة تور. بجانب كل مرحل "
-"هو رمز يشير إلى حالة المرحل. يلخص الجدول التالي رموز حالة المرحّل الممكنة:"
+"على الجانب الأيسر من الخريطة، سترى قائمة المرحلات في شبكة تور. بجانب كل مرحل"
+" هو رمز يشير إلى حالة المرحل. يلخص الجدول التالي رموز حالة المرحّل الممكنة:"
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:78
@@ -211,8 +199,8 @@ msgstr "تفاصيل المرحّل"
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
"تظهر لوحة تفاصيل المرحّل على الجانب الايمن من الشاشة تعطيك تفاصيل حول "
@@ -227,8 +215,8 @@ msgid ""
"The fields that you may see in the panel are as follows (<i>Note</i>: not "
"all of these fields will always be present):"
msgstr ""
-"الحقول التي قد تراها في اللوحة هي كما يلي (<i>ملاحظة</i>: ليست كل هذه الحقول "
-"موجودة دائما):"
+"الحقول التي قد تراها في اللوحة هي كما يلي (<i>ملاحظة</i>: ليست كل هذه الحقول"
+" موجودة دائما):"
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:138
@@ -249,8 +237,8 @@ msgstr "<b>عنوان بروتوكول الانترنت (IP)</b>"
#: en/netview.html:143
msgid "IP address at which this Tor relay can be reached."
msgstr ""
-"عنوان بروتوكول الإنترنت (IP) الذي يمكن ان يقوم مرحّل تور هذا من الوصول إليه. "
-""
+"عنوان بروتوكول الإنترنت (IP) الذي يمكن ان يقوم مرحّل تور هذا من الوصول إليه."
+" "
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:146
@@ -289,8 +277,8 @@ msgid ""
"Length of time this relay has been available, which can be used to help "
"estimate this relay's stability."
msgstr ""
-"طول الوقت الذي كان فيه المرحّل متوفرا, والذي يمكن استخدامه للمساعدة في تقدير "
-"إستقرار هذا المرحّل."
+"طول الوقت الذي كان فيه المرحّل متوفرا, والذي يمكن استخدامه للمساعدة في تقدير"
+" إستقرار هذا المرحّل."
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:167
@@ -301,3 +289,5 @@ msgstr "<b>آخر تحديث</b>"
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr "تاريخ آخر تحديث لمعلومات هذا المرحل."
+
+
diff --git a/src/vidalia/help/content/po/arn/links.po b/src/vidalia/help/content/po/arn/links.po
index 90757e1..0c679c3 100644
--- a/src/vidalia/help/content/po/arn/links.po
+++ b/src/vidalia/help/content/po/arn/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/arn/netview.po b/src/vidalia/help/content/po/arn/netview.po
index 5ceca62..cab82a6 100644
--- a/src/vidalia/help/content/po/arn/netview.po
+++ b/src/vidalia/help/content/po/arn/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ast/links.po b/src/vidalia/help/content/po/ast/links.po
index 68c08ff..4d223e9 100644
--- a/src/vidalia/help/content/po/ast/links.po
+++ b/src/vidalia/help/content/po/ast/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ast/netview.po b/src/vidalia/help/content/po/ast/netview.po
index d8b3403..7b55d7f 100644
--- a/src/vidalia/help/content/po/ast/netview.po
+++ b/src/vidalia/help/content/po/ast/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/az/links.po b/src/vidalia/help/content/po/az/links.po
index c1a7e1a..c06e26e 100644
--- a/src/vidalia/help/content/po/az/links.po
+++ b/src/vidalia/help/content/po/az/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/az/netview.po b/src/vidalia/help/content/po/az/netview.po
index 094d880..972180a 100644
--- a/src/vidalia/help/content/po/az/netview.po
+++ b/src/vidalia/help/content/po/az/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/be/links.po b/src/vidalia/help/content/po/be/links.po
index 113b905..8577241 100644
--- a/src/vidalia/help/content/po/be/links.po
+++ b/src/vidalia/help/content/po/be/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/be/netview.po b/src/vidalia/help/content/po/be/netview.po
index 8289556..d61f118 100644
--- a/src/vidalia/help/content/po/be/netview.po
+++ b/src/vidalia/help/content/po/be/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/bg/links.po b/src/vidalia/help/content/po/bg/links.po
index 02b3929..8d388b7 100644
--- a/src/vidalia/help/content/po/bg/links.po
+++ b/src/vidalia/help/content/po/bg/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/bg/netview.po b/src/vidalia/help/content/po/bg/netview.po
index 62bfd23..f8081bf 100644
--- a/src/vidalia/help/content/po/bg/netview.po
+++ b/src/vidalia/help/content/po/bg/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/bn/links.po b/src/vidalia/help/content/po/bn/links.po
index b3da2bb..a47c354 100644
--- a/src/vidalia/help/content/po/bn/links.po
+++ b/src/vidalia/help/content/po/bn/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/bn/netview.po b/src/vidalia/help/content/po/bn/netview.po
index 45b9b57..e0ca4d3 100644
--- a/src/vidalia/help/content/po/bn/netview.po
+++ b/src/vidalia/help/content/po/bn/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/bn_IN/links.po b/src/vidalia/help/content/po/bn_IN/links.po
index 6901113..162f6aa 100644
--- a/src/vidalia/help/content/po/bn_IN/links.po
+++ b/src/vidalia/help/content/po/bn_IN/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/bn_IN/netview.po b/src/vidalia/help/content/po/bn_IN/netview.po
index b5b86d6..1f1aa2d 100644
--- a/src/vidalia/help/content/po/bn_IN/netview.po
+++ b/src/vidalia/help/content/po/bn_IN/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ca/netview.po b/src/vidalia/help/content/po/ca/netview.po
index 060c759..9eafa61 100644
--- a/src/vidalia/help/content/po/ca/netview.po
+++ b/src/vidalia/help/content/po/ca/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/cs/links.po b/src/vidalia/help/content/po/cs/links.po
index 549c146..6f5191d 100644
--- a/src/vidalia/help/content/po/cs/links.po
+++ b/src/vidalia/help/content/po/cs/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/cs/netview.po b/src/vidalia/help/content/po/cs/netview.po
index 8a804a7..bebe57e 100644
--- a/src/vidalia/help/content/po/cs/netview.po
+++ b/src/vidalia/help/content/po/cs/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/csb/links.po b/src/vidalia/help/content/po/csb/links.po
index 5222225..0649133 100644
--- a/src/vidalia/help/content/po/csb/links.po
+++ b/src/vidalia/help/content/po/csb/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/csb/netview.po b/src/vidalia/help/content/po/csb/netview.po
index b40bd36..b2f2749 100644
--- a/src/vidalia/help/content/po/csb/netview.po
+++ b/src/vidalia/help/content/po/csb/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/cy/links.po b/src/vidalia/help/content/po/cy/links.po
index f3cbb53..9ffa6a7 100644
--- a/src/vidalia/help/content/po/cy/links.po
+++ b/src/vidalia/help/content/po/cy/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/cy/netview.po b/src/vidalia/help/content/po/cy/netview.po
index d1cdb64..fe61943 100644
--- a/src/vidalia/help/content/po/cy/netview.po
+++ b/src/vidalia/help/content/po/cy/netview.po
@@ -1,11 +1,12 @@
#
+# cymro <markives at hotmail.co.uk>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2011-05-15 11:47+0000\n"
+"Last-Translator: cymro <markives at hotmail.co.uk>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:25
msgid "<a name=\"overview\"/>"
-msgstr ""
+msgstr "<a name=\"overview\"/>"
#. type: Content of: <html><body><h3>
#: en/netview.html:26
@@ -48,12 +49,12 @@ msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:35
msgid "<a name=\"netmap\"/>"
-msgstr ""
+msgstr "<a name=\"netmap\"/>"
#. type: Content of: <html><body><h3>
#: en/netview.html:36
msgid "Network Map"
-msgstr ""
+msgstr "Map Rhwydwaith"
#. type: Content of: <html><body><p>
#: en/netview.html:38
@@ -97,7 +98,7 @@ msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:66
msgid "<a name=\"relaylist\"/>"
-msgstr ""
+msgstr "<a name=\"relaylist\"/>"
#. type: Content of: <html><body><h3>
#: en/netview.html:67
@@ -244,3 +245,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/dz/links.po b/src/vidalia/help/content/po/dz/links.po
index a5803d5..b925b40 100644
--- a/src/vidalia/help/content/po/dz/links.po
+++ b/src/vidalia/help/content/po/dz/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/dz/netview.po b/src/vidalia/help/content/po/dz/netview.po
index 2894859..1972f2c 100644
--- a/src/vidalia/help/content/po/dz/netview.po
+++ b/src/vidalia/help/content/po/dz/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/el/links.po b/src/vidalia/help/content/po/el/links.po
index 93a1118..1930b1d 100644
--- a/src/vidalia/help/content/po/el/links.po
+++ b/src/vidalia/help/content/po/el/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/el/netview.po b/src/vidalia/help/content/po/el/netview.po
index 188d4fd..d2ed171 100644
--- a/src/vidalia/help/content/po/el/netview.po
+++ b/src/vidalia/help/content/po/el/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/en/bridges.po b/src/vidalia/help/content/po/en/bridges.po
index 1ca7993..c7f618d 100644
--- a/src/vidalia/help/content/po/en/bridges.po
+++ b/src/vidalia/help/content/po/en/bridges.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed by
## the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified, propagated, or
+## No part of Vidalia, including this file, may be copied, modified, propagated, or
## distributed except according to the terms described in the LICENSE
## file.
##
diff --git a/src/vidalia/help/content/po/en/config.po b/src/vidalia/help/content/po/en/config.po
index 38567ae..5258bce 100644
--- a/src/vidalia/help/content/po/en/config.po
+++ b/src/vidalia/help/content/po/en/config.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/index.po b/src/vidalia/help/content/po/en/index.po
index 05eef92..08ed998 100644
--- a/src/vidalia/help/content/po/en/index.po
+++ b/src/vidalia/help/content/po/en/index.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/links.po b/src/vidalia/help/content/po/en/links.po
index 2b863bf..40c5745 100644
--- a/src/vidalia/help/content/po/en/links.po
+++ b/src/vidalia/help/content/po/en/links.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/log.po b/src/vidalia/help/content/po/en/log.po
index c035e44..c7ad239 100644
--- a/src/vidalia/help/content/po/en/log.po
+++ b/src/vidalia/help/content/po/en/log.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/netview.po b/src/vidalia/help/content/po/en/netview.po
index 30df021..e6fd9bb 100644
--- a/src/vidalia/help/content/po/en/netview.po
+++ b/src/vidalia/help/content/po/en/netview.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/running.po b/src/vidalia/help/content/po/en/running.po
index 3f8e9d6..066e946 100644
--- a/src/vidalia/help/content/po/en/running.po
+++ b/src/vidalia/help/content/po/en/running.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/server.po b/src/vidalia/help/content/po/en/server.po
index 5cbbd9d..64efda1 100644
--- a/src/vidalia/help/content/po/en/server.po
+++ b/src/vidalia/help/content/po/en/server.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/services.po b/src/vidalia/help/content/po/en/services.po
index 5042798..4632b01 100644
--- a/src/vidalia/help/content/po/en/services.po
+++ b/src/vidalia/help/content/po/en/services.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/troubleshooting.po b/src/vidalia/help/content/po/en/troubleshooting.po
index 469ba59..05f0b60 100644
--- a/src/vidalia/help/content/po/en/troubleshooting.po
+++ b/src/vidalia/help/content/po/en/troubleshooting.po
@@ -6,7 +6,7 @@
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-No part of Vidalia, including this file, may be copied, modified,
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/eo/links.po b/src/vidalia/help/content/po/eo/links.po
index 6035d73..0398bed 100644
--- a/src/vidalia/help/content/po/eo/links.po
+++ b/src/vidalia/help/content/po/eo/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/eo/netview.po b/src/vidalia/help/content/po/eo/netview.po
index 056acbb..671abe3 100644
--- a/src/vidalia/help/content/po/eo/netview.po
+++ b/src/vidalia/help/content/po/eo/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/es/links.po b/src/vidalia/help/content/po/es/links.po
index 4c12c4e..52774cb 100644
--- a/src/vidalia/help/content/po/es/links.po
+++ b/src/vidalia/help/content/po/es/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/es/netview.po b/src/vidalia/help/content/po/es/netview.po
index 133164f..ab341fe 100644
--- a/src/vidalia/help/content/po/es/netview.po
+++ b/src/vidalia/help/content/po/es/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-# No part of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
@@ -255,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/et/links.po b/src/vidalia/help/content/po/et/links.po
index f21e484..4681b25 100644
--- a/src/vidalia/help/content/po/et/links.po
+++ b/src/vidalia/help/content/po/et/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/et/netview.po b/src/vidalia/help/content/po/et/netview.po
index 27aba36..a92e219 100644
--- a/src/vidalia/help/content/po/et/netview.po
+++ b/src/vidalia/help/content/po/et/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/eu/links.po b/src/vidalia/help/content/po/eu/links.po
index c6900ed..dfc8155 100644
--- a/src/vidalia/help/content/po/eu/links.po
+++ b/src/vidalia/help/content/po/eu/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/eu/netview.po b/src/vidalia/help/content/po/eu/netview.po
index 0a395c8..e0cd895 100644
--- a/src/vidalia/help/content/po/eu/netview.po
+++ b/src/vidalia/help/content/po/eu/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/fil/links.po b/src/vidalia/help/content/po/fil/links.po
index 6758ec5..644f0f6 100644
--- a/src/vidalia/help/content/po/fil/links.po
+++ b/src/vidalia/help/content/po/fil/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/fil/netview.po b/src/vidalia/help/content/po/fil/netview.po
index 217b3f2..4b963d6 100644
--- a/src/vidalia/help/content/po/fil/netview.po
+++ b/src/vidalia/help/content/po/fil/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/fr/links.po b/src/vidalia/help/content/po/fr/links.po
index 07734bb..788c8c4 100644
--- a/src/vidalia/help/content/po/fr/links.po
+++ b/src/vidalia/help/content/po/fr/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/fr/netview.po b/src/vidalia/help/content/po/fr/netview.po
index 0020086..e699176 100644
--- a/src/vidalia/help/content/po/fr/netview.po
+++ b/src/vidalia/help/content/po/fr/netview.po
@@ -1,28 +1,18 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-# No part of Vidalia, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms described in the LICENSE
-# file.
-#
-#, fuzzy
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -78,8 +68,8 @@ msgstr "Carte du réseau"
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
"La carte du réseau est une mappemonde sur laquelle des points rouges "
@@ -115,20 +105,20 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
"La moitié inférieure de la fenêtre, sous la carte du réseau, présente la "
-"liste de vos circuits ainsi que le trafic de toutes les applications qui les "
-"utilisent. La première fois que la carte du réseau se charge, vous verrez "
+"liste de vos circuits ainsi que le trafic de toutes les applications qui les"
+" utilisent. La première fois que la carte du réseau se charge, vous verrez "
"probablement une connexion au serveur geoip.vidalia-project.net. Cette "
-"connexion signifie que Vidalia recherche les informations géographiques pour "
-"la liste des relais Tor. Il est important de noter que cette requête "
+"connexion signifie que Vidalia recherche les informations géographiques pour"
+" la liste des relais Tor. Il est important de noter que cette requête "
"s'effectue par le biais de Tor et que votre localisation n'est donc pas "
"révélée au relais GeoIP. Le résultat de cette recherche est mis en cache "
"localement afin de réduire la charge des relais GeoIP de Vidalia."
@@ -165,9 +155,9 @@ msgid ""
"The relay is <i>hibernating</i>, meaning it is online, but has used up as "
"much bandwidth as the operator is willing to allow for a given time period."
msgstr ""
-"Le relais est en mode d'<i>hibernation</i>, c'est-à-dire qu'il est en ligne, "
-"mais qu'il a déjà utilisé toute la bande passante autorisée par l'opérateur "
-"pendant une certaine durée."
+"Le relais est en mode d'<i>hibernation</i>, c'est-à-dire qu'il est en ligne,"
+" mais qu'il a déjà utilisé toute la bande passante autorisée par l'opérateur"
+" pendant une certaine durée."
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:92
@@ -197,8 +187,8 @@ msgid ""
"the past day."
msgstr ""
"Les valeurs de trafic sont des estimations correspondant au minimum en "
-"entrée ou en sortie de la bande passante maximale soutenue durant toutes les "
-"périodes de dix secondes du jour précédent."
+"entrée ou en sortie de la bande passante maximale soutenue durant toutes les"
+" périodes de dix secondes du jour précédent."
#. type: Content of: <html><body>
#: en/netview.html:122
@@ -215,15 +205,15 @@ msgstr "Détails du relais"
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
"Le panneau des détails du relais situé à la droite de l'écran montre les "
"informations détaillées sur le ou les relais sélectionnés dans la <a "
-"href=\"#relaylist\">liste des relais</a>. Si vous avez sélectionné un circuit "
-"ou un flux dans la liste de vos circuits et flux actuels, ce panneau donne "
-"des informations sur tous les relais où est envoyé votre trafic."
+"href=\"#relaylist\">liste des relais</a>. Si vous avez sélectionné un "
+"circuit ou un flux dans la liste de vos circuits et flux actuels, ce panneau"
+" donne des informations sur tous les relais où est envoyé votre trafic."
#. type: Content of: <html><body><p>
#: en/netview.html:132
@@ -265,8 +255,8 @@ msgid ""
"Operating system information and Tor version on which this relay is "
"currently running."
msgstr ""
-"Informations sur le système d'exploitation et sur la version de Tor utilisés "
-"par le relais."
+"Informations sur le système d'exploitation et sur la version de Tor utilisés"
+" par le relais."
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:153
@@ -305,3 +295,5 @@ msgstr "<b>Dernière mise à jour</b>"
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr "Date à laquelle les informations sur ce relais ont été mises à jour."
+
+
diff --git a/src/vidalia/help/content/po/fur/links.po b/src/vidalia/help/content/po/fur/links.po
index 7b0d32a..9d61c1a 100644
--- a/src/vidalia/help/content/po/fur/links.po
+++ b/src/vidalia/help/content/po/fur/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/fur/netview.po b/src/vidalia/help/content/po/fur/netview.po
index c4937ac..97d91c6 100644
--- a/src/vidalia/help/content/po/fur/netview.po
+++ b/src/vidalia/help/content/po/fur/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ga/links.po b/src/vidalia/help/content/po/ga/links.po
index 2d05449..631297f 100644
--- a/src/vidalia/help/content/po/ga/links.po
+++ b/src/vidalia/help/content/po/ga/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ga/netview.po b/src/vidalia/help/content/po/ga/netview.po
index f951aa0..32c871f 100644
--- a/src/vidalia/help/content/po/ga/netview.po
+++ b/src/vidalia/help/content/po/ga/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/gl/links.po b/src/vidalia/help/content/po/gl/links.po
index 0254b64..27d48e1 100644
--- a/src/vidalia/help/content/po/gl/links.po
+++ b/src/vidalia/help/content/po/gl/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/gl/netview.po b/src/vidalia/help/content/po/gl/netview.po
index 5d0cf41..d5da78b 100644
--- a/src/vidalia/help/content/po/gl/netview.po
+++ b/src/vidalia/help/content/po/gl/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/gu/links.po b/src/vidalia/help/content/po/gu/links.po
index 5abff46..41f4e7f 100644
--- a/src/vidalia/help/content/po/gu/links.po
+++ b/src/vidalia/help/content/po/gu/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/gu/netview.po b/src/vidalia/help/content/po/gu/netview.po
index 818c042..e7e60f5 100644
--- a/src/vidalia/help/content/po/gu/netview.po
+++ b/src/vidalia/help/content/po/gu/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/gun/links.po b/src/vidalia/help/content/po/gun/links.po
index a4b75eb..138150d 100644
--- a/src/vidalia/help/content/po/gun/links.po
+++ b/src/vidalia/help/content/po/gun/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/gun/netview.po b/src/vidalia/help/content/po/gun/netview.po
index 2428ec9..8322948 100644
--- a/src/vidalia/help/content/po/gun/netview.po
+++ b/src/vidalia/help/content/po/gun/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ha/links.po b/src/vidalia/help/content/po/ha/links.po
index 8a6d946..20ab0ae 100644
--- a/src/vidalia/help/content/po/ha/links.po
+++ b/src/vidalia/help/content/po/ha/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ha/netview.po b/src/vidalia/help/content/po/ha/netview.po
index e192f33..eb9d4b9 100644
--- a/src/vidalia/help/content/po/ha/netview.po
+++ b/src/vidalia/help/content/po/ha/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/he/links.po b/src/vidalia/help/content/po/he/links.po
index 7f76646..cb7ed2a 100644
--- a/src/vidalia/help/content/po/he/links.po
+++ b/src/vidalia/help/content/po/he/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/he/netview.po b/src/vidalia/help/content/po/he/netview.po
index 6500e46..e0e965d 100644
--- a/src/vidalia/help/content/po/he/netview.po
+++ b/src/vidalia/help/content/po/he/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/hi/links.po b/src/vidalia/help/content/po/hi/links.po
index 58ffb8a..94db9a9 100644
--- a/src/vidalia/help/content/po/hi/links.po
+++ b/src/vidalia/help/content/po/hi/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/hi/netview.po b/src/vidalia/help/content/po/hi/netview.po
index d80af46..67ce337 100644
--- a/src/vidalia/help/content/po/hi/netview.po
+++ b/src/vidalia/help/content/po/hi/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/hr/links.po b/src/vidalia/help/content/po/hr/links.po
index 530bc47..fd8b0ad 100644
--- a/src/vidalia/help/content/po/hr/links.po
+++ b/src/vidalia/help/content/po/hr/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/hr/netview.po b/src/vidalia/help/content/po/hr/netview.po
index 67ab0ce..ab1ab1b 100644
--- a/src/vidalia/help/content/po/hr/netview.po
+++ b/src/vidalia/help/content/po/hr/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ht/links.po b/src/vidalia/help/content/po/ht/links.po
index 5d09a09..b378912 100644
--- a/src/vidalia/help/content/po/ht/links.po
+++ b/src/vidalia/help/content/po/ht/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ht/netview.po b/src/vidalia/help/content/po/ht/netview.po
index 895ffb1..333a3f7 100644
--- a/src/vidalia/help/content/po/ht/netview.po
+++ b/src/vidalia/help/content/po/ht/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/hu/links.po b/src/vidalia/help/content/po/hu/links.po
index 9498bed..006a530 100644
--- a/src/vidalia/help/content/po/hu/links.po
+++ b/src/vidalia/help/content/po/hu/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/hu/netview.po b/src/vidalia/help/content/po/hu/netview.po
index 1d8621a..1318bc2 100644
--- a/src/vidalia/help/content/po/hu/netview.po
+++ b/src/vidalia/help/content/po/hu/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/id/links.po b/src/vidalia/help/content/po/id/links.po
index ee4436d..4f9f9db 100644
--- a/src/vidalia/help/content/po/id/links.po
+++ b/src/vidalia/help/content/po/id/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/id/netview.po b/src/vidalia/help/content/po/id/netview.po
index 08f1eac..c0fbb87 100644
--- a/src/vidalia/help/content/po/id/netview.po
+++ b/src/vidalia/help/content/po/id/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/is/links.po b/src/vidalia/help/content/po/is/links.po
index b32f989..ad58084 100644
--- a/src/vidalia/help/content/po/is/links.po
+++ b/src/vidalia/help/content/po/is/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/is/netview.po b/src/vidalia/help/content/po/is/netview.po
index 02af0a6..fddd1fa 100644
--- a/src/vidalia/help/content/po/is/netview.po
+++ b/src/vidalia/help/content/po/is/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/it/links.po b/src/vidalia/help/content/po/it/links.po
index 288186e..3f70289 100644
--- a/src/vidalia/help/content/po/it/links.po
+++ b/src/vidalia/help/content/po/it/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/it/netview.po b/src/vidalia/help/content/po/it/netview.po
index 133164f..6e62a78 100644
--- a/src/vidalia/help/content/po/it/netview.po
+++ b/src/vidalia/help/content/po/it/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-# No part of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
@@ -255,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/kn/links.po b/src/vidalia/help/content/po/kn/links.po
index 23498b8..1753f49 100644
--- a/src/vidalia/help/content/po/kn/links.po
+++ b/src/vidalia/help/content/po/kn/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/kn/netview.po b/src/vidalia/help/content/po/kn/netview.po
index 9fb7dd1..bea7a23 100644
--- a/src/vidalia/help/content/po/kn/netview.po
+++ b/src/vidalia/help/content/po/kn/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/kw/links.po b/src/vidalia/help/content/po/kw/links.po
index 71cd9ae..be99e48 100644
--- a/src/vidalia/help/content/po/kw/links.po
+++ b/src/vidalia/help/content/po/kw/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/kw/netview.po b/src/vidalia/help/content/po/kw/netview.po
index 3253e05..a674118 100644
--- a/src/vidalia/help/content/po/kw/netview.po
+++ b/src/vidalia/help/content/po/kw/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/lb/links.po b/src/vidalia/help/content/po/lb/links.po
index 91ab85a..588f340 100644
--- a/src/vidalia/help/content/po/lb/links.po
+++ b/src/vidalia/help/content/po/lb/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/lb/netview.po b/src/vidalia/help/content/po/lb/netview.po
index 5b4167f..aa1cf58 100644
--- a/src/vidalia/help/content/po/lb/netview.po
+++ b/src/vidalia/help/content/po/lb/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ln/links.po b/src/vidalia/help/content/po/ln/links.po
index 52f2fef..efac0f5 100644
--- a/src/vidalia/help/content/po/ln/links.po
+++ b/src/vidalia/help/content/po/ln/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ln/netview.po b/src/vidalia/help/content/po/ln/netview.po
index 44255cb..d58cf2f 100644
--- a/src/vidalia/help/content/po/ln/netview.po
+++ b/src/vidalia/help/content/po/ln/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/lo/links.po b/src/vidalia/help/content/po/lo/links.po
index 27e6464..7ff5390 100644
--- a/src/vidalia/help/content/po/lo/links.po
+++ b/src/vidalia/help/content/po/lo/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/lo/netview.po b/src/vidalia/help/content/po/lo/netview.po
index dec50df..f0258a4 100644
--- a/src/vidalia/help/content/po/lo/netview.po
+++ b/src/vidalia/help/content/po/lo/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/lt/links.po b/src/vidalia/help/content/po/lt/links.po
index c429e3e..f01ee79 100644
--- a/src/vidalia/help/content/po/lt/links.po
+++ b/src/vidalia/help/content/po/lt/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/lt/netview.po b/src/vidalia/help/content/po/lt/netview.po
index ca0b4ac..b7bb753 100644
--- a/src/vidalia/help/content/po/lt/netview.po
+++ b/src/vidalia/help/content/po/lt/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/lv/links.po b/src/vidalia/help/content/po/lv/links.po
index cbf6448..1edaced 100644
--- a/src/vidalia/help/content/po/lv/links.po
+++ b/src/vidalia/help/content/po/lv/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/lv/netview.po b/src/vidalia/help/content/po/lv/netview.po
index 4aab18d..4ca4412 100644
--- a/src/vidalia/help/content/po/lv/netview.po
+++ b/src/vidalia/help/content/po/lv/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/mg/links.po b/src/vidalia/help/content/po/mg/links.po
index 2824d9e..bb86bb1 100644
--- a/src/vidalia/help/content/po/mg/links.po
+++ b/src/vidalia/help/content/po/mg/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/mg/netview.po b/src/vidalia/help/content/po/mg/netview.po
index 849cdf1..249ee4e 100644
--- a/src/vidalia/help/content/po/mg/netview.po
+++ b/src/vidalia/help/content/po/mg/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/mi/links.po b/src/vidalia/help/content/po/mi/links.po
index 1964adf..23ae435 100644
--- a/src/vidalia/help/content/po/mi/links.po
+++ b/src/vidalia/help/content/po/mi/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/mi/netview.po b/src/vidalia/help/content/po/mi/netview.po
index 77d5231..7ea1291 100644
--- a/src/vidalia/help/content/po/mi/netview.po
+++ b/src/vidalia/help/content/po/mi/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/mk/links.po b/src/vidalia/help/content/po/mk/links.po
index 279072a..18f63a5 100644
--- a/src/vidalia/help/content/po/mk/links.po
+++ b/src/vidalia/help/content/po/mk/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/mk/netview.po b/src/vidalia/help/content/po/mk/netview.po
index 6dbd9ee..8b17f86 100644
--- a/src/vidalia/help/content/po/mk/netview.po
+++ b/src/vidalia/help/content/po/mk/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ml/links.po b/src/vidalia/help/content/po/ml/links.po
index 12fd75e..ae69182 100644
--- a/src/vidalia/help/content/po/ml/links.po
+++ b/src/vidalia/help/content/po/ml/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ml/netview.po b/src/vidalia/help/content/po/ml/netview.po
index ef9ffa6..3263383 100644
--- a/src/vidalia/help/content/po/ml/netview.po
+++ b/src/vidalia/help/content/po/ml/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/mn/links.po b/src/vidalia/help/content/po/mn/links.po
index bac14dd..bb5fbd7 100644
--- a/src/vidalia/help/content/po/mn/links.po
+++ b/src/vidalia/help/content/po/mn/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/mn/netview.po b/src/vidalia/help/content/po/mn/netview.po
index 450c1ed..42bec80 100644
--- a/src/vidalia/help/content/po/mn/netview.po
+++ b/src/vidalia/help/content/po/mn/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/mr/links.po b/src/vidalia/help/content/po/mr/links.po
index bbba452..839c61c 100644
--- a/src/vidalia/help/content/po/mr/links.po
+++ b/src/vidalia/help/content/po/mr/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/mr/netview.po b/src/vidalia/help/content/po/mr/netview.po
index f450fe0..e7b3a22 100644
--- a/src/vidalia/help/content/po/mr/netview.po
+++ b/src/vidalia/help/content/po/mr/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ms/links.po b/src/vidalia/help/content/po/ms/links.po
index f32003d..ce3eb06 100644
--- a/src/vidalia/help/content/po/ms/links.po
+++ b/src/vidalia/help/content/po/ms/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ms/netview.po b/src/vidalia/help/content/po/ms/netview.po
index e65713a..1322346 100644
--- a/src/vidalia/help/content/po/ms/netview.po
+++ b/src/vidalia/help/content/po/ms/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/mt/links.po b/src/vidalia/help/content/po/mt/links.po
index 2953719..9c23000 100644
--- a/src/vidalia/help/content/po/mt/links.po
+++ b/src/vidalia/help/content/po/mt/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/mt/netview.po b/src/vidalia/help/content/po/mt/netview.po
index fc20730..700b34b 100644
--- a/src/vidalia/help/content/po/mt/netview.po
+++ b/src/vidalia/help/content/po/mt/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/my/links.po b/src/vidalia/help/content/po/my/links.po
index 31d2218..0158a30 100644
--- a/src/vidalia/help/content/po/my/links.po
+++ b/src/vidalia/help/content/po/my/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/my/netview.po b/src/vidalia/help/content/po/my/netview.po
index a412447..cb126fe 100644
--- a/src/vidalia/help/content/po/my/netview.po
+++ b/src/vidalia/help/content/po/my/netview.po
@@ -1,28 +1,18 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-# No part of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -80,8 +70,8 @@ msgstr "ကြန္ယက္ေျမပံု"
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
"ကြန္ယက္ေျမပံုတြင္ အနီေရာင္ pinpoints မ်ားျဖင့္ ရည္ညႊန္းထားေသာ Tor "
@@ -110,27 +100,27 @@ msgid ""
"geoip.vidalia-project.net."
msgstr ""
"GeoIP database ထဲက relay ၏ IP လိပ္စာမ်ားကို ၾကည့္ျခင္းအားျဖင့္ Tor relay "
-"တစ္ခု၏ ပထဝီဆိုင္ရာ တည္ေနရာကို ဆံုးျဖတ္ႏိုင္ပါသည္။ ၎ကို MaxMind က ဖန္တီးထားတာ "
-"ျဖစ္ျပီး geoip.vidalia-project.net မွာတည္ရွိပါတယ္။"
+"တစ္ခု၏ ပထဝီဆိုင္ရာ တည္ေနရာကို ဆံုးျဖတ္ႏိုင္ပါသည္။ ၎ကို MaxMind က ဖန္တီးထားတာ"
+" ျဖစ္ျပီး geoip.vidalia-project.net မွာတည္ရွိပါတယ္။"
#. type: Content of: <html><body><p>
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
"ကြန္ယက္ေျမပံု၏ ေအာက္ဘက္ ဒိုင္ယာေလာ့ခ္၏ အလယ္တြင္ အဲ့ဒိ circuits မ်ားေပၚရွိ "
"လတ္တေလာ application လမ္းေၾကာင္းမ်ား ကဲ့သို႔ပင္ သင္၏ လက္ရွိ circuits မ်ား "
"စာရင္းကို ျမင္ေတြ႕ႏိုင္ပါတယ္။ ကြန္ယက္ ေျမပံု ပထမဆံုး စတင္တဲ့အခါမွာ Tor "
"relays မ်ား၏ စာရင္းအတြက္ ပထဝီဆိုင္ရာ သတင္းအခ်က္အလက္မ်ားကို Vidalia "
-"ၾကည့္တဲ့ခါ ေတြ႕ရမယ့္ geoip.vidalia-project.net ကို ခ်ိတ္ဆက္မႈအား ျမင္ရမွာပါ။ "
-"အေရးတၾကီး သိရမွာက Tor ကိုျဖတ္၍ ျပီးသြားတယ္ဆိုတာပါပဲ။ ထို႔ေၾကာင့္ GeoIP "
+"ၾကည့္တဲ့ခါ ေတြ႕ရမယ့္ geoip.vidalia-project.net ကို ခ်ိတ္ဆက္မႈအား ျမင္ရမွာပါ။"
+" အေရးတၾကီး သိရမွာက Tor ကိုျဖတ္၍ ျပီးသြားတယ္ဆိုတာပါပဲ။ ထို႔ေၾကာင့္ GeoIP "
"relay သို႔ သင့္တည္ေနရာကို ထုတ္ေဖာ္ေျပာမွာ မဟုတ္ပါဘူး။ ၾကည့္ရႈျခင္း၏ "
"ရလဒ္ကေတာ့ Vidalia ၏ GeoIP relays မ်ားေပၚမွာ load လုပ္တာကို ေလွ်ာ့ခ်ရန္ "
"အလို႔ငွာ local မွာပဲ ဖမ္းယူေပးထားမွာ ျဖစ္ပါတယ္။"
@@ -154,8 +144,8 @@ msgid ""
msgstr ""
"network view ၏ ဘယ္ဘက္ျခမ္းတြင္ Tor ကြန္ယက္ထဲရွိ relays မ်ား စာရင္းကို "
"သင္ျမင္ေတြ႕ရမွာ ျဖစ္ပါတယ္။ ေနာက္တစ္ခုကေတာ့ relay တစ္ခုခ်င္းစီဟာ relay ၏ "
-"status ကို ညႊန္းတဲ့ icon ျဖစ္ပါတယ္။ ေအာက္ေဖာ္ျပပါ ဇယားကြက္ကေတာ့ relay status "
-"icons မ်ားရဲ႕ ျဖစ္ႏိုင္ေျခရွိတဲ့ အႏွစ္ခ်ဳပ္ ဇယားကြက္ ျဖစ္ပါတယ္:"
+"status ကို ညႊန္းတဲ့ icon ျဖစ္ပါတယ္။ ေအာက္ေဖာ္ျပပါ ဇယားကြက္ကေတာ့ relay status"
+" icons မ်ားရဲ႕ ျဖစ္ႏိုင္ေျခရွိတဲ့ အႏွစ္ခ်ဳပ္ ဇယားကြက္ ျဖစ္ပါတယ္:"
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:78
@@ -220,8 +210,8 @@ msgstr "Relay အေသးစိတ္မ်ား"
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
"screen ၏ ညာဘက္ျခမ္းမွာရွိတဲ့ relay အေသးစိတ္ panel သည္ relay အေၾကာင္း "
@@ -312,3 +302,5 @@ msgstr "<b>ေနာက္ဆံုး update ျပဳလုပ္ျပီး
msgid "Date this relay's information was last updated."
msgstr ""
"ဤ relay ေန႔စြဲ၏ သတင္းအခ်က္အလက္သည္ ေနာက္ဆံုး update ျပဳလုပ္ျပီး ျဖစ္ပါသည္။"
+
+
diff --git a/src/vidalia/help/content/po/nap/links.po b/src/vidalia/help/content/po/nap/links.po
index 7890133..60ee878 100644
--- a/src/vidalia/help/content/po/nap/links.po
+++ b/src/vidalia/help/content/po/nap/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/nap/netview.po b/src/vidalia/help/content/po/nap/netview.po
index 3130bf3..f0cb9b3 100644
--- a/src/vidalia/help/content/po/nap/netview.po
+++ b/src/vidalia/help/content/po/nap/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/nb/links.po b/src/vidalia/help/content/po/nb/links.po
index fceb3ae..1a66e48 100644
--- a/src/vidalia/help/content/po/nb/links.po
+++ b/src/vidalia/help/content/po/nb/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/nb/netview.po b/src/vidalia/help/content/po/nb/netview.po
index 267c31f..0dfac52 100644
--- a/src/vidalia/help/content/po/nb/netview.po
+++ b/src/vidalia/help/content/po/nb/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ne/links.po b/src/vidalia/help/content/po/ne/links.po
index 76efb24..56f031e 100644
--- a/src/vidalia/help/content/po/ne/links.po
+++ b/src/vidalia/help/content/po/ne/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ne/netview.po b/src/vidalia/help/content/po/ne/netview.po
index 1203d67..5326785 100644
--- a/src/vidalia/help/content/po/ne/netview.po
+++ b/src/vidalia/help/content/po/ne/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/nl/links.po b/src/vidalia/help/content/po/nl/links.po
index e793d8e..337b57b 100644
--- a/src/vidalia/help/content/po/nl/links.po
+++ b/src/vidalia/help/content/po/nl/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/nl/netview.po b/src/vidalia/help/content/po/nl/netview.po
index a66393d..e67037c 100644
--- a/src/vidalia/help/content/po/nl/netview.po
+++ b/src/vidalia/help/content/po/nl/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/nn/links.po b/src/vidalia/help/content/po/nn/links.po
index ce7e347..96f9eea 100644
--- a/src/vidalia/help/content/po/nn/links.po
+++ b/src/vidalia/help/content/po/nn/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/nn/netview.po b/src/vidalia/help/content/po/nn/netview.po
index 6dec764..ba232c5 100644
--- a/src/vidalia/help/content/po/nn/netview.po
+++ b/src/vidalia/help/content/po/nn/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/nso/links.po b/src/vidalia/help/content/po/nso/links.po
index c6e9224..14e406e 100644
--- a/src/vidalia/help/content/po/nso/links.po
+++ b/src/vidalia/help/content/po/nso/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/nso/netview.po b/src/vidalia/help/content/po/nso/netview.po
index 30d29e9..88179c3 100644
--- a/src/vidalia/help/content/po/nso/netview.po
+++ b/src/vidalia/help/content/po/nso/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/oc/links.po b/src/vidalia/help/content/po/oc/links.po
index 4ddb723..3b71c5e 100644
--- a/src/vidalia/help/content/po/oc/links.po
+++ b/src/vidalia/help/content/po/oc/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/oc/netview.po b/src/vidalia/help/content/po/oc/netview.po
index 611816a..dd2d147 100644
--- a/src/vidalia/help/content/po/oc/netview.po
+++ b/src/vidalia/help/content/po/oc/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/pa/links.po b/src/vidalia/help/content/po/pa/links.po
index 558a035..9b0a1e4 100644
--- a/src/vidalia/help/content/po/pa/links.po
+++ b/src/vidalia/help/content/po/pa/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/pa/netview.po b/src/vidalia/help/content/po/pa/netview.po
index a4cda00..6b83d68 100644
--- a/src/vidalia/help/content/po/pa/netview.po
+++ b/src/vidalia/help/content/po/pa/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/pap/links.po b/src/vidalia/help/content/po/pap/links.po
index 628cdb1..ee83271 100644
--- a/src/vidalia/help/content/po/pap/links.po
+++ b/src/vidalia/help/content/po/pap/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/pap/netview.po b/src/vidalia/help/content/po/pap/netview.po
index 32e0745..8a52252 100644
--- a/src/vidalia/help/content/po/pap/netview.po
+++ b/src/vidalia/help/content/po/pap/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/pl/links.po b/src/vidalia/help/content/po/pl/links.po
index 1c624da..049bf3a 100644
--- a/src/vidalia/help/content/po/pl/links.po
+++ b/src/vidalia/help/content/po/pl/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/pl/netview.po b/src/vidalia/help/content/po/pl/netview.po
index 5c43864..05900ed 100644
--- a/src/vidalia/help/content/po/pl/netview.po
+++ b/src/vidalia/help/content/po/pl/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/pms/links.po b/src/vidalia/help/content/po/pms/links.po
index 22d109d..3216ff0 100644
--- a/src/vidalia/help/content/po/pms/links.po
+++ b/src/vidalia/help/content/po/pms/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/pms/netview.po b/src/vidalia/help/content/po/pms/netview.po
index 0fd0845..bc52b3c 100644
--- a/src/vidalia/help/content/po/pms/netview.po
+++ b/src/vidalia/help/content/po/pms/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ps/links.po b/src/vidalia/help/content/po/ps/links.po
index e470919..e4512d9 100644
--- a/src/vidalia/help/content/po/ps/links.po
+++ b/src/vidalia/help/content/po/ps/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ps/netview.po b/src/vidalia/help/content/po/ps/netview.po
index 9b4ee0f..69eece5 100644
--- a/src/vidalia/help/content/po/ps/netview.po
+++ b/src/vidalia/help/content/po/ps/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/pt/links.po b/src/vidalia/help/content/po/pt/links.po
index 8b8818f..54c8dd1 100644
--- a/src/vidalia/help/content/po/pt/links.po
+++ b/src/vidalia/help/content/po/pt/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/pt/netview.po b/src/vidalia/help/content/po/pt/netview.po
index 3e5919f..4db7bf2 100644
--- a/src/vidalia/help/content/po/pt/netview.po
+++ b/src/vidalia/help/content/po/pt/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/pt_BR/links.po b/src/vidalia/help/content/po/pt_BR/links.po
index b3ce1d1..c9ccede 100644
--- a/src/vidalia/help/content/po/pt_BR/links.po
+++ b/src/vidalia/help/content/po/pt_BR/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/pt_BR/netview.po b/src/vidalia/help/content/po/pt_BR/netview.po
index 8ab192c..c5d07fb 100644
--- a/src/vidalia/help/content/po/pt_BR/netview.po
+++ b/src/vidalia/help/content/po/pt_BR/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ro/links.po b/src/vidalia/help/content/po/ro/links.po
index 77a5a70..f75d7ab 100644
--- a/src/vidalia/help/content/po/ro/links.po
+++ b/src/vidalia/help/content/po/ro/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ro/netview.po b/src/vidalia/help/content/po/ro/netview.po
index a9d79de..87d598e 100644
--- a/src/vidalia/help/content/po/ro/netview.po
+++ b/src/vidalia/help/content/po/ro/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ru/index.po b/src/vidalia/help/content/po/ru/index.po
index fe5c186..6c80e49 100644
--- a/src/vidalia/help/content/po/ru/index.po
+++ b/src/vidalia/help/content/po/ru/index.po
@@ -34,7 +34,7 @@ msgid ""
"Select a help topic from the tree on the left or click on the Search button "
"above the list of topics to search through all available help topics."
msgstr ""
-"Выберите раздел помощи из дерева слева или используйте кнопку \\\"Поиск\\\" (над "
+"Выберите раздел помощи из дерева слева или используйте кнопку \"Поиск\" (над "
"списком разделов) для поиска во всех доступных разделах сразу."
#. type: Content of: <html><body><p>
diff --git a/src/vidalia/help/content/po/ru/links.po b/src/vidalia/help/content/po/ru/links.po
index ee15e7f..f9db63f 100644
--- a/src/vidalia/help/content/po/ru/links.po
+++ b/src/vidalia/help/content/po/ru/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ru/netview.po b/src/vidalia/help/content/po/ru/netview.po
index 81470cb..406ba81 100644
--- a/src/vidalia/help/content/po/ru/netview.po
+++ b/src/vidalia/help/content/po/ru/netview.po
@@ -1,30 +1,18 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-# No part of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-24 08:48+0200\n"
-"Last-Translator: euneko <euneko at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\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"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -37,8 +25,8 @@ msgid ""
"The network viewer lets you see relays in the Tor network and where your "
"traffic is going."
msgstr ""
-"Обзор сети позволяет просмотреть ретрансляторы в сети Tor и куда расходуется "
-"ваш трафик."
+"Обзор сети позволяет просмотреть ретрансляторы в сети Tor и куда расходуется"
+" ваш трафик."
#. type: Content of: <html><body>
#: en/netview.html:25
@@ -78,8 +66,8 @@ msgstr "Карта сети."
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
"Карта сети содержит карту мира, красным отмечено географическое место "
@@ -114,22 +102,22 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
"В середине диалога, ниже по карте сети, вы увидите список ваших текущих "
"схем, а также любой трафик приложения в настоящее время на этих схемах. "
-"Когда карта сети загружается в первый раз, вы вероятно увидите подключение к "
-"geoip.vidalia-project.net, которое возникает, когда Vidalia просматривает "
+"Когда карта сети загружается в первый раз, вы вероятно увидите подключение к"
+" geoip.vidalia-project.net, которое возникает, когда Vidalia просматривает "
"информацию, для получения списка серверов. Важно отметить, что этот запрос "
"выполняется через Tor, так что ваше местоположение не раскрывается для "
-"ретранслятора GeoIP. Результаты поиска будут кэшироваться локально, для того "
-"чтоб уменьшить нагрузку на ретрансляторы GeoIP ."
+"ретранслятора GeoIP. Результаты поиска будут кэшироваться локально, для того"
+" чтоб уменьшить нагрузку на ретрансляторы GeoIP ."
#. type: Content of: <html><body>
#: en/netview.html:66
@@ -150,8 +138,8 @@ msgid ""
msgstr ""
"В левой части просмотрщика сети ,вы увидите список ретрансляторов в сети "
"Tor.Следующая за каждым ретранслятором иконка указывает на статус "
-"ретранслятора.ниже таблица кратко описывает возможные статусы ретрансляторов "
-"на иконках."
+"ретранслятора.ниже таблица кратко описывает возможные статусы ретрансляторов"
+" на иконках."
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:78
@@ -219,15 +207,15 @@ msgstr "Подробности ретранслятора"
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
"Панель подробностей ретранслятора в правой части экрана предоставит вам "
"информацию о вашем ретрансляторе или выбранном из <a "
-"href=\"#relaylist\">список ретрансляторов</a>.Если вы выбрали схему цепи или "
-"поток из списка ваших текущих схем цепочек и потоков, эта панель покажет вам "
-"подробную информацию о каждом ретрансляторе, через который трафик в "
+"href=\"#relaylist\">список ретрансляторов</a>.Если вы выбрали схему цепи или"
+" поток из списка ваших текущих схем цепочек и потоков, эта панель покажет "
+"вам подробную информацию о каждом ретрансляторе, через который трафик в "
"настоящее время отправлен."
#. type: Content of: <html><body><p>
@@ -236,8 +224,8 @@ msgid ""
"The fields that you may see in the panel are as follows (<i>Note</i>: not "
"all of these fields will always be present):"
msgstr ""
-"Поля, которые вы можете увидеть в панели являются (<i>Примечание</i>: не все "
-"эти поля всегда будут присутствовать):"
+"Поля, которые вы можете увидеть в панели являются (<i>Примечание</i>: не все"
+" эти поля всегда будут присутствовать):"
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:138
@@ -284,8 +272,8 @@ msgid ""
"Estimated maximum amount of bandwidth that the directory relays have seen "
"this relay handle recently."
msgstr ""
-"Расчетная максимальная сумма пропускной способности, зафиксированная на этом "
-"ретрансляторе в последнее время."
+"Расчетная максимальная сумма пропускной способности, зафиксированная на этом"
+" ретрансляторе в последнее время."
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:160
@@ -310,3 +298,5 @@ msgstr "<b>Последнее обновление</b>"
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr "Дата последнего обновления информации об этом ретрансляторе."
+
+
diff --git a/src/vidalia/help/content/po/sco/links.po b/src/vidalia/help/content/po/sco/links.po
index 67d180f..ea796c4 100644
--- a/src/vidalia/help/content/po/sco/links.po
+++ b/src/vidalia/help/content/po/sco/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/sco/netview.po b/src/vidalia/help/content/po/sco/netview.po
index 8c98164..8c51092 100644
--- a/src/vidalia/help/content/po/sco/netview.po
+++ b/src/vidalia/help/content/po/sco/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/son/links.po b/src/vidalia/help/content/po/son/links.po
index 1cdfa93..1427b4f 100644
--- a/src/vidalia/help/content/po/son/links.po
+++ b/src/vidalia/help/content/po/son/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/son/netview.po b/src/vidalia/help/content/po/son/netview.po
index a9fd80d..bf48885 100644
--- a/src/vidalia/help/content/po/son/netview.po
+++ b/src/vidalia/help/content/po/son/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/su/links.po b/src/vidalia/help/content/po/su/links.po
index 7e491d0..db118d2 100644
--- a/src/vidalia/help/content/po/su/links.po
+++ b/src/vidalia/help/content/po/su/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/su/netview.po b/src/vidalia/help/content/po/su/netview.po
index 5263b4f..c7bfdd5 100644
--- a/src/vidalia/help/content/po/su/netview.po
+++ b/src/vidalia/help/content/po/su/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/sw/links.po b/src/vidalia/help/content/po/sw/links.po
index 30eda45..5c23a24 100644
--- a/src/vidalia/help/content/po/sw/links.po
+++ b/src/vidalia/help/content/po/sw/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/sw/netview.po b/src/vidalia/help/content/po/sw/netview.po
index e3748e6..390bae9 100644
--- a/src/vidalia/help/content/po/sw/netview.po
+++ b/src/vidalia/help/content/po/sw/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ta/links.po b/src/vidalia/help/content/po/ta/links.po
index a293f32..2621f70 100644
--- a/src/vidalia/help/content/po/ta/links.po
+++ b/src/vidalia/help/content/po/ta/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ta/netview.po b/src/vidalia/help/content/po/ta/netview.po
index 48786fb..d83916d 100644
--- a/src/vidalia/help/content/po/ta/netview.po
+++ b/src/vidalia/help/content/po/ta/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/te/links.po b/src/vidalia/help/content/po/te/links.po
index 4f28afc..c246d24 100644
--- a/src/vidalia/help/content/po/te/links.po
+++ b/src/vidalia/help/content/po/te/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/te/netview.po b/src/vidalia/help/content/po/te/netview.po
index 9b16a10..b6d8750 100644
--- a/src/vidalia/help/content/po/te/netview.po
+++ b/src/vidalia/help/content/po/te/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/tg/links.po b/src/vidalia/help/content/po/tg/links.po
index 39a9a54..b74052e 100644
--- a/src/vidalia/help/content/po/tg/links.po
+++ b/src/vidalia/help/content/po/tg/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/tg/netview.po b/src/vidalia/help/content/po/tg/netview.po
index 333df5d..8cea836 100644
--- a/src/vidalia/help/content/po/tg/netview.po
+++ b/src/vidalia/help/content/po/tg/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/th/links.po b/src/vidalia/help/content/po/th/links.po
index d30ce09..dd761af 100644
--- a/src/vidalia/help/content/po/th/links.po
+++ b/src/vidalia/help/content/po/th/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/th/netview.po b/src/vidalia/help/content/po/th/netview.po
index 6f90155..2389315 100644
--- a/src/vidalia/help/content/po/th/netview.po
+++ b/src/vidalia/help/content/po/th/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ti/links.po b/src/vidalia/help/content/po/ti/links.po
index b830658..ce522c9 100644
--- a/src/vidalia/help/content/po/ti/links.po
+++ b/src/vidalia/help/content/po/ti/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ti/netview.po b/src/vidalia/help/content/po/ti/netview.po
index 7719a04..d5e4b59 100644
--- a/src/vidalia/help/content/po/ti/netview.po
+++ b/src/vidalia/help/content/po/ti/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/tk/links.po b/src/vidalia/help/content/po/tk/links.po
index 3253f25..9edce2b 100644
--- a/src/vidalia/help/content/po/tk/links.po
+++ b/src/vidalia/help/content/po/tk/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/tk/netview.po b/src/vidalia/help/content/po/tk/netview.po
index 1cd01b8..d26fa09 100644
--- a/src/vidalia/help/content/po/tk/netview.po
+++ b/src/vidalia/help/content/po/tk/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/tr/links.po b/src/vidalia/help/content/po/tr/links.po
index f37982e..6c1a5ef 100644
--- a/src/vidalia/help/content/po/tr/links.po
+++ b/src/vidalia/help/content/po/tr/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/tr/netview.po b/src/vidalia/help/content/po/tr/netview.po
index 79e248b..4e33465 100644
--- a/src/vidalia/help/content/po/tr/netview.po
+++ b/src/vidalia/help/content/po/tr/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:03+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/uk/links.po b/src/vidalia/help/content/po/uk/links.po
index 617f50e..ec4555e 100644
--- a/src/vidalia/help/content/po/uk/links.po
+++ b/src/vidalia/help/content/po/uk/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/uk/netview.po b/src/vidalia/help/content/po/uk/netview.po
index 6a03b77..0aa4250 100644
--- a/src/vidalia/help/content/po/uk/netview.po
+++ b/src/vidalia/help/content/po/uk/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ur/links.po b/src/vidalia/help/content/po/ur/links.po
index 98fd7eb..d44a783 100644
--- a/src/vidalia/help/content/po/ur/links.po
+++ b/src/vidalia/help/content/po/ur/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ur/netview.po b/src/vidalia/help/content/po/ur/netview.po
index 95e3b63..f33fcb8 100644
--- a/src/vidalia/help/content/po/ur/netview.po
+++ b/src/vidalia/help/content/po/ur/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/ve/links.po b/src/vidalia/help/content/po/ve/links.po
index a0157f5..478ec09 100644
--- a/src/vidalia/help/content/po/ve/links.po
+++ b/src/vidalia/help/content/po/ve/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/ve/netview.po b/src/vidalia/help/content/po/ve/netview.po
index 8b0aa3d..36708a4 100644
--- a/src/vidalia/help/content/po/ve/netview.po
+++ b/src/vidalia/help/content/po/ve/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/vi/links.po b/src/vidalia/help/content/po/vi/links.po
index 253c7b9..0815ee7 100644
--- a/src/vidalia/help/content/po/vi/links.po
+++ b/src/vidalia/help/content/po/vi/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/vi/netview.po b/src/vidalia/help/content/po/vi/netview.po
index 74ff807..10ae0aa 100644
--- a/src/vidalia/help/content/po/vi/netview.po
+++ b/src/vidalia/help/content/po/vi/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/wa/links.po b/src/vidalia/help/content/po/wa/links.po
index 01014a2..2b0c41b 100644
--- a/src/vidalia/help/content/po/wa/links.po
+++ b/src/vidalia/help/content/po/wa/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/wa/netview.po b/src/vidalia/help/content/po/wa/netview.po
index 503a27d..3acb714 100644
--- a/src/vidalia/help/content/po/wa/netview.po
+++ b/src/vidalia/help/content/po/wa/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:05+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/zh_CN/links.po b/src/vidalia/help/content/po/zh_CN/links.po
index 859b4a5..9bfd6c9 100644
--- a/src/vidalia/help/content/po/zh_CN/links.po
+++ b/src/vidalia/help/content/po/zh_CN/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/zh_CN/netview.po b/src/vidalia/help/content/po/zh_CN/netview.po
index 8e4e7d5..26e8ab4 100644
--- a/src/vidalia/help/content/po/zh_CN/netview.po
+++ b/src/vidalia/help/content/po/zh_CN/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/zh_HK/links.po b/src/vidalia/help/content/po/zh_HK/links.po
index 077a112..cc606ac 100644
--- a/src/vidalia/help/content/po/zh_HK/links.po
+++ b/src/vidalia/help/content/po/zh_HK/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/zh_HK/netview.po b/src/vidalia/help/content/po/zh_HK/netview.po
index 835d3e1..9aa5dc4 100644
--- a/src/vidalia/help/content/po/zh_HK/netview.po
+++ b/src/vidalia/help/content/po/zh_HK/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/zh_TW/links.po b/src/vidalia/help/content/po/zh_TW/links.po
index 4ae668f..9ac6f24 100644
--- a/src/vidalia/help/content/po/zh_TW/links.po
+++ b/src/vidalia/help/content/po/zh_TW/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"PO-Revision-Date: 2011-05-06 19:12+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/zh_TW/netview.po b/src/vidalia/help/content/po/zh_TW/netview.po
index 6332f41..3b07eb1 100644
--- a/src/vidalia/help/content/po/zh_TW/netview.po
+++ b/src/vidalia/help/content/po/zh_TW/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:28+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po/zu/links.po b/src/vidalia/help/content/po/zu/links.po
index a998a77..eff4270 100644
--- a/src/vidalia/help/content/po/zu/links.po
+++ b/src/vidalia/help/content/po/zu/links.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-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"PO-Revision-Date: 2011-05-06 19:13+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/help/content/po/zu/netview.po b/src/vidalia/help/content/po/zu/netview.po
index 607e743..b7517cb 100644
--- a/src/vidalia/help/content/po/zu/netview.po
+++ b/src/vidalia/help/content/po/zu/netview.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: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"PO-Revision-Date: 2011-08-10 10:04+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,3 +244,5 @@ msgstr ""
#: en/netview.html:168
msgid "Date this relay's information was last updated."
msgstr ""
+
+
diff --git a/src/vidalia/help/content/po2html.sh b/src/vidalia/help/content/po2html.sh
index b94ee77..3adb742 100755
--- a/src/vidalia/help/content/po2html.sh
+++ b/src/vidalia/help/content/po2html.sh
@@ -28,7 +28,7 @@ for file in $po ; do
# Validate input and write results to a log file
validate_script="/home/runa/tor/translation/tools/validate.py"
- validate_log="/home/runa/tor/validate/vidaliahelp-validate.log"
+ validate_log="/home/runa/tor/vidalia/src/vidalia/help/content/validate.log"
python "$validate_script" -i "$file" -l "$validate_log"
# Get the basename of the file we are dealing with.
diff --git a/src/vidalia/help/content/ru/index.html b/src/vidalia/help/content/ru/index.html
index 17aec54..dfafef5 100644
--- a/src/vidalia/help/content/ru/index.html
+++ b/src/vidalia/help/content/ru/index.html
@@ -18,7 +18,7 @@
<hr />
<p>
-Выберите раздел помощи из дерева слева или используйте кнопку \"Поиск\" (над
+Выберите раздел помощи из дерева слева или используйте кнопку "Поиск" (над
списком разделов) для поиска во всех доступных разделах сразу.
</p>
diff --git a/src/vidalia/i18n/po/.tx/config b/src/vidalia/i18n/po/.tx/config
index d129db7..2586ea7 100644
--- a/src/vidalia/i18n/po/.tx/config
+++ b/src/vidalia/i18n/po/.tx/config
@@ -1,4 +1,4 @@
-[torproject.3-vidalia-alpha-vidalia-pot]
+[torproject.1-vidalia-vidalia-pot]
source_file = templates/vidalia.pot
source_lang = en
trans.af = af/vidalia_af.po
@@ -124,3 +124,126 @@ trans.zu = zu/vidalia_zu.po
[main]
host = https://www.transifex.net
+
+[torproject.1-vidalia-qt-pot]
+source_file = templates/qt.pot
+source_lang = en
+trans.af = af/qt_af.po
+trans.ak = ak/qt_ak.po
+trans.am = am/qt_am.po
+trans.ar = ar/qt_ar.po
+trans.arn = arn/qt_arn.po
+trans.ast = ast/qt_ast.po
+trans.az = az/qt_az.po
+trans.be = be/qt_be.po
+trans.bg = bg/qt_bg.po
+trans.bn = bn/qt_bn.po
+trans.bn_IN = bn_IN/qt_bn_IN.po
+trans.bo = bo/qt_bo.po
+trans.br = br/qt_br.po
+trans.bs = bs/qt_bs.po
+trans.ca = ca/qt_ca.po
+trans.cs = cs/qt_cs.po
+trans.csb = csb/qt_csb.po
+trans.cy = cy/qt_cy.po
+trans.da = da/qt_da.po
+trans.de = de/qt_de.po
+trans.de_CH = de_CH/qt_de_CH.po
+trans.de_DE = de_DE/qt_de_DE.po
+trans.dz = dz/qt_dz.po
+trans.el = el/qt_el.po
+trans.eo = eo/qt_eo.po
+trans.es = es/qt_es.po
+trans.et = et/qt_et.po
+trans.eu = eu/qt_eu.po
+trans.fa = fa/qt_fa.po
+trans.fi = fi/qt_fi.po
+trans.fil = fil/qt_fil.po
+trans.fo = fo/qt_fo.po
+trans.fr = fr/qt_fr.po
+trans.fur = fur/qt_fur.po
+trans.fy = fy/qt_fy.po
+trans.ga = ga/qt_ga.po
+trans.gl = gl/qt_gl.po
+trans.gu = gu/qt_gu.po
+trans.gun = gun/qt_gun.po
+trans.ha = ha/qt_ha.po
+trans.he = he/qt_he.po
+trans.hi = hi/qt_hi.po
+trans.hr = hr/qt_hr.po
+trans.ht = ht/qt_ht.po
+trans.hu = hu/qt_hu.po
+trans.hy = hy/qt_hy.po
+trans.id = id/qt_id.po
+trans.is = is/qt_is.po
+trans.it = it/qt_it.po
+trans.ja = ja/qt_ja.po
+trans.jv = jv/qt_jv.po
+trans.ka = ka/qt_ka.po
+trans.km = km/qt_km.po
+trans.kn = kn/qt_kn.po
+trans.ko = ko/qt_ko.po
+trans.ku = ku/qt_ku.po
+trans.kw = kw/qt_kw.po
+trans.ky = ky/qt_ky.po
+trans.lb = lb/qt_lb.po
+trans.ln = ln/qt_ln.po
+trans.lo = lo/qt_lo.po
+trans.lt = lt/qt_lt.po
+trans.lv = lv/qt_lv.po
+trans.mg = mg/qt_mg.po
+trans.mi = mi/qt_mi.po
+trans.mk = mk/qt_mk.po
+trans.ml = ml/qt_ml.po
+trans.mn = mn/qt_mn.po
+trans.mr = mr/qt_mr.po
+trans.ms = ms/qt_ms.po
+trans.mt = mt/qt_mt.po
+trans.my = my/qt_my.po
+trans.nah = nah/qt_nah.po
+trans.nap = nap/qt_nap.po
+trans.nb = nb/qt_nb.po
+trans.ne = ne/qt_ne.po
+trans.nl = nl/qt_nl.po
+trans.nn = nn/qt_nn.po
+trans.nso = nso/qt_nso.po
+trans.oc = oc/qt_oc.po
+trans.or = or/qt_or.po
+trans.pa = pa/qt_pa.po
+trans.pap = pap/qt_pap.po
+trans.pl = pl/qt_pl.po
+trans.pms = pms/qt_pms.po
+trans.ps = ps/qt_ps.po
+trans.pt = pt/qt_pt.po
+trans.pt_BR = pt_BR/qt_pt_BR.po
+trans.ro = ro/qt_ro.po
+trans.ru = ru/qt_ru.po
+trans.sco = sco/qt_sco.po
+trans.sk = sk/qt_sk.po
+trans.sl = sl/qt_sl.po
+trans.so = so/qt_so.po
+trans.son = son/qt_son.po
+trans.sq = sq/qt_sq.po
+trans.sr = sr/qt_sr.po
+trans.st = st/qt_st.po
+trans.su = su/qt_su.po
+trans.sv = sv/qt_sv.po
+trans.sw = sw/qt_sw.po
+trans.ta = ta/qt_ta.po
+trans.te = te/qt_te.po
+trans.tg = tg/qt_tg.po
+trans.th = th/qt_th.po
+trans.ti = ti/qt_ti.po
+trans.tk = tk/qt_tk.po
+trans.tr = tr/qt_tr.po
+trans.uk = uk/qt_uk.po
+trans.ur = ur/qt_ur.po
+trans.ve = ve/qt_ve.po
+trans.vi = vi/qt_vi.po
+trans.wa = wa/qt_wa.po
+trans.wo = wo/qt_wo.po
+trans.zh_CN = zh_CN/qt_zh_CN.po
+trans.zh_HK = zh_HK/qt_zh_HK.po
+trans.zh_TW = zh_TW/qt_zh_TW.po
+trans.zu = zu/qt_zu.po
+
diff --git a/src/vidalia/i18n/po/af/vidalia_af.po b/src/vidalia/i18n/po/af/vidalia_af.po
index 6b31647..df5ee68 100755
--- a/src/vidalia/i18n/po/af/vidalia_af.po
+++ b/src/vidalia/i18n/po/af/vidalia_af.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ak/vidalia_ak.po b/src/vidalia/i18n/po/ak/vidalia_ak.po
index 020ac5e..d84aacd 100644
--- a/src/vidalia/i18n/po/ak/vidalia_ak.po
+++ b/src/vidalia/i18n/po/ak/vidalia_ak.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/am/vidalia_am.po b/src/vidalia/i18n/po/am/vidalia_am.po
index 2f64a87..845e243 100644
--- a/src/vidalia/i18n/po/am/vidalia_am.po
+++ b/src/vidalia/i18n/po/am/vidalia_am.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ar/vidalia_ar.po b/src/vidalia/i18n/po/ar/vidalia_ar.po
index 7c9d2a7..a81a39c 100644
--- a/src/vidalia/i18n/po/ar/vidalia_ar.po
+++ b/src/vidalia/i18n/po/ar/vidalia_ar.po
@@ -1,11 +1,14 @@
#
+# OsamaK <osamak at gnu.org>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
+# mohammad Alhargan <malham1 at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:26+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: imksa <malham1 at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -234,6 +237,10 @@ msgid "Show Settings"
msgstr "أظهر الإعدادات"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "استخدام تور لعرض النطاق"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "أعد الضبط"
@@ -273,10 +280,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ألغِ"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "بدء طلب جسر HTTPS..."
@@ -430,27 +433,19 @@ msgid "Control socket is not connected."
msgstr "مقبس التحكم غير متصل."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "كلمة السر مطلوبة"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "تذكر كلمة السر"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"اتصل ڤيداليا بعملية تور جارية تتطلب كلمة سر. يرجى أن تدخل كلمة سر التحكم:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1345,6 +1340,10 @@ msgid "Browse"
msgstr "تصفّح"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "ابدأ عمل برمجية تور مع بدء تشغيل ڤيداليا"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "تور"
@@ -1372,10 +1371,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "التمس الآن"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 ك.ب/ثا"
@@ -1662,6 +1657,34 @@ msgid "New Identity"
msgstr "هوية جديدة"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "تور"
@@ -1670,6 +1693,10 @@ msgid "View"
msgstr "اعرض"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "مساعدة ڤيداليا"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "خطأ في إطلاق متصفح الإنترنت"
@@ -1782,6 +1809,10 @@ msgid "Tor is shutting down"
msgstr "جارٍ إغلاق تور"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "أوقف تور الآن"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "أوقف تور"
@@ -1870,6 +1901,18 @@ msgstr ""
"غير متوفرة."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "خطأ في المصادقة"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "لم يتمكن ڤيداليا من المصادقة مع برنامج تور. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "يرجى التحقق من إعدادات مصادقة مدخل التحكم الخاص بك."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "يتوفر تحديث لتور"
@@ -1912,11 +1955,85 @@ msgid "Status"
msgstr "الحالة"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "اختصارات ڤيداليا"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "أعدَّ التحويل\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "أعدَّ تحويلة وساعد الشبكة على النمو"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "اعرض الشبكة"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "شاهد خريطة شبكة تور"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "استخدم هوية جديدة"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "اجعل الاتصالات اللاحقة تبدو كأنها جديدة"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "اعرض مدى استخدام عرض الحزمة مؤخراً"
+
+msgctxt "MainWindow"
+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 "النسخة المنصبة حالياً من تور قديمة أو لا يوصى بها بعد الآن."
@@ -1976,32 +2093,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "فشل (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"جار إيقاف تحويلتك.\n"
+"يرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
msgctxt "MainWindow"
msgid ""
@@ -2024,16 +2125,6 @@ msgstr ""
"يرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "فشل (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr "، غالباً Telnet، "
@@ -2041,22 +2132,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr "، غالباً عميل بريد إلكتروني، "
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"جار إيقاف تحويلتك.\n"
-"يرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "عُطل في ضبط المُرشِّح"
@@ -2310,12 +2385,20 @@ msgid "Automatically save new log messages to a file"
msgstr "احفظ رسائل السجِّل الجديدة في ملف تلقائيًا"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "احفظ رسائل السِّجل الجديدة دائما"
+msgid "Basic"
+msgstr "الأساسية"
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "حالة تور"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "متقدم"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "احفظ رسائل السِّجل الجديدة دائما"
msgctxt "MessageLog"
msgid ""
@@ -2372,6 +2455,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "خريطة شبكة تور"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "تحديث"
@@ -2471,22 +2558,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "جسر عاطل"
@@ -2820,6 +2891,10 @@ msgid "Run as a client only"
msgstr "تشغيل كعميل فقط."
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "تمرير تدفقات شبكة تور"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "مدخل التحويلة:"
@@ -3074,14 +3149,6 @@ msgid "Automatically distribute my bridge address"
msgstr "انشر عنوان الجسر الخاص بي تلقائيا"
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "عكس (mirror) دليل التحويلات"
@@ -3130,6 +3197,10 @@ msgid "Directory already in use by another service."
msgstr "الدليل مستعمل بشكل مسبق في خدمة أخرى"
msgctxt "ServicePage"
+msgid "Form"
+msgstr "استمارة"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "الخدمات الموفرة المخفية"
@@ -3419,22 +3490,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "جديد"
@@ -3471,12 +3526,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "غير معروف"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "تعذَّر إيقاف العملية %1. [%2]"
@@ -3555,30 +3604,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "نجاح"
@@ -3864,3 +3889,5 @@ msgstr "%1 ساعات"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 دقائق"
+
+
diff --git a/src/vidalia/i18n/po/arn/vidalia_arn.po b/src/vidalia/i18n/po/arn/vidalia_arn.po
index 5e975be..49acc44 100644
--- a/src/vidalia/i18n/po/arn/vidalia_arn.po
+++ b/src/vidalia/i18n/po/arn/vidalia_arn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ast/vidalia_ast.po b/src/vidalia/i18n/po/ast/vidalia_ast.po
index b93bc21..1ce565f 100644
--- a/src/vidalia/i18n/po/ast/vidalia_ast.po
+++ b/src/vidalia/i18n/po/ast/vidalia_ast.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:50+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/az/vidalia_az.po b/src/vidalia/i18n/po/az/vidalia_az.po
index f1a9ee6..7f2db5c 100644
--- a/src/vidalia/i18n/po/az/vidalia_az.po
+++ b/src/vidalia/i18n/po/az/vidalia_az.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bg/vidalia_bg.po b/src/vidalia/i18n/po/bg/vidalia_bg.po
index b2b5120..06c806a 100644
--- a/src/vidalia/i18n/po/bg/vidalia_bg.po
+++ b/src/vidalia/i18n/po/bg/vidalia_bg.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:00+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr "Покажи опции"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Използван трафик от Тор"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Ресет"
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отказ"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr "Разлистване"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Тор"
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 КБ/с"
@@ -1655,6 +1647,34 @@ msgid "New Identity"
msgstr "Нова самоличност"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Тор"
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr "Изглед"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Видалиа Помощ"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1859,6 +1887,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1899,11 +1939,82 @@ msgid "Status"
msgstr "Статистика"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+msgctxt "MainWindow"
+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 ""
@@ -1963,31 +2074,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2005,16 +2098,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2022,20 +2105,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Грешка при прилагане на филтър"
@@ -2289,11 +2358,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2336,6 +2413,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Опресни"
@@ -2435,22 +2516,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2776,6 +2841,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Предавай трафик за Тор мрежата"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3020,14 +3089,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3072,6 +3133,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3360,22 +3425,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Нов"
@@ -3412,12 +3461,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Неизвестно"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Процес %1 не успя да спре. [%2]"
@@ -3496,30 +3539,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3798,3 +3817,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
index 8e4e29f..2330eea 100644
--- a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
+++ b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ca/vidalia_ca.po b/src/vidalia/i18n/po/ca/vidalia_ca.po
index fd1a754..9372142 100755
--- a/src/vidalia/i18n/po/ca/vidalia_ca.po
+++ b/src/vidalia/i18n/po/ca/vidalia_ca.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:43+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/cs/vidalia_cs.po b/src/vidalia/i18n/po/cs/vidalia_cs.po
index d2a271c..010ac08 100644
--- a/src/vidalia/i18n/po/cs/vidalia_cs.po
+++ b/src/vidalia/i18n/po/cs/vidalia_cs.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:55+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr "Zobrazit Nastavení"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Resetovat"
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Zrušit"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr "Kontrolni socket neni detekovan"
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Heslo je povinné"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr "Prohlizej"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1655,6 +1647,34 @@ msgid "New Identity"
msgstr "Nova identita"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr "Nahled"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Napoveda Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr "Tor se vypina"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1859,6 +1887,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1899,11 +1939,82 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Zkratky Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Nastav Preposilani\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Pohled na Sit"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Pohled na Mapu Site Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Pouzit Novou Identitu"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Vsechny dalsi pripojeni jako nove"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Dokumentace Napovedy"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Verze a licencni informace"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Ukoncit Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Zobrazuj toto okno pri startu"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Schovat"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Schovat toto okno"
+
+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 ""
@@ -1963,31 +2074,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2005,16 +2098,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2022,20 +2105,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Chyba Nastaveni Filtru"
@@ -2289,14 +2358,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Automaticky uloz nove oznameni do souboru"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Vzdy Ukladat Nove Oznameni"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Vzdy Ukladat Nove Oznameni"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2336,6 +2413,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Aktualizace"
@@ -2435,22 +2516,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2776,6 +2841,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Prenos dat pro sit Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3026,14 +3095,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3078,6 +3139,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3366,22 +3431,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Nove"
@@ -3418,12 +3467,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Nezname"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Zastaveni procesu %1 selhalo. [%2]"
@@ -3502,30 +3545,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3804,3 +3823,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/csb/vidalia_csb.po b/src/vidalia/i18n/po/csb/vidalia_csb.po
index 0b40a42..4d94dae 100644
--- a/src/vidalia/i18n/po/csb/vidalia_csb.po
+++ b/src/vidalia/i18n/po/csb/vidalia_csb.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:50+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/cy/vidalia_cy.po b/src/vidalia/i18n/po/cy/vidalia_cy.po
index eecb6cd..442d953 100644
--- a/src/vidalia/i18n/po/cy/vidalia_cy.po
+++ b/src/vidalia/i18n/po/cy/vidalia_cy.po
@@ -1,11 +1,12 @@
#
+# cymro <markives at hotmail.co.uk>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: cymro <markives at hotmail.co.uk>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,23 +17,23 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr ""
+msgstr "Amdan Vidalia"
msgctxt "AboutDialog"
msgid "License"
-msgstr ""
+msgstr "Trwydded"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr ""
+msgstr "Vidalia 0.2.0"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "Tor 0.2.0.32"
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr ""
+msgstr "Qt 4.4.2"
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
@@ -49,7 +50,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr ""
+msgstr "Ffeil heb ei darganfod"
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
@@ -85,11 +86,11 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr ""
+msgstr "Cyfeiriad:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr ""
+msgstr "Dim"
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -97,7 +98,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr ""
+msgstr "Cyfrinair"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
@@ -105,7 +106,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ""
+msgstr ":"
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
@@ -208,7 +209,7 @@ msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr ""
+msgstr "Steil"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
@@ -220,14 +221,18 @@ msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr ""
+msgstr "Ers:"
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr ""
+msgstr "Cyddiwch Gosodiadau"
msgctxt "BandwidthGraph"
msgid "Show Settings"
+msgstr "Dangos Gosodiadau"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
msgstr ""
msgctxt "BandwidthGraph"
@@ -264,15 +269,11 @@ msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr ""
+msgstr "Cadw"
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr ""
-
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
+msgstr "Canslo"
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -487,679 +479,679 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
msgctxt "CountryInfo"
msgid "Australia"
-msgstr ""
+msgstr "Awstralia"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaijan"
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr ""
+msgstr "Belarws"
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr ""
+msgstr "Gwlad Belg"
msgctxt "CountryInfo"
msgid "Belize"
-msgstr ""
+msgstr "Belize"
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Bosnia a Herzegovina"
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr ""
+msgstr "Bwlgaria"
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr ""
+msgstr "Bwrwndi"
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr ""
+msgstr "Cambodia"
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr ""
+msgstr "Camerŵn"
msgctxt "CountryInfo"
msgid "Canada"
-msgstr ""
+msgstr "Canada"
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr ""
+msgstr "Cape Verde"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr ""
+msgstr "Gweriniaeth Canolbarth Affrica"
msgctxt "CountryInfo"
msgid "Chad"
-msgstr ""
+msgstr "Chad"
msgctxt "CountryInfo"
msgid "Chile"
-msgstr ""
+msgstr "Chile"
msgctxt "CountryInfo"
msgid "China"
-msgstr ""
+msgstr "China"
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr ""
+msgstr "Colombia"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr ""
+msgstr "Comoros"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Congo, Gweriniaeth Ddemocrataidd y"
msgctxt "CountryInfo"
msgid "Congo"
-msgstr ""
+msgstr "Congo"
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr ""
+msgstr "Cote da Ivoire"
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr ""
+msgstr "Croatia"
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr ""
+msgstr "Cyprus"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr ""
+msgstr "Gweriniaeth Tsiec"
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr ""
+msgstr "Denmarc"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr ""
+msgstr "Gweriniaeth Dominica"
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr ""
+msgstr "Yr Aifft"
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guinea Gyhydeddol"
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
msgctxt "CountryInfo"
msgid "France"
-msgstr ""
+msgstr "Ffrainc"
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
msgctxt "CountryInfo"
msgid "Germany"
-msgstr ""
+msgstr "Yr Almaen"
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
msgctxt "CountryInfo"
msgid "Israel"
-msgstr ""
+msgstr "Israel"
msgctxt "CountryInfo"
msgid "Italy"
-msgstr ""
+msgstr "Yr Eidal"
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
msgctxt "CountryInfo"
msgid "Japan"
-msgstr ""
+msgstr "Japan"
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr ""
+msgstr "Jordan"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kyrgyzstan"
msgctxt "CountryInfo"
msgid "Laos"
-msgstr ""
+msgstr "Laos"
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr ""
+msgstr "Latfia"
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr ""
+msgstr "Lebanon"
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr ""
+msgstr "Lithwania"
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr ""
+msgstr "Lwcsembwrg"
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr ""
+msgstr "Macedonia"
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr ""
+msgstr "Mali"
msgctxt "CountryInfo"
msgid "Malta"
-msgstr ""
+msgstr "Malta"
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr ""
+msgstr "Ynysoedd Marshall"
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr ""
+msgstr "Micronesia"
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr ""
+msgstr "Moldova"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr ""
+msgstr "Moroco"
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr ""
+msgstr "Mozambique"
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr ""
+msgstr "Iseldiroedd"
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr ""
+msgstr "Seland Newydd"
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
msgctxt "CountryInfo"
msgid "Niger"
-msgstr ""
+msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr ""
+msgstr "Norwy"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr ""
+msgstr "Oman"
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr ""
+msgstr "Palau"
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr ""
+msgstr "Palesteina"
msgctxt "CountryInfo"
msgid "Panama"
-msgstr ""
+msgstr "Panama"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Guinea Newydd"
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
msgctxt "CountryInfo"
msgid "Peru"
-msgstr ""
+msgstr "Periw"
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr ""
+msgstr "Philippines"
msgctxt "CountryInfo"
msgid "Poland"
-msgstr ""
+msgstr "Gwlad Pwyl"
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr ""
+msgstr "Portiwgal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
msgctxt "CountryInfo"
msgid "Romania"
-msgstr ""
+msgstr "Rwmania"
msgctxt "CountryInfo"
msgid "Russia"
-msgstr ""
+msgstr "Rwsia"
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "Saint Kitts a Nevis"
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "Saint Vincent a'r Grenadines"
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "Sao Tome a Principe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi Arabia"
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr ""
+msgstr "Serbia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr ""
+msgstr "Slofacia"
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr ""
+msgstr "Slofenia"
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr ""
+msgstr "Ynysoedd Solomon"
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr ""
+msgstr "De Affrica"
msgctxt "CountryInfo"
msgid "Spain"
-msgstr ""
+msgstr "Sbaen"
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr ""
+msgstr "Sweden"
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr ""
+msgstr "Swistir"
msgctxt "CountryInfo"
msgid "Syria"
-msgstr ""
+msgstr "Syria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr ""
+msgstr "Tanzania"
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr ""
+msgstr "Gwlad Thai"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "Timor-Leste (Dwyrain Timor)"
msgctxt "CountryInfo"
msgid "Togo"
-msgstr ""
+msgstr "Togo"
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "Trinidad a Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr ""
+msgstr "Twrci"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr ""
+msgstr "Twfalw"
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr ""
+msgstr "Wcráin"
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emiradau Arabaidd Unedig"
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr ""
+msgstr "Y Deyrnas Unedig"
msgctxt "CountryInfo"
msgid "United States"
-msgstr ""
+msgstr "Unol Daleithiau"
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr ""
+msgstr "Fatican"
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr ""
+msgstr "Gorllewin Sahara"
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1167,99 +1159,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr ""
+msgstr "Albania"
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
msgctxt "CountryInfo"
msgid "Austria"
-msgstr ""
+msgstr "Awstria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
msgctxt "CountryInfo"
msgid "Benin"
-msgstr ""
+msgstr "Benin"
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr ""
+msgstr "Ethiopia"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
-msgstr ""
+msgstr "Ffindir"
msgctxt "CountryInfo"
msgid "Greece"
-msgstr ""
+msgstr "Gwlad Groeg"
msgctxt "CountryInfo"
msgid "Guam"
-msgstr ""
+msgstr "Guam"
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr ""
+msgstr "Hwngari"
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr ""
+msgstr "Gwlad yr Iâ"
msgctxt "CountryInfo"
msgid "India"
-msgstr ""
+msgstr "India"
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
msgctxt "CountryInfo"
msgid "Iran"
-msgstr ""
+msgstr "Iran"
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr ""
+msgstr "Irac"
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr ""
+msgstr "Iwerddon"
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr ""
+msgstr "Korea, North"
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr ""
+msgstr "Korea, De"
msgctxt "CountryInfo"
msgid "Libya"
-msgstr ""
+msgstr "Libya"
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr ""
+msgstr "Maldives"
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1339,11 +1331,15 @@ msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
+msgstr "Pori"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr ""
+msgstr "Tor"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1419,7 +1411,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr ""
+msgstr "Help Vidalia"
msgctxt "HelpBrowser"
msgid "Back"
@@ -1435,7 +1427,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr ""
+msgstr "Ymlaen"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
@@ -1655,6 +1647,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1885,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1937,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2076,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2356,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2411,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2514,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2839,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3087,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3131,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3423,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3459,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3444,23 +3487,23 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Torri"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Copi"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Gludo"
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr ""
+msgstr "Dadwneud"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr ""
+msgstr "Ail-wneud"
msgctxt "TorrcDialog"
msgid "Select All"
@@ -3488,36 +3531,12 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Gwall"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3815,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/de/vidalia_de.po b/src/vidalia/i18n/po/de/vidalia_de.po
index a50ab61..cec5781 100644
--- a/src/vidalia/i18n/po/de/vidalia_de.po
+++ b/src/vidalia/i18n/po/de/vidalia_de.po
@@ -1,10 +1,14 @@
#
+# bastik <bastik.tor at googlemail.com>, 2011.
+# cosimacosa <leccefv at libero.it>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
+# Hendrik Richter <hendrikr at gnome.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:58+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -245,6 +249,10 @@ msgid "Show Settings"
msgstr "Zeige Einstellungen"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Bandbreitennutzung von Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Zurücksetzen"
@@ -284,10 +292,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Abbrechen"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Starte HTTPS-Anfrage..."
@@ -442,27 +446,20 @@ msgid "Control socket is not connected."
msgstr "Kontrollsocket ist nicht verbunden."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Password wird benötigt"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Mein Passwort speichern"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia hat sich zu einem laufenden Tor-Prozess verbunden, der ein Passwort "
+"benötigt. Bitte gib das Kontroll-Passwort ein:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1366,6 +1363,10 @@ msgid "Browse"
msgstr "Durchsuchen"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Tor starten, wenn Vidalia startet"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1393,10 +1394,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Jetzt prüfen"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1684,6 +1681,34 @@ msgid "New Identity"
msgstr "Neue Identität"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Strg+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Strg+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Strg+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Strg+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Strg+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Strg+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Strg+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1692,6 +1717,10 @@ msgid "View"
msgstr "Ansicht"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia-Hilfe"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Fehler beim Starten des Webbrowsers"
@@ -1804,6 +1833,10 @@ msgid "Tor is shutting down"
msgstr "Tor wird beendet"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Tor jetzt stoppen"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor stoppen"
@@ -1893,6 +1926,21 @@ msgstr ""
"Vidalias Funktionen könnten nicht verfügbar sein."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Authentifizierungsfehler"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+"Vidalia konnte keine Authentifizierung gegenüber der Tor-Software "
+"durchführen. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"Bitte überprüfen Sie die Authentifikationseinstellungen des Kontroll-Ports."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-Update verfügbar"
@@ -1937,11 +1985,85 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Schnellzugriff"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Weiterleitung einrichten\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Richten Sie ein Relay ein und helfen Sie dem Netzwerk zu wachsen."
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Netzwerk betrachten"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Die Tor Netzwerk-Landkarte betrachten"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Eine neue Identität verwenden"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Spätere Verbindungen als neu erscheinen lassen"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Betrachte kürzlich genutzte Bandbreite"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Logbuch betrachten"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Hilfe anzeigen"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Vidalia konfigurieren"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Version und Lizenzinformationen anzeigen"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Vidalia beenden"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Dieses Fenster beim Start anzeigen"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Verstecken"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Dieses Fenster verstecken"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Zurücksetzen des Passworts fehlgeschlagen"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia versuchte das Tor Kontroll-Passwort zurückzusetzen, konnte die Tor "
+"Software aber nicht neu starten. Bitte überprüfen Sie im Task Manager, ob "
+"nicht andere Tor Prozesse laufen."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2012,32 +2134,16 @@ msgstr ""
"wenn möglich nur verschlüsselte Protokolle wie SSL. "
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "fehlgeschlagen (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Ihr Relais wird beendet.\n"
+"Klicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
msgctxt "MainWindow"
msgid ""
@@ -2060,16 +2166,6 @@ msgstr ""
"Bitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fehlgeschlagen (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", wahrscheinlich Telnet,"
@@ -2077,22 +2173,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", wahrscheinlich ein E-Mail-Programm,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Ihr Relais wird beendet.\n"
-"Klicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Fehler beim Setzen des Filters"
@@ -2348,12 +2428,20 @@ msgid "Automatically save new log messages to a file"
msgstr "Alle neuen Nachrichten automatisch in einer Datei speichern"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Nachrichten immer speichern"
+msgid "Basic"
+msgstr "Einfach "
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "Tor Status"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Nachrichten immer speichern"
msgctxt "MessageLog"
msgid ""
@@ -2408,6 +2496,10 @@ msgstr ""
"%2"
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor-Netzwerk-Karte"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Aktualisieren"
@@ -2507,22 +2599,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Strg+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ungültige Brücke"
@@ -2866,6 +2942,10 @@ msgid "Run as a client only"
msgstr "Benutze Tor nur als Client"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Verkehr für das Tor-Netzwerk weiterleiten"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Verteiler-Port:"
@@ -3132,14 +3212,6 @@ msgid "Automatically distribute my bridge address"
msgstr "Meine Bridge-Adresse automatisch verteilen"
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Spiegele das Relay Verzeichnis"
@@ -3191,6 +3263,10 @@ msgid "Directory already in use by another service."
msgstr "Das Verzeichnis wird bereits von einem anderen Dienst benutzt."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formular"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Versteckte Dienste"
@@ -3312,7 +3388,7 @@ msgid ""
msgstr ""
"Die Tor-Software hat einen internen Fehler entdeckt. Bitte informieren Sie "
"die Tor-Entwickler über die folgendene Fehlermeldung via "
-"bugs.torproject.org: \"%1\""
+"bugs.torproject.org: \"%1\"\n"
msgctxt "StatusEventWidget"
msgid ""
@@ -3554,22 +3630,6 @@ msgstr ""
"\"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. "
"Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Neu"
@@ -3606,12 +3666,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Unbekannt"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Prozess %1 wurde nicht gestoppt. [%2]"
@@ -3694,30 +3748,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr "Beim Öffnen der torrc Datei ist ein Fehler aufgetreten"
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Erfolgreich"
@@ -4005,3 +4035,5 @@ msgstr "%1 Stunden"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 Minuten"
+
+
diff --git a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
index 24c54be..9928779 100755
--- a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
+++ b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/dz/vidalia_dz.po b/src/vidalia/i18n/po/dz/vidalia_dz.po
index 3cefc2a..d61f97d 100644
--- a/src/vidalia/i18n/po/dz/vidalia_dz.po
+++ b/src/vidalia/i18n/po/dz/vidalia_dz.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:46+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/el/vidalia_el.po b/src/vidalia/i18n/po/el/vidalia_el.po
index 9ff85b3..0477718 100755
--- a/src/vidalia/i18n/po/el/vidalia_el.po
+++ b/src/vidalia/i18n/po/el/vidalia_el.po
@@ -1,11 +1,14 @@
#
+# <smartmediagr at gmail.com>, 2011.
+# Γιάννης <yannanth at gmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:00+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-05 08:19+0000\n"
+"Last-Translator: smartmedia <smartmediagr at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -234,6 +237,10 @@ msgid "Show Settings"
msgstr "Εμφάνιση ρυθμίσεων"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Χρήση Ευρούς Ζώνης Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Μηδενισμός"
@@ -273,10 +280,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Άκυρο"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -430,26 +433,17 @@ msgid "Control socket is not connected."
msgstr "Η υποδοχή ελέγχου δεν είναι συνδεδεμένη."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Απαιτείται κωδικός"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Απομνημόνευση Κωδικού"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1347,6 +1341,10 @@ msgid "Browse"
msgstr "Περιήγηση"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Εκκίνηση του λογισμικού Tor όταν εκκινεί το Vidalia"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1375,10 +1373,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Έλεγχος Τώρα"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1667,6 +1661,34 @@ msgid "New Identity"
msgstr "Νέα Ταυτότητα"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1675,6 +1697,10 @@ msgid "View"
msgstr "Εμφάνιση"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Βοήθεια για το Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Σφάλμα κατά την εκκίνηση του περιηγητή ιστού"
@@ -1790,6 +1816,10 @@ msgid "Tor is shutting down"
msgstr "Το Tor τερματίζει"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Διακοπή του Tor Τώρα"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Διακοπή Tor"
@@ -1878,6 +1908,18 @@ msgstr ""
"του Vidalia ίσως δεν είναι διαθέσιμες."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Σφάλμα Επαλήθευσης"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Το Vidalia δεν μπόρεσε να εξακριβώσει το λογισμικό Tor . (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Ελέγξτε τις ρυθμίσεις ελέγχου της θύρα εξακρίβωσης."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Υπάρχει διαθέσιμη ενημέρωση για το Tor"
@@ -1922,11 +1964,86 @@ msgid "Status"
msgstr "Κατάσταση"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Συντομεύσεις πληκτρολογίου για το Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Εγκατάσταση/Ρύθμιση Ενδιάμεσου\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Ρυθμίστε έναν ενδιάμεσο και βοηθήστε στην ανάπτυξη του δικτύου."
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Εμφάνιση του Δικτύου"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Εμφάνιση ενός χάρτη του δικτύου Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Χρήση Νέας Ταυτότητας"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Οι επόμενες συνδέσεις να εμφανίζονται νέες"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Εμφάνιση πρόσφατης χρήσης του εύρους ζώνης"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Εμφάνιση του ιστορικού καταγραφών μηνυμάτων"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Εμφάνιση βοηθητικής τεκμηρίωσης"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Ρύθμιση του Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Εμφάνιση της έκδοσης και αδειοδοτικών πληροφοριών"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Έξοδος του Vidalia"
+
+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 ""
+"Το Vidalia προσπάθησε να επαναφέρει τον αρχικό κωδικό για τις ρυθμίσεις του "
+"Tor, αλλά δεν μπόρεσε να επανεκκινήσει το Tor. Παρακαλούμε ελέγξτε στη "
+"διαχείριση εργασιών του συστήματος ότι δεν εκτελείται κάποια άλλη υπηρεσία "
+"του Tor."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1986,31 +2103,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2028,16 +2127,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2045,20 +2134,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Φίλτρο Ρύθμισης Λαθών"
@@ -2323,14 +2398,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Αυτόματη αποθήκευση νέων μηνυμάτων καταγραφής σε αρχείο"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Πάντα να αποθηκεύεις τα νέα αρχεία καταγραφής μηνυμάτων"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+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."
@@ -2370,6 +2453,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Χάρτης δικτύου Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ανανέωση"
@@ -2469,22 +2556,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Μη έγκυρη γέφυρα"
@@ -2831,6 +2902,10 @@ msgid "Run as a client only"
msgstr "Εκτέλεση μόνο σαν πελάτης"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Αναμετάδωσε κίνηση για το δίκτυο του Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Θύρα σταθμού:"
@@ -3093,14 +3168,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3153,6 +3220,10 @@ msgid "Directory already in use by another service."
msgstr "Ο φάκελος χρησιμοποιήτε ήδη από άλλη υπηρεσία."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Φόρμα"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Παρεχόμενες κρυφές υπηρεσίες"
@@ -3281,7 +3352,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Το ρολόϊ του Υπολογιστή σας είναι δυνητικά λανθασμένο"
msgctxt "StatusEventWidget"
msgid ""
@@ -3445,22 +3516,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Νέο"
@@ -3497,12 +3552,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Άγνωστο"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Η διεργασία %1 απέτυχε να σταματήσει. [%2]"
@@ -3531,15 +3580,15 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Αποκοπή"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Αντιγραφή"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Επικόλληση"
msgctxt "TorrcDialog"
msgid "Undo"
@@ -3551,7 +3600,7 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Επιλογή όλων"
msgctxt "TorrcDialog"
msgid "Apply all"
@@ -3568,42 +3617,20 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
+"Η επιλογή είναι άδεια. Παρακαλώ επιλέξτε κάποιο κείμενο, ή τσεκάρετε \"Apply"
+" all\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Λάθος στη γραμμή %1: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Λάθος"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
+msgstr "Παρουσιάστηκε σφάλμα κατά το άνοιγμα του torrc αρχείου"
msgctxt "UPNPControl"
msgid "Success"
@@ -3737,11 +3764,11 @@ msgstr "Έκδοση"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "Αποστολή αναφοράς λαθών."
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "Αδυναμία αποστολής αναφοράς %1"
msgctxt "VMessageBox"
msgid "OK"
@@ -3891,3 +3918,5 @@ msgstr "%1 ώρες"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 λεπτά"
+
+
diff --git a/src/vidalia/i18n/po/eo/vidalia_eo.po b/src/vidalia/i18n/po/eo/vidalia_eo.po
index 46c3c0a..1f641af 100644
--- a/src/vidalia/i18n/po/eo/vidalia_eo.po
+++ b/src/vidalia/i18n/po/eo/vidalia_eo.po
@@ -1,11 +1,12 @@
#
+# identity <eeemsi at googlemail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:00+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: identity <eeemsi at googlemail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -234,6 +235,10 @@ msgid "Show Settings"
msgstr "Montri agordojn "
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor-bendlarĝuzado"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Rekomencigo"
@@ -273,10 +278,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Rezigni"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Lanĉante HTTPS-pontopeto..."
@@ -430,27 +431,20 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Pasvorto nepras"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Memori mian pasvorton"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia konektis al Tor-proceso kiu bezonas pasvorton.\n"
+"Bonvolu entajpi vian stirpasvorton:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1345,6 +1339,10 @@ msgid "Browse"
msgstr "Foliumi"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Komenci la Tor-programaro kiam Vidalia komencas"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1372,10 +1370,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Kontroli Nun"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1663,6 +1657,34 @@ msgid "New Identity"
msgstr "Nova idento"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ktrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ktrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ktrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ktrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ktrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ktrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ktrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1671,6 +1693,10 @@ msgid "View"
msgstr "Rigardi"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia Helpo"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Eraro lanĉante foliumilon"
@@ -1783,6 +1809,10 @@ msgid "Tor is shutting down"
msgstr "Tor ĉesantas"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Haltigi Tor-n nun"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Haltigi Tor-n"
@@ -1871,6 +1901,18 @@ msgstr ""
"povas esti neuzeblaj."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Aŭtentigeraro"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-ĝisdatigo disponebla"
@@ -1911,11 +1953,82 @@ msgid "Status"
msgstr "Stato"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia fulmbildetoj"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Agordu relajsadon\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Rigardi la reton"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Rigardi mapon de la Tor-reto"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Uzi novan identon"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Rigardi lastatempan bendlarĝuzadon"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Rigardi protokolmesaĝhistorion"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Rigardi helpdokumentadon"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Agordi Vidalia-n"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Rigardi versian kaj permesilan informon"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Forlasi Vidalia-n"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Montri ĉi tiun fenestron dum komencado"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Kaŝi"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Kaŝi ĉi tiun fenestron"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Pasvortreagordo fiaskis"
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 ""
@@ -1975,31 +2088,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "fiaskis (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2017,16 +2112,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fiaskis (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", eble Telnet,"
@@ -2034,20 +2119,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", eble retpoŝtkliento,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Eraro dum filtrilagordado"
@@ -2301,11 +2372,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2348,6 +2427,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2447,22 +2530,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2788,6 +2855,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3032,14 +3103,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3084,6 +3147,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3372,22 +3439,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3424,12 +3475,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3508,30 +3553,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3810,3 +3831,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/es/vidalia_es.po b/src/vidalia/i18n/po/es/vidalia_es.po
index ee4f797..ffb616c 100644
--- a/src/vidalia/i18n/po/es/vidalia_es.po
+++ b/src/vidalia/i18n/po/es/vidalia_es.po
@@ -1,11 +1,14 @@
#
+# <santiagotorresarias at hotmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
+# Daniel Franganillo <dfranganillo at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:39+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: Rawropodus <santiagotorresarias at hotmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -139,59 +142,65 @@ msgstr "Seleccione el directorio que se usará para almacenar los datos de Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr ""
+msgstr "Control de Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "Utilizar una conexión TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr ""
+msgstr "Dirección:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Utilizar un socket de dominio de Unix (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr ""
+msgstr "Editar el torrc actual"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "NOTA: esto editará el torrc cargado en este momento"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "No existe la dirección de ControlSocket"
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
+"La ubicación del archivo de configuración de tor contiene caracteres que no "
+"pueden ser representados en la codificación de caracteres de 8 bits "
+"utilizada por tu sistema."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
+"La ubicacion de la carpeta de datos de Tor contiene caracteres que no pueden"
+" ser representados en la codificación de caracteres de 8 bits utilizada por "
+"tu sistema."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Adveretencia"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "Has camiado la dirección de torrc ¿deseas reiniciar Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Archivo de configuración de Tor (torrc);; Todos los Archivos(*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Elige un archivo para utilizar como dirección de Tor socket"
msgctxt "AdvancedPage"
msgid ""
@@ -236,6 +245,10 @@ msgid "Show Settings"
msgstr "Mostrar Preferencias"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Uso del Ancho de Banda de Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reiniciar"
@@ -275,10 +288,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Iniciando la solicitud de puente HTTPS."
@@ -432,27 +441,20 @@ msgid "Control socket is not connected."
msgstr "Conector de Control no está conectado."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Contraseña requerida"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Recordar mi contraseña"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia se ha conectado a un proceso Tor en funcionamiento que requiere una "
+"contraseña. Introduzca su contraseña de control:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1169,7 +1171,7 @@ msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1269,11 +1271,11 @@ msgstr "Taiwán"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Enviar un reporte de fallo"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "Vidalia encontro un error y debió cerrarse"
msgctxt "CrashReportDialog"
msgid ""
@@ -1282,46 +1284,54 @@ msgid ""
"report does not contain any personally identifying information, but your "
"connection to the crash reporting server may not be anonymous."
msgstr ""
+"Un reporte de fallo ha sido creado y puede ser enviado automaticamente a los"
+" desarrolladores de Vidalia para ayudar a identificar y solucionar el "
+"problema. El reporte no contiene ningún tipo de información personal, pero "
+"tu conexión al servidor de reporte de fallas puede no ser anónima."
msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
msgstr ""
+"Porfavorr describa lo que estaba haciendo antes de que la aplicación fallara"
+" (opcional):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "Enviar mi reporte de fallos a los desarrolladores de Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "Reiniciar vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr ""
+msgstr "No reiniciar"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "No ha sido posible reiniciar Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
+"No fue posible reiniciar Vidalia de manera automática. Por favor reinicie "
+"Vidalia manualmente"
msgctxt "CrashReportUploader"
msgid "Connecting..."
-msgstr ""
+msgstr "Conectando..."
msgctxt "CrashReportUploader"
msgid "Sending crash report..."
-msgstr ""
+msgstr "Enviando reporte de fallos..."
msgctxt "CrashReportUploader"
msgid "Receiving response..."
-msgstr ""
+msgstr "Recibiendo respuesta..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1348,6 +1358,10 @@ msgid "Browse"
msgstr "Examinar"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Iniciar Tor cuando se inicie Vidalia"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1375,10 +1389,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Revisar ahora"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1607,23 +1617,23 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr ""
+msgstr "Aviso"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Advertencia"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Error"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1666,6 +1676,34 @@ msgid "New Identity"
msgstr "Nueva Identidad"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1674,6 +1712,10 @@ msgid "View"
msgstr "Ver"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ayuda de Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Error al iniciar navegador web"
@@ -1786,6 +1828,10 @@ msgid "Tor is shutting down"
msgstr "Tor se esta apagando"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Detener Tor ahora"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Detener Tor"
@@ -1876,6 +1922,20 @@ msgstr ""
"Vidalia pueden no estar disponibles."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Error de Autentificación"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia no pudo autentificarse ante Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"Por favor, verifique la configuración de autentificación de su puerto de "
+"control."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Actualización de Tor Disponible"
@@ -1921,11 +1981,85 @@ msgid "Status"
msgstr "Estado"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Métodos abreviados de Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Configuración de retransmisión\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Configure un repetidor y ayude a que la red crezca"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Ver la Red"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Ver un mapa de la red Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Usar una nueva identidad"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Hacer que las conexiones subsiguientes parezcan nuevas"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Ver el uso reciente del ancho de banda"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Ver el historial de registros de mensajes"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Ver la documentación de la ayuda"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Configurar Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Ver la información de la versión y de la licencia"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Salir de Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Mostrar esta ventana al iniciar"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Ocultar"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ocultar esta ventana"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "No se pudo reiniciar la contraseña"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia trató de reiniciar la contraseña de control de Tor, pero no pudo "
+"reiniciar su software. Verifique su Administrador de Tareas para asegurarse "
+"de que no esté ejecutándose otro proceso de Tor."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1990,34 +2124,21 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
+"Cualquier cosa enviada a través de esta conexión puede ser monitoreada. Por "
+"favor cheque la configuración de su aplicación e utilize protocolos "
+"encriptados, como SSL, si es posible"
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "falló (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Su repetidor se está deteniendo.\n"
+"Haga clic de nuevo en “Detener” para detener ahora su repetidor."
msgctxt "MainWindow"
msgid ""
@@ -2037,16 +2158,6 @@ msgid ""
msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "falló (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr "probablemente Telnet,"
@@ -2054,22 +2165,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", probablemente un cliente de correo electrónico,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Su repetidor se está deteniendo.\n"
-"Haga clic de nuevo en “Detener” para detener ahora su repetidor."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Error configurando filtro"
@@ -2327,12 +2422,20 @@ msgid "Automatically save new log messages to a file"
msgstr "Guardar automáticamente a un archivo los nuevos mensajes del registro"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Guardar siempre nuevos mensajes del registro"
+msgid "Basic"
+msgstr "Basico"
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "Estatus de tor"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Guardar siempre nuevos mensajes del registro"
msgctxt "MessageLog"
msgid ""
@@ -2388,6 +2491,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa de Red de Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Actualizar"
@@ -2487,22 +2594,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Puente no válido"
@@ -2636,31 +2727,31 @@ msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr ""
+msgstr "Dirección"
msgctxt "NetworkPage"
msgid "Type:"
-msgstr ""
+msgstr "Tipo:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr ""
+msgstr "Debes seleccionar un tipo de proxy"
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr ""
+msgstr "HTTP/HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2843,6 +2934,10 @@ msgid "Run as a client only"
msgstr "Ejecutar como sólo cliente"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Repetidor de tráfico para la red Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Puerto repetidor:"
@@ -3097,19 +3192,11 @@ msgstr "<a href=\"#bridgeUsage\">¿Quién ha utilizado mi puente?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">¿Que es esto?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
+msgstr "Distribuir mi dirección de puente automaticamente"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
@@ -3160,6 +3247,10 @@ msgid "Directory already in use by another service."
msgstr "Directorio ya en uso por otro servicio."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formulario"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Provistos Servicios Ocultos"
@@ -3206,19 +3297,19 @@ msgstr "Creado por Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Copiar al portapapeles"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Tor está corriendo"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Usted esta ejecutando las version \"%1\" de Tor"
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Tor no está corriendo"
msgctxt "StatusEventWidget"
msgid ""
@@ -3226,6 +3317,9 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
+"Seleccione \"Iniciar Tor\" en el panel de control de Vidalia para reiniciar "
+"Tor. Si tor se cerró sin inesperadamente, seleccione la pestaña de "
+"\"Avanzado\" para obtener detalles de cualquier error encontrado."
msgctxt "StatusEventWidget"
msgid ""
@@ -3449,22 +3543,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Nuevo"
@@ -3501,12 +3579,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Desconocido"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Proceso %1 no pudo detener [%2]"
@@ -3585,30 +3657,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Éxito"
@@ -3899,3 +3947,5 @@ msgstr "%1 horas"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 min."
+
+
diff --git a/src/vidalia/i18n/po/et/vidalia_et.po b/src/vidalia/i18n/po/et/vidalia_et.po
index baa2cee..270d9d3 100644
--- a/src/vidalia/i18n/po/et/vidalia_et.po
+++ b/src/vidalia/i18n/po/et/vidalia_et.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/eu/vidalia_eu.po b/src/vidalia/i18n/po/eu/vidalia_eu.po
index ea01fd2..733d34c 100755
--- a/src/vidalia/i18n/po/eu/vidalia_eu.po
+++ b/src/vidalia/i18n/po/eu/vidalia_eu.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fil/vidalia_fil.po b/src/vidalia/i18n/po/fil/vidalia_fil.po
index 86a1aec..4c01d38 100644
--- a/src/vidalia/i18n/po/fil/vidalia_fil.po
+++ b/src/vidalia/i18n/po/fil/vidalia_fil.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/fur/vidalia_fur.po b/src/vidalia/i18n/po/fur/vidalia_fur.po
index d98c195..9307aa2 100755
--- a/src/vidalia/i18n/po/fur/vidalia_fur.po
+++ b/src/vidalia/i18n/po/fur/vidalia_fur.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ga/vidalia_ga.po b/src/vidalia/i18n/po/ga/vidalia_ga.po
index fa661c9..92828aa 100644
--- a/src/vidalia/i18n/po/ga/vidalia_ga.po
+++ b/src/vidalia/i18n/po/ga/vidalia_ga.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/gl/vidalia_gl.po b/src/vidalia/i18n/po/gl/vidalia_gl.po
index 8da7090..f23a0ed 100755
--- a/src/vidalia/i18n/po/gl/vidalia_gl.po
+++ b/src/vidalia/i18n/po/gl/vidalia_gl.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/gu/vidalia_gu.po b/src/vidalia/i18n/po/gu/vidalia_gu.po
index 2881e08..174bcbe 100755
--- a/src/vidalia/i18n/po/gu/vidalia_gu.po
+++ b/src/vidalia/i18n/po/gu/vidalia_gu.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:55+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1647,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1885,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1937,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2076,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2356,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2411,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2514,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2839,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3087,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3131,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3423,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3459,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3537,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3815,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/gun/vidalia_gun.po b/src/vidalia/i18n/po/gun/vidalia_gun.po
index 0cdc1ea..bd970e0 100644
--- a/src/vidalia/i18n/po/gun/vidalia_gun.po
+++ b/src/vidalia/i18n/po/gun/vidalia_gun.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ha/vidalia_ha.po b/src/vidalia/i18n/po/ha/vidalia_ha.po
index de68c96..ce91a85 100644
--- a/src/vidalia/i18n/po/ha/vidalia_ha.po
+++ b/src/vidalia/i18n/po/ha/vidalia_ha.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:46+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/he/vidalia_he.po b/src/vidalia/i18n/po/he/vidalia_he.po
index b3bdd80..18d3ae7 100644
--- a/src/vidalia/i18n/po/he/vidalia_he.po
+++ b/src/vidalia/i18n/po/he/vidalia_he.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:58+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr "הצג הגדרות"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "שימוש רוחב-פס של Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "אתחל"
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ביטול"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr "סוקט שליטה לא מחובר."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr "חפש"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1655,6 +1647,34 @@ msgid "New Identity"
msgstr "זהות חדשה"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+F"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+F"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr "תצוגה"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "עזרה אודות Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "שגיעה בעת פתיחת דפדפן"
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr "Tor בתהליך עצירה"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1859,6 +1887,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "אנא בדוק את הגדרות אימות פורט השליטה שלך."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "עידכון Tor זמין"
@@ -1901,11 +1941,82 @@ msgid "Status"
msgstr "מצב"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "קיצורי-דרך של Tor"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "הגדר מימסור\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "הצג את הרשת"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "הצג מפה של רשת Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "השתמש בזהות חדשה"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "גרום לחיבורים הבאים להיראות חדשים"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+msgctxt "MainWindow"
+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 "צא מ-Vidalia"
+
+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 ""
@@ -1967,31 +2078,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2009,16 +2102,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2026,20 +2109,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "שגעיה בעת קביעת סינון"
@@ -2293,14 +2362,22 @@ msgid "Automatically save new log messages to a file"
msgstr "שמוראוטומטית הודעות חדשות לקובץ"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "שמור תמיד הודעות יומן חדשות"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+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."
@@ -2340,6 +2417,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "מפת רשת Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "עדכן"
@@ -2439,22 +2520,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "גשר לא תקין"
@@ -2783,6 +2848,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "העבר מידע עבור רשת Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "פורט מימסר:"
@@ -3033,14 +3102,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3085,6 +3146,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3373,22 +3438,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "חדש"
@@ -3425,12 +3474,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "לא ידוע"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "תהליך %1 לא הצליח לעצור. (%2)"
@@ -3509,30 +3552,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3811,3 +3830,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/hi/vidalia_hi.po b/src/vidalia/i18n/po/hi/vidalia_hi.po
index d3f0a3a..69a19f6 100644
--- a/src/vidalia/i18n/po/hi/vidalia_hi.po
+++ b/src/vidalia/i18n/po/hi/vidalia_hi.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:58+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr "अनुकुलन दिखाओ"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "टोर बैंडविड्थ का उपयोग "
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "पुनःस्थाप"
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "रद्द "
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1647,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1885,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1937,138 @@ msgid "Status"
msgstr "स्थिति"
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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 "toolBar"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2076,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2356,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2411,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2514,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2839,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3087,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3131,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3423,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "नया"
@@ -3410,12 +3459,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "अज्ञात"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3537,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3815,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/hr/vidalia_hr.po b/src/vidalia/i18n/po/hr/vidalia_hr.po
index 7fb3b9f..d8a7f23 100755
--- a/src/vidalia/i18n/po/hr/vidalia_hr.po
+++ b/src/vidalia/i18n/po/hr/vidalia_hr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:46+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ht/vidalia_ht.po b/src/vidalia/i18n/po/ht/vidalia_ht.po
index d42081d..32e3898 100644
--- a/src/vidalia/i18n/po/ht/vidalia_ht.po
+++ b/src/vidalia/i18n/po/ht/vidalia_ht.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:46+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/hu/vidalia_hu.po b/src/vidalia/i18n/po/hu/vidalia_hu.po
index 8755a6c..fed3572 100644
--- a/src/vidalia/i18n/po/hu/vidalia_hu.po
+++ b/src/vidalia/i18n/po/hu/vidalia_hu.po
@@ -1,11 +1,13 @@
#
+# <viktor.varga at gmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:58+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +18,7 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "A Vidalia-ról"
+msgstr "A Vidalia névjegye"
msgctxt "AboutDialog"
msgid "License"
@@ -24,19 +26,19 @@ msgstr "Licensz"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia"
+msgstr "Vidalia 0.2.0"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "Tor 0.2.0.32"
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "4.4.2"
+msgstr "Qt 4.4.2"
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' egy nem létezõ IP cím."
+msgstr "'%1' egy nem létező IP cím."
msgctxt "AdvancedPage"
msgid ""
@@ -45,7 +47,7 @@ msgstr "Kiválasztotta a Jelszavas bejelentkezést, de nem adott meg jelszót."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "TOR Konfigurációs Fájl kiválasztása"
+msgstr "Tor Konfigurációs Fájl kiválasztása"
msgctxt "AdvancedPage"
msgid "File Not Found"
@@ -69,19 +71,19 @@ msgstr "Válasszon egy könyvtárat a TOR adatok tárolásához"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Jelenleg a TOR szolgáltatás nem lekapcsolható"
+msgstr "Jelenleg a Tor szolgáltatás nem eltávolítható"
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Jelenleg a TOR szolgáltatás nem elindítható"
+msgstr "Jelenleg a Tor szolgáltatás nem telepíthető"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "A TOR szolgáltatás telepítése sikertelen."
+msgstr "A Tor szolgáltatás telepítése sikertelen."
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Ellenõrzés:"
+msgstr "Ellenőrzés:"
msgctxt "AdvancedPage"
msgid "Address:"
@@ -101,7 +103,7 @@ msgstr "Jelszó"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Jelszó véletlenszerû létrehozása"
+msgstr "Jelszó véletlenszerű létrehozása"
msgctxt "AdvancedPage"
msgid ":"
@@ -109,11 +111,11 @@ msgstr ":"
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "TOR Konfigurációs Fájl"
+msgstr "Tor Konfigurációs Fájl"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "TOR indítása a 'torrc' konfigurációs fájllal"
+msgstr "A Tor indítása a megadott 'torrc' konfigurációs fájllal"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -129,67 +131,71 @@ msgstr "Adat könyvtár"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "TOR adatok tárolása a következõ könyvtárban"
+msgstr "A Tor adatok tárolása a következő könyvtárban"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Válassza ki a könytárat melyet a TOR adatok tárolására fog használni"
+msgstr "Válassza ki a könyvtárat melyet a Tor adatok tárolására fog használni"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr ""
+msgstr "Tor Vezérlés"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "TCP kapcsolat használata (Vezérlőport)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr ""
+msgstr "Útvonal:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Unix domain socket használata (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr ""
+msgstr "Aktuális torrc (tor konfigurációs) fájl szerkesztése"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "MEGJEGYZÉS: ez az aktuálisan betöltött torrc fájlt szerkeszti"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "A ControlSocket útvonala nem létezik."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
+"A megadott Tor konfigurációs fájl helye olyan karakteret tartalmaz, amely "
+"nem értelmezhető a rendszer aktuális 8-bites karakter kódolásával."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
+"A megadott Tor adatkönyvtár neve olyan karakteret tartalmaz, amely nem "
+"értelmezhető a rendszer aktuális 8-bites karakter kódolásával."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Figyelem"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "Megváltoztatta a torrc fájl útvonalát, szeretné újraindítani a Tor-t?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor konfigurációs fáj (torrc);;Minden fájl (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Válasszon ki egy fájlt a Tor socket útvonalhoz"
msgctxt "AdvancedPage"
msgid ""
@@ -197,6 +203,9 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
+"Vidalia nem tudta eltávolítani a Tor szolgáltatást.\n"
+"\n"
+"Kézzel kell majd eltávolítania."
msgctxt "AppearancePage"
msgid "Language"
@@ -204,7 +213,7 @@ msgstr "Nyelv"
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Vidalia nyelve"
+msgstr "Válassza ki milyen nyelvet használjon a Vidalia"
msgctxt "AppearancePage"
msgid "Style"
@@ -212,7 +221,7 @@ msgstr "Stílus"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Vidalia külalakja"
+msgstr "Válassza ki Vidalia felhasználói felület kinézetét"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
@@ -231,6 +240,10 @@ msgid "Show Settings"
msgstr "Beállítások megjelenítése"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor sávszélesség használat"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Visszaállítás"
@@ -260,7 +273,7 @@ msgstr "100"
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Áttûnés"
+msgstr "% átlátszóság"
msgctxt "BandwidthGraph"
msgid "Save"
@@ -270,57 +283,53 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Mégse"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr ""
+msgstr "HTTPS hídkérés indítása..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "Kapcsolódás a következőhöz: %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr ""
+msgstr "HTTPS kérés küldése a hidaknak..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr ""
+msgstr "A hidak listájának letöltése..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr ""
+msgstr "Hidak letöltése"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr ""
+msgstr "Nem sikerült letölteni a hidakat: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr ""
+msgstr "A hidak lekérésének újrapróbálása..."
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr ""
+msgstr "Ország"
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr ""
+msgstr "# kliens"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
+msgstr "Az alábbi országokból az ön átjátszóját használták %1 óta"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr ""
+msgstr "Híd használat összesítés"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr ""
+msgstr "Kliens összesítés"
msgctxt "Circuit"
msgid "New"
@@ -348,7 +357,7 @@ msgstr "Ismeretlen"
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Üres ösvény>"
+msgstr "<Üres útvonal>"
msgctxt "CircuitListWidget"
msgid "Connection"
@@ -368,7 +377,7 @@ msgstr "Ösvény lekapcsolása (Del)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Adás megszakítása (Del)"
+msgstr "Adatfolyam megszakítása (Del)"
msgctxt "ConfigDialog"
msgid "General"
@@ -384,7 +393,7 @@ msgstr "Megosztás"
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Folyamatok"
+msgstr "Szolgáltatások"
msgctxt "ConfigDialog"
msgid "Appearance"
@@ -400,19 +409,19 @@ msgstr "Súgó"
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Hiba adatmentés közben"
+msgstr "Hiba a beállítások mentése közben"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "A %1 beállítás mentése sikertelen."
+msgstr "A Vidalia nem tudta menteni a %1 beállításokat."
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Hiba lealkalmazás közben"
+msgstr "Hiba a beállítások alkalmazása közben"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "A %1 TOR beállítás lealkalmazása sikertelen."
+msgstr "A Vidalia nem tudja alkalmazni a %1 Tor beállításokat."
msgctxt "ConfigDialog"
msgid "Settings"
@@ -420,38 +429,31 @@ msgstr "Beállítások"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Nem sikerült a TOR-hoz kapcsolódni. (%1)"
+msgstr "Nem sikerült a Tor-hoz kapcsolódni. (%1)"
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "A Vezérlõ socket nem kapcsolódott."
+msgstr "A Vezérlõ szál (socket) nem kapcsolódott."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Jelszó szükséges"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Remember my password"
+msgstr "Emlékezzen a jelszavamra"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"A Vidalia olyan Tor folyamathoz kapcsolódott, amely jelszót kér. Kérjük adja"
+" meg a vezérlő jelszót:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "A Vezérlõ socket nem kapcsolódott."
+msgstr "A Vezérlõ szál (socket) nem kapcsolódott."
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
@@ -459,7 +461,7 @@ msgstr "Hiba történt a kontroll parancs küldésekor. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "A kapcsolat megszûnt egy adatsor beolvasása közben."
+msgstr "A kapcsolat megszűnt egy adatsor beolvasása közben."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
@@ -467,807 +469,807 @@ msgstr "Érvénytelen kontroll válasz. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr ""
+msgstr "Afganisztán"
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
msgctxt "CountryInfo"
msgid "Angola"
-msgstr ""
+msgstr "Angola"
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "Antigua & Barbuda"
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr ""
+msgstr "Argentína"
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr ""
+msgstr "Örményország"
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "A Vidalia-ról"
+msgstr "Ausztrália"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajdzsán"
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr ""
+msgstr "Bahama-szigetek"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr ""
+msgstr "Banglades"
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr ""
+msgstr "Fehéroroszország"
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr ""
+msgstr "Belgium"
msgctxt "CountryInfo"
msgid "Belize"
-msgstr ""
+msgstr "Belize"
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr ""
+msgstr "Bhután"
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr ""
+msgstr "Bolívia"
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Bosznia & Hercegovina"
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr ""
+msgstr "Brazília"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Szultánság"
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgária"
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr ""
+msgstr "Kambodzsa"
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
msgctxt "CountryInfo"
msgid "Canada"
-msgstr ""
+msgstr "Kanada"
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr ""
+msgstr "Zöld-foki Köztársaság"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr ""
+msgstr "Közép-afrikai Köztársaság"
msgctxt "CountryInfo"
msgid "Chad"
-msgstr ""
+msgstr "Csád"
msgctxt "CountryInfo"
msgid "Chile"
-msgstr ""
+msgstr "Chile"
msgctxt "CountryInfo"
msgid "China"
-msgstr ""
+msgstr "Kína"
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr ""
+msgstr "Kolumbia"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr ""
+msgstr "Comore-szigetek"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Kongói Demokratikus Köztársaság"
msgctxt "CountryInfo"
msgid "Congo"
-msgstr ""
+msgstr "Kongó"
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr ""
+msgstr "Elefántcsontpart"
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr ""
+msgstr "Horvátország"
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr ""
+msgstr "Ciprus"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr ""
+msgstr "Csehország"
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr ""
+msgstr "Dánia"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Névjegy"
+msgstr "Dzsibuti"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikai Köztársaság"
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr ""
+msgstr "Egyiptom"
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Egyenlítői Guniea"
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
msgctxt "CountryInfo"
msgid "France"
-msgstr "Mégse"
+msgstr "Franciaország"
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr ""
+msgstr "Grúzia"
msgctxt "CountryInfo"
msgid "Germany"
-msgstr ""
+msgstr "Németország"
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr ""
+msgstr "Ghána"
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Általános"
+msgstr "Guinea"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Bissau-Guinea"
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
msgctxt "CountryInfo"
msgid "Israel"
-msgstr ""
+msgstr "Izrael"
msgctxt "CountryInfo"
msgid "Italy"
-msgstr ""
+msgstr "Olaszország"
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
msgctxt "CountryInfo"
msgid "Japan"
-msgstr ""
+msgstr "Japán"
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr ""
+msgstr "Jordánia"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazahsztán"
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr ""
+msgstr "Kuvait"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgizisztán"
msgctxt "CountryInfo"
msgid "Laos"
-msgstr ""
+msgstr "Laosz"
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr ""
+msgstr "Lettország"
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr ""
+msgstr "Libéria"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Licensz"
+msgstr "Liechtenstein"
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr ""
+msgstr "Litvánia"
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr ""
+msgstr "Makedónia"
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr ""
+msgstr "Madagaszkár"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr ""
+msgstr "Malajzia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr ""
+msgstr "Mali"
msgctxt "CountryInfo"
msgid "Malta"
-msgstr ""
+msgstr "Málta"
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr ""
+msgstr "Marshall-szigetek"
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr ""
+msgstr "Mauritánia"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr ""
+msgstr "Mikronézia"
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr ""
+msgstr "Moldova"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr ""
+msgstr "Mongólia"
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr ""
+msgstr "Montenegró"
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr ""
+msgstr "Marokkó"
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr ""
+msgstr "Namíbia"
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr ""
+msgstr "Nepál"
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr ""
+msgstr "Hollandia"
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr ""
+msgstr "Új-Zéland"
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
msgctxt "CountryInfo"
msgid "Niger"
-msgstr ""
+msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr ""
+msgstr "Nigéria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Elõre"
+msgstr "Norvégia"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr ""
+msgstr "Omán"
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr ""
+msgstr "Pakisztán"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr ""
+msgstr "Palau"
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr ""
+msgstr "Palesztína"
msgctxt "CountryInfo"
msgid "Panama"
-msgstr ""
+msgstr "Panama"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr ""
+msgstr "Pápua Új Guinea"
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
msgctxt "CountryInfo"
msgid "Peru"
-msgstr ""
+msgstr "Peru"
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr ""
+msgstr "Fülöp-szigetek"
msgctxt "CountryInfo"
msgid "Poland"
-msgstr ""
+msgstr "Lengyelország"
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Port:"
+msgstr "Portugália"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr ""
+msgstr "Katar"
msgctxt "CountryInfo"
msgid "Romania"
-msgstr ""
+msgstr "Románia"
msgctxt "CountryInfo"
msgid "Russia"
-msgstr ""
+msgstr "Oroszország"
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "Saint Kitts & Nevis"
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "Saint Vincent és a Grenadine-szigetek"
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr ""
+msgstr "Szamoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "Sao Tome & Principe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr ""
+msgstr "Szaúd Arábia"
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Általános"
+msgstr "Szenegál"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr ""
+msgstr "Szerbia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr ""
+msgstr "Seychelle-szigetek"
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr ""
+msgstr "Szingapúr"
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr ""
+msgstr "Szlovákia"
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr ""
+msgstr "Szlovénia"
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr ""
+msgstr "Salamon-szigetek"
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr ""
+msgstr "Szomália"
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr ""
+msgstr "Dél Afrika"
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Megosztás"
+msgstr "Spanyolország"
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr ""
+msgstr "Srí Lanka"
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr ""
+msgstr "Szudán"
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Becenév"
+msgstr "Suriname"
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr ""
+msgstr "Szváziföld"
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr ""
+msgstr "Svédország"
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr ""
+msgstr "Svájc"
msgctxt "CountryInfo"
msgid "Syria"
-msgstr ""
+msgstr "Szíria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr ""
+msgstr "Tádzsikisztán"
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr ""
+msgstr "Tanzánia"
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr ""
+msgstr "Thaiföld"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "Kelet-Timor"
msgctxt "CountryInfo"
msgid "Togo"
-msgstr ""
+msgstr "Togo"
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "Trinidad & Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr ""
+msgstr "Tunézia"
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr ""
+msgstr "Törökország"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr ""
+msgstr "Türkmenisztán"
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr ""
+msgstr "Ukrajna"
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr ""
+msgstr "Egyesült Arab Emirátusok"
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr ""
+msgstr "Egyesült Királyság"
msgctxt "CountryInfo"
msgid "United States"
-msgstr ""
+msgstr "Egyesült Államok"
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr ""
+msgstr "Üzbegisztán"
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr ""
+msgstr "Vanatu"
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr ""
+msgstr "Vatikán"
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr ""
+msgstr "Nyugat Szahara"
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr ""
+msgstr "Jemen"
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
msgctxt "CountryInfo"
msgid "Albania"
-msgstr ""
+msgstr "Albánia"
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr ""
+msgstr "Algéria"
msgctxt "CountryInfo"
msgid "Austria"
-msgstr ""
+msgstr "Ausztria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr ""
+msgstr "Bahrein"
msgctxt "CountryInfo"
msgid "Benin"
-msgstr ""
+msgstr "Benin"
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr ""
+msgstr "Etiópia"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr ""
+msgstr "Fiji-szigetek"
msgctxt "CountryInfo"
msgid "Finland"
-msgstr ""
+msgstr "Finnország"
msgctxt "CountryInfo"
msgid "Greece"
-msgstr ""
+msgstr "Görögország"
msgctxt "CountryInfo"
msgid "Guam"
-msgstr ""
+msgstr "Guam"
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr ""
+msgstr "Magyarország"
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr ""
+msgstr "Izland"
msgctxt "CountryInfo"
msgid "India"
-msgstr ""
+msgstr "India"
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr ""
+msgstr "Indonézia"
msgctxt "CountryInfo"
msgid "Iran"
-msgstr ""
+msgstr "Irán"
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr ""
+msgstr "Irak"
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr ""
+msgstr "Írország"
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr ""
+msgstr "Korai Nép Demokratikus Köztársaság"
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr ""
+msgstr "Dél-Korea"
msgctxt "CountryInfo"
msgid "Libya"
-msgstr ""
+msgstr "Líbia"
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr ""
+msgstr "Maldív-szigetek"
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr ""
+msgstr "Mexikó"
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr ""
+msgstr "Mianmar"
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr ""
+msgstr "Tajvan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Összeomlási jelentés beküldés"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "A Vidalia hibát észlelt és bezárása szükséges"
msgctxt "CrashReportDialog"
msgid ""
@@ -1276,46 +1278,54 @@ msgid ""
"report does not contain any personally identifying information, but your "
"connection to the crash reporting server may not be anonymous."
msgstr ""
+"A létrejött hibajelentés automatikusan elküldhető a Vidalia fejlesztőinek, "
+"hogy segítségével azonosítható és javítható legyen a hiba. Az elküldött "
+"hibajelentés nem tartalmaz személyes azonosításra szolgáló adatot, de "
+"lehetséges, hogy kapcsolat a szerverrel nem lesz anonim."
msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
msgstr ""
+"Kérjük írja le (angolul), hogy mit csinált, mielőtt az alkalmazás "
+"összeomlott (opcionális):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "A hibajelentés elküldése a Vidalia fejlesztői felé"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "A Vidalia újraindítása"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr ""
+msgstr "Ne induljon újra"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "A Vidalia újraindítása sikertelen"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
+"Nem sikerült automatikusan újraindítani a Vidalia-t. Kérjük indítsa el "
+"kézzel."
msgctxt "CrashReportUploader"
msgid "Connecting..."
-msgstr ""
+msgstr "Csatlakozás..."
msgctxt "CrashReportUploader"
msgid "Sending crash report..."
-msgstr ""
+msgstr "Hibajelentés küldése..."
msgctxt "CrashReportUploader"
msgid "Receiving response..."
-msgstr ""
+msgstr "Válasz vétele..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1323,7 +1333,7 @@ msgstr "Futtatható állományok (*.exe)"
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "TOR elérési útjának megadása"
+msgstr "A Tor elérési útjának megadása"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
@@ -1331,19 +1341,23 @@ msgstr "Proxy indítófájl kiválasztása"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Meg kell határoznia a TOR indítófájl nevét."
+msgstr "Meg kell határoznia a Tor indítófájl nevét."
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Vidalia indítása a rendszerrel"
+msgstr "A Vidalia indítása a rendszerindításkor"
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Böngészés"
+msgstr "Tallóz"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "A Tor szoftver indítása a Vidalia indulásakor"
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "TOR"
+msgstr "Tor"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
@@ -1351,7 +1365,7 @@ msgstr "Proxy Program (opcionális)"
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Proxy program indítása a TOR-ral"
+msgstr "Proxy program indítása a Tor indításakor"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
@@ -1359,19 +1373,15 @@ msgstr "Proxy program parancssori kapcsolói:"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr ""
+msgstr "Szoftver frissítések"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "Az új szoftverek ellenőrzése automatikusan"
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
+msgstr "Ellenőrzés most"
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1391,11 +1401,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr ""
+msgstr "Érk.:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr ""
+msgstr "Küld:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1427,7 +1437,7 @@ msgstr "Vissza"
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Ugrás az elõzõ oldalra (Backspace)"
+msgstr "Ugrás az előző oldalra (Backspace)"
msgctxt "HelpBrowser"
msgid "Backspace"
@@ -1435,11 +1445,11 @@ msgstr "Backspace"
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Elõre"
+msgstr "Előre"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Ugrás a következõ oldalra (Shift+Backspace)"
+msgstr "Ugrás a következő oldalra (Shift+Backspace)"
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
@@ -1451,7 +1461,7 @@ msgstr "Kezdõlap"
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Ugrás a kezdõ oldalra (Ctrl+H)"
+msgstr "Ugrás a kezdő oldalra (Ctrl+H)"
msgctxt "HelpBrowser"
msgid "Ctrl+H"
@@ -1463,7 +1473,7 @@ msgstr "Keresés"
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Szóra vagy kifejezésre keresés az aktuális oldalon(Vtrl+F)"
+msgstr "Szóra vagy kifejezésre keresés az aktuális oldalon(Ctrl+F)"
msgctxt "HelpBrowser"
msgid "Ctrl+F"
@@ -1487,15 +1497,15 @@ msgstr "Keresés:"
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Elõzõ keresése"
+msgstr "Előző keresése"
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Következõ keresése"
+msgstr "Következő keresése"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Kis- és nagybetûérzékeny"
+msgstr "Kis- és nagybetűérzékeny"
msgctxt "HelpBrowser"
msgid "Whole words only"
@@ -1523,11 +1533,11 @@ msgstr "Talált dokumentumok"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "Hiba a Súgó tartalom betöltésénél:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Külsõ hivatkozás megnyitása"
+msgstr "Külső hivatkozás megnyitása"
msgctxt "HelpTextBrowser"
msgid ""
@@ -1535,15 +1545,15 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészõben."
-" Ha a böngészõ nincs jelenleg a TOR beállításaihoz igazítva, a kapcsolat nem"
-" lesz titkos !"
+"A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészőben."
+" Ha a böngésző nincs jelenleg a Tor használatára beállítva, a kapcsolat nem "
+"lesz anonim."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
"Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett "
-"böngészõben?"
+"böngészőben?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
@@ -1554,13 +1564,13 @@ msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészõben. "
-"Próbálja meg <b>Másol</b>ni a hivatkozást és <b>Beilleszt</b>eni a böngészõ "
-"URL sávjába."
+"A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészőben. "
+"Próbálja meg másolni és beilleszteni a a hivatkozást és <b>Beilleszt</b>eni "
+"a böngészõ URL sávjába."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr ""
+msgstr "Hiba a Súgó fájl megnyitásában:"
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1600,31 +1610,31 @@ msgstr "Ismeretlen"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr ""
+msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr ""
+msgstr "Megjegyzés"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Figyelmeztetés"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Hiba"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr ""
+msgstr "Ismeretlen"
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "TOR indítása"
+msgstr "Tor indítása"
msgctxt "MainWindow"
msgid "Exit"
@@ -1644,35 +1654,67 @@ msgstr "Hálózat térkép"
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Vezérlõpult"
+msgstr "Vezérlőpult"
msgctxt "MainWindow"
msgid "Settings"
msgstr "Beállítások"
msgctxt "MainWindow"
-msgid "About"
-msgstr "Névjegy"
+msgid "About"
+msgstr "Névjegy"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Súgó"
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Új identitás"
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
msgctxt "MainWindow"
-msgid "Help"
-msgstr "Súgó"
+msgid "Ctrl+I"
+msgstr "CTRL+I"
msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Új identitás"
+msgid "Ctrl+P"
+msgstr "CTRL+P"
msgctxt "MainWindow"
msgid "Tor"
-msgstr "TOR"
+msgstr "Tor"
msgctxt "MainWindow"
msgid "View"
msgstr "Nézet"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia súgó"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Hiba a böngészõ indításakor"
+msgstr "Hiba a böngésző indításakor"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
@@ -1680,7 +1722,7 @@ msgstr "A beállított böngészõ indítása sikertelen"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Hiba az IM (azonnali üzenetküldõ) program indításakor"
+msgstr "Hiba az IM (azonnali üzenetküldő) program indításakor"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
@@ -1712,7 +1754,7 @@ msgstr "Hálózat státuszának betöltése"
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Biztonsági ellenõrzõk betöltése"
+msgstr "Tanúsítványkiadó tanúsítványok betöltése"
msgctxt "MainWindow"
msgid "Requesting relay information"
@@ -1724,15 +1766,15 @@ msgstr "Elosztási adatok betöltése"
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Kapcsolódás a TOR hálózathoz"
+msgstr "Kapcsolódás a Tor hálózathoz"
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "TOR kapcsolat felépítése"
+msgstr "Tor kapcsolat felépítése"
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "TOR kapcsolódva !"
+msgstr "Kapcsolódva a Tor hálózathoz! "
msgctxt "MainWindow"
msgid "Unrecognized startup status"
@@ -1756,7 +1798,7 @@ msgstr "kapcsolódás visszautasítva"
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "a kapcsolódási idõ letelt"
+msgstr "a kapcsolódási idő letelt"
msgctxt "MainWindow"
msgid "read/write error"
@@ -1768,7 +1810,7 @@ msgstr "nincs út a kiszolgálóhoz"
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "elfogytak az erõforrások"
+msgstr "elfogytak az erőforrások"
msgctxt "MainWindow"
msgid "unknown"
@@ -1776,39 +1818,43 @@ msgstr "ismeretlen"
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "TOR lekapcsolva"
+msgstr "Tor lekapcsolva"
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "TOR lekapcsolása folyamatban..."
+msgstr "Tor lekapcsolása folyamatban"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Tor azonnali leállítása"
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "TOR leállítása"
+msgstr "Tor leállítása"
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "TOR indítása"
+msgstr "Tor szoftver indítása"
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "TOR indítása"
+msgstr "Tor indítása"
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Hiba a TOR indításával"
+msgstr "Hiba a Tor indításával"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"A Vidalia nem tudta elindítani a TOR-t. Ellenõrizze a beállításait, hogy jól"
-" van-e megadva a TOR indítófájl neve és elérési útja."
+"A Vidalia nem tudta elindítani a Tor-t. Ellenőrizze a beállításait, hogy jól"
+" van-e megadva a Tor indítófájl neve és elérési útja."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "TOR kapcsolódása"
+msgstr "Kapcsolódás a Tor-hoz"
msgctxt "MainWindow"
msgid "Connection Error"
@@ -1824,7 +1870,7 @@ msgstr "Hiba a lekapcsoláskor"
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "A TOR leállítása sikertelen."
+msgstr "A Vidalia nem tudta leállítani a Tor szoftvert."
msgctxt "MainWindow"
msgid "Unexpected Error"
@@ -1832,22 +1878,23 @@ msgstr "Váratlan hiba"
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "TOR beléptetése"
+msgstr "Tor beléptetése"
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Süti ellenõrzés szükséges"
+msgstr "Süti azonosítás szükséges"
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr "A TOR egy bejelentkezõ süti elküldését kéri, de nem található."
+msgstr ""
+"A Tor a Vidalia-tól egy bejelentkező süti elküldését kéri, de a Vidalia nem "
+"találja."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"Kívánja kiválasztani kézzel a következõ állományt: 'control_auth_cookie' ?"
+msgstr "Kívánja kitallózni a 'control_auth_cookie' állományt?"
msgctxt "MainWindow"
msgid "Data Directory"
@@ -1866,32 +1913,43 @@ msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Nem sikerült a Vidaliát kifogástalanul elindítani, ezért bizonyos funkciói "
-"várhatóan nem fognak rendeltetésszerûen mûködni."
+"Nem sikerült a Vidalia-t kifogástalanul elindítani, ezért bizonyos funkciói "
+"várhatóan nem fognak rendeltetésszerűen működni."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Ellenőrzési hiba"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "A Vidalia nem tud belépni a Tor szoftverbe. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Ellenőõrizze a kontroll port bejelentkezési beállításait."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "A legújabb TOR verzió elérhetõ"
+msgstr "Tor frissítés elérhető"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"A TOR jelenleg telepített verziója lejárt, vagy nem ajánlatos továbbá "
-"használni. Látogasson el a TOR weboldalára a legfrissebb verzióért !"
+"A Tor jelenleg telepített régi vagy már nem ajánlott. Látogasson el a Tor "
+"weboldalára a legfrissebb verzióért."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "TOR weboldal: %1"
+msgstr "Tor weboldal: %1"
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
-"Ösvények újrakiépítve.Minden további kapcsolat a régi kapcsolataitól "
-"különbözõként fog szerepelni."
+"Minden későbbi kapcsolat a régi kapcsolataitól különbözőként fog szerepelni."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1903,68 +1961,142 @@ msgstr "Port továbbítás sikertelen"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Automata Port továbbítás beállítása sikertelen."
+msgstr ""
+"A Vidalia-nak nem sikerült beállítania az automatikus port továbbítást."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia vezérlõpult"
+msgstr "Vidalia vezérlőpult"
msgctxt "MainWindow"
msgid "Status"
msgstr "Állapot"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Parancsikonok"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Elosztás beállítása\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Elosztás bekapcsolása, részvétel a Tor hálózat növelésében"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Hálózat megtekintése"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Tor hálózati térkép megtekintése"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Új identitás használata"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "További kapcsolatok újként való feltüntetése"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Sávszélesség statisztika megtekintése"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Naplóbejegyzések megtekintése"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Súgó megtekintése"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Vidalia konfigurálása"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Verzió és licensz információk megtekintése"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Kilépés a Vidaliából"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Megjelenítés indításkor"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Elrejtés"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ablak elrejtése"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "A jelszó-visszaállítás nem sikerült"
+msgstr "A jelszó alaphelyzetbe állítás nem sikerült"
+
+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 ""
+"A Vidalia megpróbálta visszaállítani a Tor kontroll-jelszót, de nem tudta a "
+"Tor-t újraindítani. Ellenőrizze a Feladatkezelőben, hogy nem fut-e másik Tor"
+" példány."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr ""
-"A TOR jelenleg telepített verziója lejárt, vagy nem ajánlatos továbbá "
-"használni. Látogasson el a TOR weboldalára a legfrissebb verzióért !"
+msgstr "A Tor jelenleg telepített verziója régi és már nem ajánlott."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
+msgstr "Szeretné megnézni, hogy található-e újabb telepítő csomag?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr ""
+msgstr "Alapvetően nem biztonságos kapcsolat"
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
+"A Tor automatikusan lezárta a kapcsolatot az anonimitása védelme érdekében."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "A legújabb TOR verzió elérhetõ"
+msgstr "A frissítés sikertelen"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr ""
+msgstr "A szoftver verziója az aktuális"
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
+msgstr "Jelenleg nincs új tor szoftvercsomag az ön számítógépéhez."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr ""
+msgstr "A telepítés sikertelen"
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "A TOR leállítása sikertelen."
+msgstr "A Vidalia-nak nem sikerült telepítenie a frissítéseket."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr ""
+msgstr "Az alábbi hiba történt:"
msgctxt "MainWindow"
msgid ""
@@ -1978,34 +2110,21 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
+"Bármi ami ezen a kapcsolaton keresztül megy ki nyomonkövethető. Ellenőrizze "
+"az alkalmazás beállításait, és csak titkosított kapcsolatot használjon, "
+"például SSL-t ha lehetséges."
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "sikertelen (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Az Elosztó leáll.\n"
+"Kattintson újra 'Stop'-ra az azonnali leállításhoz."
msgctxt "MainWindow"
msgid ""
@@ -2013,6 +2132,9 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
+"Jelenleg Elosztót futtat. Az Elosztó leállítása megszakítja a többi használó kapcsolatát.\n"
+"\n"
+"Szeretné szépen leállítani, és ezzel időt adni a többi használónak, hogy új elosztót találjanak??"
msgctxt "MainWindow"
msgid ""
@@ -2020,46 +2142,25 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
+"A Vidalia a Tor szoftver váratlan kilépését észlelte..\n"
+"\n"
+"Kérjük tekintse meg a log üzeneteket az aktuális hibaüzenetekért."
msgctxt "MainWindow"
msgid ", probably Telnet,"
-msgstr ""
+msgstr ", valószínűleg Telnet"
msgctxt "MainWindow"
msgid ", probably an email client,"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
+msgstr ", valószínűleg egy levelező program"
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "Hiba a szûrõ beállításakor"
+msgstr "Hiba a szűrő beállításakor"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "A Vidalia nem tudta regisztrálni a TOR log eseményeit."
+msgstr "A Vidalia nem tudta regisztrálni a Tor log eseményeit."
msgctxt "MessageLog"
msgid "Error Opening Log File"
@@ -2115,19 +2216,19 @@ msgstr "Log üzenetek (Napló)"
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Üzenet szûrési feltételek..."
+msgstr "Üzenet szűrési feltételek..."
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Üzenet szûrési feltételek beálllítása"
+msgstr "Üzenet szűrési feltételek beállítása"
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Elõzmények mérete..."
+msgstr "Előzmények mérete..."
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "A megjelenítendõ üzenetek maximális számának megadása"
+msgstr "A megjelenítendő üzenetek maximális számának megadása"
msgctxt "MessageLog"
msgid "Clear"
@@ -2199,7 +2300,7 @@ msgstr "Súgó"
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Súgó böngészõ megjelenítése"
+msgstr "Súgó böngésző megjelenítése"
msgctxt "MessageLog"
msgid "F1"
@@ -2231,7 +2332,7 @@ msgstr "Ctrl+F"
msgctxt "MessageLog"
msgid "Time"
-msgstr "Idõ"
+msgstr "Idő"
msgctxt "MessageLog"
msgid "Type"
@@ -2259,7 +2360,7 @@ msgstr "Mégse"
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Üzenet szûrési feltétel"
+msgstr "Üzenet szűrési feltétel"
msgctxt "MessageLog"
msgid "Error"
@@ -2287,7 +2388,7 @@ msgstr "Üzenet napló"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Naplóban egyidejûleg megjeleníthetõ log üzenetek száma"
+msgstr "Naplóban egyidejűleg megjeleníthető log üzenetek száma"
msgctxt "MessageLog"
msgid "messages"
@@ -2306,24 +2407,35 @@ msgid "Automatically save new log messages to a file"
msgstr "Mindig mentse automatikusan az új üzeneteket"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Mindig mentse az új üzeneteket"
+msgid "Basic"
+msgstr "Alap"
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "Tor állapot"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Speciális"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Mindig mentse az új üzeneteket"
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
+"Üzenetek, amik akkor jelentek meg, amikor valami nagyon nem volt jó, és a "
+"Tor nem tudott működni."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
+"Üzenetek, amik akkor jelentek meg, amikor valamivel gond volt a Tor-ra."
msgctxt "MessageLog"
msgid ""
@@ -2332,18 +2444,20 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
+"Üzenetek, amik néha-néha megjelennek normális Tor használatnál, és nem "
+"hibák, de talán érdemes odafigyelni rájuk."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
+msgstr "Üzenetek, amik gyakran jelennek meg normális Tor működés alatt."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
+msgstr "Hiper-részletes üzenetek elsősorban a Tor fejlesztői számára."
msgctxt "MessageLog"
msgid ""
@@ -2351,6 +2465,13 @@ msgid ""
"\n"
"%2."
msgstr ""
+"Nem írható az állomány: %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor hálózati térkép"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2358,7 +2479,7 @@ msgstr "Frissítés"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "TOR Elosztások és kapcsolatok listájának frissítése"
+msgstr "A Tor Elosztók és a kapcsolatok listájának frissítése"
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2418,7 +2539,7 @@ msgstr "-"
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Optimális közelítés"
+msgstr "Nagyítás kitöltésig"
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
@@ -2434,7 +2555,7 @@ msgstr "A fájl nem található"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr ""
+msgstr "Nincs részletes információ a kijelölt Elosztóról."
msgctxt "NetViewer"
msgid "Unknown"
@@ -2442,32 +2563,16 @@ msgstr "Ismeretlen"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr ""
+msgstr "Teljes képernyő"
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr ""
+msgstr "A térkép megjelenítése teljes képernyős módban"
msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Érvénytelen Hídkapcsolat"
@@ -2485,9 +2590,8 @@ msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Meg kell adni mind vagy egy IP címet, vagy egy állomásnevet (host) és egy "
-"portot , ahhoz, hogy a TOR ezen a proxy-n keresztül kapcsolódjon az "
-"Internethez."
+"Meg kell adnia egy IP címet, vagy egy gépnevet (host) és egy portot , ahhoz,"
+" hogy a Tor ezen a proxy-n keresztül kapcsolódjon az Internethez."
msgctxt "NetworkPage"
msgid ""
@@ -2495,11 +2599,11 @@ msgid ""
"connect."
msgstr ""
"Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) "
-"vannak a tûzfalban."
+"vannak a tűzfalon."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "A következõ port érvénytelen: '%1'"
+msgstr "A következő port érvénytelen: '%1'"
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
@@ -2530,16 +2634,16 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tûzfalam nyitott "
+"Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tűzfalam nyitott "
"portjaira vannak konfigurálva"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "A tûzfalam csak néhány porton engedélyez kapcsolódást"
+msgstr "A tűzfalam csak néhány porton engedélyez kapcsolódást"
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Tûzfal beállítások"
+msgstr "Tűzfal beállítások"
msgctxt "NetworkPage"
msgid "Allowed Ports:"
@@ -2559,7 +2663,7 @@ msgstr ""
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "A szolgáltatóm blokkolja a TOR-t"
+msgstr "A szolgáltatóm blokkolja a Tor-t"
msgctxt "NetworkPage"
msgid "Bridge Settings"
@@ -2579,53 +2683,57 @@ msgstr "A kiválasztott Hídkapcsolat vágólapra másolása"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr ""
+msgstr "Hídkapcsolatok keresése"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Hogyan találhatok még hídkapcsolatokat?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Hogyan találhatok hídkapcsolatokat?</a>"
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
+"Nincs új hídkapcsolat elérhető. Várhat egy kicsit és megpróbálhatja később, "
+"vagy kereshet egy másik megoldást a hídkapcsolatok keresésére."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
+"Kattintson a Súgó-ra, hogy megtudja, milyen lehetőségek vannak még a "
+"hídkapcsolatok keresésére."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr ""
+msgstr "Cím:"
msgctxt "NetworkPage"
msgid "Type:"
-msgstr ""
+msgstr "Típus:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr ""
+msgstr "Ki kell választania a proxy típusát."
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr ""
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2665,7 +2773,7 @@ msgstr "Sávszélesség:"
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Aktivitási idõ:"
+msgstr "Aktivitási idő:"
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
@@ -2693,15 +2801,15 @@ msgstr "Ismeretlen"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr ""
+msgstr "Elosztó részletek"
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr ""
+msgstr "Összegzés"
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Becenév:"
+msgstr "Név:"
msgctxt "RouterInfoDialog"
msgid "Status:"
@@ -2725,7 +2833,7 @@ msgstr "Sávszélesség:"
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Aktivitási idõ:"
+msgstr "Aktivitási idő:"
msgctxt "RouterInfoDialog"
msgid "Contact:"
@@ -2737,7 +2845,7 @@ msgstr "Utolsó frissítés ideje:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr ""
+msgstr "Leíró"
msgctxt "RouterListItem"
msgid "Offline"
@@ -2753,15 +2861,15 @@ msgstr "%1 KB/s"
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Elosztás"
+msgstr "Elosztó"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Elosztókra szûkítés"
+msgstr "Elosztókra szűkítés"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 Elosztó kapcsolódva"
+msgstr "%1 Elosztó vonalban"
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2777,28 +2885,28 @@ msgstr "Digitális Ujjlenyomat"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "A Hídkapcsolat támogatás nem elérhetõ"
+msgstr "A Hídkapcsolat támogatás nem elérhető"
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 ""
-"Ön beállította a TOR-t Hídkapcsolati Elosztóként,blokkolt felhasználók TOR-"
-"hoz kapcsolódásának segítéséhez, viszont ez a TOR verzió nem támogatja a "
-"Hídkapcsolati Elosztást."
+"Beállította a Tor-t Hídkapcsolati Elosztóként, a korlátozott felhasználók "
+"Tor-hoz kapcsolódásának segítéséhez, viszont ez a Tor verzió nem támogatja a"
+" Hídkapcsolati Elosztást."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Frissítse a TOR-t vagy állítsa be hagyományos forgalom-Elosztóként "
-"(közvetítõként)."
+"Frissítse a Tor-t vagy állítsa be hagyományos Tor Elosztóként "
+"(közvetítőként)."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "A Hídkapcsolati Elosztása nem fut."
+msgstr "A Hídkapcsolati Elosztás nem fut."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
@@ -2809,8 +2917,12 @@ msgid "Run as a client only"
msgstr "Csak kliens indítása"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "A Tor hálózat forgalmának közvetítése (Elosztás)"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Közvetítõ port:"
+msgstr "Közvetítő port:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
@@ -2847,8 +2959,8 @@ msgstr "Az Elosztó neve"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"A port, amelyen más felhasználók és Elosztók kommunikálnak az Ön "
-"közvetítésével"
+"A port, amelyen más felhasználók és Elosztók kommunikálhatnak az Ön "
+"Elosztójával"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2960,7 +3072,7 @@ msgstr "Portok: 706, 1863, 5050, 5190, 5222, 5223, 8300 és 8888"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "IM (azonnali üzenetküldõk)"
+msgstr "IM (azonnali üzenetküldők)"
msgctxt "ServerPage"
msgid "Port 443"
@@ -2985,15 +3097,17 @@ msgstr "Kilépési szabályokkal kapcsolatos súgó témák megjelenítése"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr "Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak?"
+msgstr ""
+"Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak az Elosztón"
+" keresztül?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"A TOR továbbra is blokkolni fog némely levelező és fájlmegosztó "
-"szolgáltatásokat, a visszaélések megfékezése érdekében."
+"A Tor továbbra is blokkolni fog néhány levelező és fájlmegosztó "
+"szolgáltatást, a spam és visszaélések megfékezése érdekében."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3003,7 +3117,7 @@ msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
msgstr ""
"Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a "
-"Hídkapcsolatával a TOR hálózathoz:"
+"Hídkapcsolatával a Tor hálózathoz:"
msgctxt "ServerPage"
msgid ""
@@ -3016,71 +3130,68 @@ msgstr "A Hídkapcsolati azonosító vágólapra másolása"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr ""
+msgstr "Nincs aktuális használat"
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "Jelenleg nem használja senki az Elosztóját."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
+"Hagyja futni az Elosztót, így a felhasználóknak jobb esélye van észlelni és "
+"használni azt."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Hídkapcsolatok beállításai"
+msgstr "Hídkapcsolatok előzményei"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "A %1 beállítás mentése sikertelen."
+msgstr "A Vidalia nem tudja előkeresni a Hídkapcsolat használat előzményeit."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
+"A Tor szoftver egy rosszul formázott üzenetet adott vissza, mikor a Vidalia "
+"elkérte tőle a Hídkapcsolat használat előzményeit."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr ""
+msgstr "A visszaadott válasz: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
msgstr ""
-"Blokkolt felhasználók segítése a TOR hálózathoz való kapcsolódához (TOR "
-"0.2.0.8-alfa vagy újabb)"
+"A korlátozott felhasználók segítése a Tor hálózathoz való kapcsolódáshoz"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"bridges.finding\">Hogyan találhatok Hídkapcsolatokat?</a>"
+msgstr "<a href=\"#bridgeUsage\">Ki használta a hídkapcsolatomat?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Mi ez?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
+msgstr "A Hídkapcsolati címem automatikus terjesztése"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr ""
+msgstr "Az Elosztó címtár tükrözése"
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
+"Email cím amin elérhető, ha probléma van az Ön elosztójával. Megadhatja "
+"mellé a PGP vagy GPG ujjlenyomatát is."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3092,7 +3203,7 @@ msgid ""
"service you want to save. Remove the other ones."
msgstr ""
"Adjon meg minimum egy szolgáltatás könyvtárat és egy portot minden "
-"elmentendõ szolgáltatáshoz, a többit pedig törölje."
+"elmentendő szolgáltatáshoz, a többit pedig törölje."
msgctxt "ServicePage"
msgid "Error"
@@ -3113,16 +3224,20 @@ msgstr "A Virtuális port csak érvényes (1..65535) számokat tartalmazhat"
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
-"A cél megadási szintaktikája csak a következõ lehet:<br>IP cím:port vagy "
-"csak IP cím, vagy csak port."
+"A cél cím a következő formátumú lehet: cím:port vagy csak cím, vagy csak "
+"port."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr "A könyvár már használatban van egy másik szolgáltatás által."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Forma"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Megadott Rejtett Szolgáltatások"
+msgstr "Biztosított rejtett szolgáltatások"
msgctxt "ServicePage"
msgid "Onion Address"
@@ -3138,7 +3253,7 @@ msgstr "Cél"
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Címtár Útvonal"
+msgstr "Címtár útvonal"
msgctxt "ServicePage"
msgid "Enabled"
@@ -3158,27 +3273,27 @@ msgstr "A kiválasztott szolgáltatás .onion címének vágólapra másolása"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "A kiválasztott szolgáltatás helyének kitallózása a Sajátgépben"
+msgstr "A kiválasztott szolgáltatás helyének kitallózása a számítógépen"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "TOR által generálva"
+msgstr "Tor által létrehozva"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Vágólapra másolás"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr ""
+msgstr "A Tor szoftver fut."
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "A Tor szoftver \"%1\" verzióját futtatja."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "A Tor szoftver NEM fut."
msgctxt "StatusEventWidget"
msgid ""
@@ -3186,6 +3301,9 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
+"Kattintson a \"Tor indítása\" gombra a Vidalia Vezérlőpultban a Tor szoftver"
+" elindításához. Ha a Tor váratlanul lépett ki, akkor válassza a Speciális "
+"fület a megjelent hibák részleteinek megismeréséhez."
msgctxt "StatusEventWidget"
msgid ""
@@ -3194,6 +3312,9 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
+"Jelenleg a Tor szoftver %1 verzióját használja, ami tovább már nem ajánlott."
+" Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és"
+" teljesítmény javításokat tartalmaz."
msgctxt "StatusEventWidget"
msgid ""
@@ -3202,30 +3323,37 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
+"Jelenleg a Tor szoftver %1 verzióját használja, ami már nem működik az "
+"aktuális Tor hálózattal. Kérjük frissítse a legújabb verzióra, ami fontos "
+"biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "A Tor szoftvere már lejárt."
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Kapcsolódva a Tor hálózathoz"
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
+"Sikeresen csatlakoztunk a Tor hálózathoz. Most már csak az alkalmazásait "
+"kell beállítania, hogy névtelenül érje el az Internetet."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor szoftver hiba"
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
+"A Tor szoftver belső hibára futott. Kérjük jelezze az alább hibaüzenetet a "
+"Tor fejlesztőinek a bugs.torproject.org oldalon: \"%1\"\n"
msgctxt "StatusEventWidget"
msgid ""
@@ -3409,22 +3537,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Új"
@@ -3451,7 +3563,7 @@ msgstr "Lezárt"
msgctxt "Stream"
msgid "Retrying"
-msgstr "Újabb próbálkozás"
+msgstr "Újra próbálkozás"
msgctxt "Stream"
msgid "Remapped"
@@ -3461,27 +3573,21 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Ismeretlen"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "%1 folyamat leállítása sikertelen. [%2]"
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "A TOR szolgáltatás nincs telepítve."
+msgstr "A Tor szolgáltatás nincs telepítve."
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "TOR szolgáltatás indítása sikertelen."
+msgstr "Tor szolgáltatás indítása sikertelen."
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Kontroll jelszó ellenõrzõ-végösszegének létrehozása sikertelen."
+msgstr "Kontroll jelszó ellenőrző-végösszegének létrehozása sikertelen."
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3495,79 +3601,57 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Kivág"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Másol"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Beilleszt"
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr ""
+msgstr "Visszavon"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr ""
+msgstr "Visszavonást töröl"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Mindent kijelöl"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr ""
+msgstr "Mindenre végrehajt"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr ""
+msgstr "Csak a kijelöltre hajt végre"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Hiba a Tor-hoz kapcsolódásban"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
+"A kijelölés üres. Válasszon ki szöveget, vagy jelölje a Mindenre végrehajt "
+"opciót."
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Hiba a %1 sorban: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Hiba"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
+msgstr "Hiba történt a torrc fájl megnyitása során"
msgctxt "UPNPControl"
msgid "Success"
@@ -3579,7 +3663,7 @@ msgstr "Nem található UPnP eszköz"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Nem található UPnP támogatású Internet Átjáró eszköz"
+msgstr "Nem található UPnP támogatású Internet átjáró eszköz"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3630,16 +3714,20 @@ msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
+"A Vidalia nem tudta ellenőrizni az elérhető szoftver frissítéseket, mert nem"
+" találta a következőt: '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
+"A Vidalia nem tudta ellenőrizni az elérhető szoftverfrissítéseket, mert a "
+"Tor frissítési folyamat nem várt módon megszakadt."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr ""
+msgstr "Elérhető frissítések keresése..."
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3647,15 +3735,15 @@ msgstr "Elrejtés"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr ""
+msgstr "Frissítések letöltése..."
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "TOR indítása"
+msgstr "Frissített szoftver telepítése..."
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "Kész. A szoftver naprakész állapotú."
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3663,11 +3751,11 @@ msgstr "OK"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr ""
+msgstr "Szoftver frissítések"
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr ""
+msgstr "Frissítések keresése..."
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3675,35 +3763,35 @@ msgstr "Mégse"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "A legújabb TOR verzió elérhetõ"
+msgstr "Szoftver frissítések elérhetők"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr ""
+msgstr "Emlékeztessen később"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr ""
+msgstr "Telepít"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
+msgstr "A következő frissített szoftver csomagok telepítésre készen állnak:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Backspace"
+msgstr "Csomag"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "verzió"
+msgstr "Verzió"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "Hibajelentés feltöltése"
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "A %1 jelentés küldése sikertelen"
msgctxt "VMessageBox"
msgid "OK"
@@ -3747,7 +3835,7 @@ msgstr "Kilépés"
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Böngészés"
+msgstr "Tallózás"
msgctxt "Vidalia"
msgid "Invalid Argument"
@@ -3779,7 +3867,7 @@ msgstr "Beállítja a nevét és a helyét a Vidalia logjának (naplójának)."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Beállítja a Vidalia naplózásának összetettségét."
+msgstr "Beállítja a Vidalia naplózásának részletességét."
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
@@ -3799,15 +3887,15 @@ msgstr "A '%1' napló megnyitása sikertelen: %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Érvénytelen nyelvi kód lett megadva:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Érvénytelen felhasználói felület stílus lett megadva:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Érvénytelen naplózási szint lett megadva:"
msgctxt "Vidalia"
msgid ""
@@ -3815,6 +3903,9 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
+"Valószínűleg egy másik Vidalia folyamat is fut. Ha biztosan nem fut Vidalia folyamat, akkor választhatja a folytatás mindenképp lehetőséget.\n"
+"\n"
+"Szeretné folyatni a Vidalia indítását?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3838,12 +3929,14 @@ msgstr "%1 GB/s"
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr ""
+msgstr "%1 nap"
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr ""
+msgstr "%1 óra"
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr ""
+msgstr "%1 perc"
+
+
diff --git a/src/vidalia/i18n/po/id/vidalia_id.po b/src/vidalia/i18n/po/id/vidalia_id.po
index e51207e..949ef78 100755
--- a/src/vidalia/i18n/po/id/vidalia_id.po
+++ b/src/vidalia/i18n/po/id/vidalia_id.po
@@ -1,11 +1,14 @@
#
+# <thedaweng at yahoo.com>, 2011.
+# daweng <thedaweng at yahoo.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:01+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: daweng <thedaweng at yahoo.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,15 +27,15 @@ msgstr "Lisensi"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr ""
+msgstr "Vidalia 0.2.0"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr ""
+msgstr "Tor 0.2.0.32"
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr ""
+msgstr "4.4.2 qt"
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
@@ -140,59 +143,63 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr ""
+msgstr "Kontrol "
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "Gunakan koneksi TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr ""
+msgstr "Path:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Gunakan domain socket Unix(ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr ""
+msgstr "Edit torrc saat ini"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "Catatan: ini akan mengedit saat ini dimuat torrc"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "Path ControlSocket tidak ada."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
+"Lokasi file konfigurasi Tor yang ditentukan berisi karakter yang tidak dapat"
+" diwakili dalam pengkodean karakter saat sistem anda 8-bit."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
+"Lokasi direktori data Tor yang ditentukan berisi karakter yang tidak dapat "
+"diwakili dalam pengkodean karakter saat sistem anda 8-bit."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Peringatan"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "Anda berubah path torrc, apakah Anda ingin me-restart Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor Konfigurasi File (torrc);; All Files (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Pilih file untuk digunakan untuk path soket Tor"
msgctxt "AdvancedPage"
msgid ""
@@ -200,6 +207,8 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
+"Vidalia tidak dapat menghapus layanan Tor. Anda mungkin perlu menghapus "
+"secara manual."
msgctxt "AppearancePage"
msgid "Language"
@@ -234,6 +243,10 @@ msgid "Show Settings"
msgstr "Tampilkan Pengaturan"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Penggunaan Bandwidth Tor "
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reset"
@@ -273,57 +286,53 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Batal"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr ""
+msgstr "Mulai meminta penghubung HTTPS ..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "Menghubungkan ke %1:%2."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr ""
+msgstr "Mengirim permintaan HTTPS untuk penghubung ..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr ""
+msgstr "Men-download daftar penghubung ..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr ""
+msgstr "Men-download Penghubung"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr ""
+msgstr "Tidak dapat mendownload penghubung: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr ""
+msgstr "Mencoba kembali permintaan penghubung ..."
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr ""
+msgstr "Negara"
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr ""
+msgstr "# Klien"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
+msgstr "Klien dari negara berikut telah menggunakan relay anda sejak %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr ""
+msgstr "Ringkasan Penggunaan Penghubung"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr ""
+msgstr "Ringkasan Klien "
msgctxt "Circuit"
msgid "New"
@@ -335,7 +344,7 @@ msgstr "Buka"
msgctxt "Circuit"
msgid "Building"
-msgstr "Building"
+msgstr "Bangunan"
msgctxt "Circuit"
msgid "Failed"
@@ -430,27 +439,20 @@ msgid "Control socket is not connected."
msgstr "Kendali socket tidak terhubung."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Diperlukan Password"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Ingat password saya"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia telah tersambung ke Tor proses berjalan yang membutuhkan password. "
+"Silakan masukkan sandi kendali Anda:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -470,807 +472,807 @@ msgstr "Balasan Kendali tidak valid. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistan"
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
msgctxt "CountryInfo"
msgid "Angola"
-msgstr ""
+msgstr "Angola"
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr ""
+msgstr "Antigua & Barbuda"
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
msgctxt "CountryInfo"
msgid "Australia"
-msgstr ""
+msgstr "Australia"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaijan"
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr ""
+msgstr "Bahama"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr ""
+msgstr "Belarusia"
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr ""
+msgstr "Belgia"
msgctxt "CountryInfo"
msgid "Belize"
-msgstr ""
+msgstr "Belize"
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr ""
+msgstr "Bosnia & Herzegovina"
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr ""
+msgstr "Brazil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr ""
+msgstr "Kamboja"
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
msgctxt "CountryInfo"
msgid "Canada"
-msgstr ""
+msgstr "Kanada"
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr ""
+msgstr "Cape Verde"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr ""
+msgstr "Republik Afrika Tengah"
msgctxt "CountryInfo"
msgid "Chad"
-msgstr ""
+msgstr "Chad"
msgctxt "CountryInfo"
msgid "Chile"
-msgstr ""
+msgstr "Chile"
msgctxt "CountryInfo"
msgid "China"
-msgstr ""
+msgstr "Cina"
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr ""
+msgstr "Kolumbia"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr ""
+msgstr "Komoro"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Kongo, Republik Demokratik"
msgctxt "CountryInfo"
msgid "Congo"
-msgstr ""
+msgstr "Kongo"
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr ""
+msgstr "Kosta Rika"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr ""
+msgstr "Pantai Gading"
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr ""
+msgstr "Kroasia"
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr ""
+msgstr "Siprus"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr ""
+msgstr "Republik Ceko"
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr ""
+msgstr "Denmark"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr ""
+msgstr "Republik Dominika"
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr ""
+msgstr "Ekuador"
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr ""
+msgstr "Mesir"
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Equatorial Guinea"
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
msgctxt "CountryInfo"
msgid "France"
-msgstr ""
+msgstr "Perancis"
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
msgctxt "CountryInfo"
msgid "Germany"
-msgstr ""
+msgstr "Jerman"
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
msgctxt "CountryInfo"
msgid "Israel"
-msgstr ""
+msgstr "Israel"
msgctxt "CountryInfo"
msgid "Italy"
-msgstr ""
+msgstr "Italia"
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
msgctxt "CountryInfo"
msgid "Japan"
-msgstr ""
+msgstr "Jepang"
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr ""
+msgstr "Yordania"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgistan"
msgctxt "CountryInfo"
msgid "Laos"
-msgstr ""
+msgstr "Laos"
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr ""
+msgstr "Latvia"
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr ""
+msgstr "Lithuania"
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr ""
+msgstr "Luxembourg"
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr ""
+msgstr "Makedonia"
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr ""
+msgstr "Mali"
msgctxt "CountryInfo"
msgid "Malta"
-msgstr ""
+msgstr "Malta"
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr ""
+msgstr "Kepulauan Marshall"
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr ""
+msgstr "Mikronesia"
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr ""
+msgstr "Moldova"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr ""
+msgstr "Maroko"
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr ""
+msgstr "Belanda"
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr ""
+msgstr "Selandia Baru"
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragua"
msgctxt "CountryInfo"
msgid "Niger"
-msgstr ""
+msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr ""
+msgstr "Norwegia"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr ""
+msgstr "Oman"
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr ""
+msgstr "Palau"
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr ""
+msgstr "Palestina"
msgctxt "CountryInfo"
msgid "Panama"
-msgstr ""
+msgstr "Panama"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nugini"
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
msgctxt "CountryInfo"
msgid "Peru"
-msgstr ""
+msgstr "Peru"
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr ""
+msgstr "Pilipina"
msgctxt "CountryInfo"
msgid "Poland"
-msgstr ""
+msgstr "Polandia"
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
msgctxt "CountryInfo"
msgid "Romania"
-msgstr ""
+msgstr "Rumania"
msgctxt "CountryInfo"
msgid "Russia"
-msgstr ""
+msgstr "Rusia"
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr ""
+msgstr "Saint Kitts and Nevis"
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr ""
+msgstr "Saint Vincent and Grenadines"
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr ""
+msgstr "Sao Tome & Principe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr ""
+msgstr "Arab Saudi"
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr ""
+msgstr "Serbia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr ""
+msgstr "Sisilia"
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr ""
+msgstr "Singapura"
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr ""
+msgstr "Slowakia"
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr ""
+msgstr "Slovenia"
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr ""
+msgstr "Kepulauan Solomon"
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr ""
+msgstr "Afrika Selatan"
msgctxt "CountryInfo"
msgid "Spain"
-msgstr ""
+msgstr "Spanyol"
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr ""
+msgstr "Swedia"
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr ""
+msgstr "Switzerland"
msgctxt "CountryInfo"
msgid "Syria"
-msgstr ""
+msgstr "Suriah"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr ""
+msgstr "Tanzania"
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr ""
+msgstr "Thailand"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr ""
+msgstr "Timor-Leste (Timor Timur)"
msgctxt "CountryInfo"
msgid "Togo"
-msgstr ""
+msgstr "Togo"
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr ""
+msgstr "Trinidad dan Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr ""
+msgstr "Turki"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr ""
+msgstr "Ukraina"
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr ""
+msgstr "Uni Emirat Arab"
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr ""
+msgstr "Inggris"
msgctxt "CountryInfo"
msgid "United States"
-msgstr ""
+msgstr "Amerika Serikat"
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr ""
+msgstr "Vatikan"
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr ""
+msgstr "Sahara Barat"
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr ""
+msgstr "Yaman"
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
msgctxt "CountryInfo"
msgid "Albania"
-msgstr ""
+msgstr "Albania"
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr ""
+msgstr "Aljazair"
msgctxt "CountryInfo"
msgid "Austria"
-msgstr ""
+msgstr "Austria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
msgctxt "CountryInfo"
msgid "Benin"
-msgstr ""
+msgstr "Benin"
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopia"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
-msgstr ""
+msgstr "Finlandia"
msgctxt "CountryInfo"
msgid "Greece"
-msgstr ""
+msgstr "Yunani"
msgctxt "CountryInfo"
msgid "Guam"
-msgstr ""
+msgstr "Guam"
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr ""
+msgstr "Hongaria"
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr ""
+msgstr "Islandia"
msgctxt "CountryInfo"
msgid "India"
-msgstr ""
+msgstr "India"
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
msgctxt "CountryInfo"
msgid "Iran"
-msgstr ""
+msgstr "Iran"
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr ""
+msgstr "Irak"
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr ""
+msgstr "Irlandia"
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr ""
+msgstr "Korea Utara"
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr ""
+msgstr "Korea Selatan"
msgctxt "CountryInfo"
msgid "Libya"
-msgstr ""
+msgstr "Libya"
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr ""
+msgstr "Maladewa"
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr ""
+msgstr "Meksiko"
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Menyampaikan Laporan kerusakan"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "Vidalia mengalami galat dan dibutuhkan untuk menutup"
msgctxt "CrashReportDialog"
msgid ""
@@ -1279,46 +1281,54 @@ msgid ""
"report does not contain any personally identifying information, but your "
"connection to the crash reporting server may not be anonymous."
msgstr ""
+"Sebuah laporan kecelakaan telah diciptakan yang secara otomatis Anda dapat "
+"mengirim ke pengembang Vidalia untuk membantu mengidentifikasi dan "
+"memperbaiki masalah. Laporan disampaikan tidak mengandung informasi pribadi,"
+" tapi koneksi Anda ke server pelaporan kecelakaan mungkin tidak anonim."
msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
msgstr ""
+"Silakan juga menggambarkan apa yang Anda lakukan sebelum aplikasi jatuh "
+"(opsional):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "Kirim laporan kerusakan saya ke pengembang Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "Restart Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr ""
+msgstr "Jangan Restart"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Tidak dapat me-restart Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
+"Kami tidak dapat secara otomatis restart Vidalia. Silahkan restart Vidalia "
+"secara manual."
msgctxt "CrashReportUploader"
msgid "Connecting..."
-msgstr ""
+msgstr "Menyambung ..."
msgctxt "CrashReportUploader"
msgid "Sending crash report..."
-msgstr ""
+msgstr "Mengirim laporan kerusakan..."
msgctxt "CrashReportUploader"
msgid "Receiving response..."
-msgstr ""
+msgstr "Menerima respon ..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1342,7 +1352,11 @@ msgstr "Jalankan Vidalia ketika sistem saya berjalan"
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Browse"
+msgstr "Jelajah"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Jalankan software Tor ketika Vidalia berjalan"
msgctxt "GeneralPage"
msgid "Tor"
@@ -1362,19 +1376,15 @@ msgstr "Proxy Application Arguments:"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr ""
+msgstr "Software Updates"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr ""
+msgstr "Periksa untuk pembaruan perangkat lunak baru secara otomatis"
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
+msgstr "Periksa Sekarang"
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1394,11 +1404,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr ""
+msgstr "Terima:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr ""
+msgstr "Terkirim:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1526,7 +1536,7 @@ msgstr "Dokumen ditemukan"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr ""
+msgstr "Error Memuat Isi Bantuan:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1560,7 +1570,7 @@ msgstr ""
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr ""
+msgstr "Error membuka file bantuan:"
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1600,27 +1610,27 @@ msgstr "Tidak diketahui"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr ""
+msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr ""
+msgstr "Pemberitahuan"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Peringatan"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Kesalahan"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr ""
+msgstr "Tidak diketahui"
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1663,6 +1673,34 @@ msgid "New Identity"
msgstr "Identitas Baru"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1671,6 +1709,10 @@ msgid "View"
msgstr "Tampilan"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Bantuan Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Error menjalankan browser"
@@ -1783,6 +1825,10 @@ msgid "Tor is shutting down"
msgstr "Tor mati"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Hentikan Tor Sekarang"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Hentikan Tor"
@@ -1820,148 +1866,246 @@ msgstr "Relay diaktifkan"
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr ""
+msgstr "Kesalahan Shutting Down"
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr ""
+msgstr "Vidalia tidak dapat menghentikan perangkat lunak Tor."
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr ""
+msgstr "Kesalahan tak terduga"
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr ""
+msgstr "Otentikasi untuk Tor"
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr ""
+msgstr "Diperlukan Cookie Otentikasi "
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
+"Perangkat lunak Tor memerlukan Vidalia untuk mengirim isi dari cookie "
+"otentikasi, tapi Vidalia tidak dapat menemukannya."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
+msgstr "Apakah Anda ingin menelusuri sendiri 'control_auth_cookie' file?"
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr ""
+msgstr "Direktori Data"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr ""
+msgstr "Cookie Control (control_auth_cookie)"
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr ""
+msgstr "Kesalahan memasukkan agenda"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
+"Vidalia tidak dapat mendaftar untuk beberapa bagian. Banyak fitur Vidalia "
+"mungkin tidak tersedia."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Kesalahan Otentikasi "
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia tidak dapat mengotentikasi Perangkat Lunak Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Silakan periksa pengaturan kontrol port otentikasi Anda."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr ""
+msgstr "Tor Update Tersedia"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
+"Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan. "
+"Silakan kunjungi website Tor untuk mendownload versi terbaru."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr ""
+msgstr "Situs web Tor: %1"
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
+msgstr "Semua koneksi berikutnya akan tampil berbeda dari koneksi lama Anda."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr ""
+msgstr "Gagal membuat Identitas Baru"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr ""
+msgstr "Gagal Penerusan Port"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
+msgstr "Vidalia tidak dapat mengkonfigurasi port terusan otomatis."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr ""
+msgstr "Panel Kontrol Vidalia "
msgctxt "MainWindow"
msgid "Status"
-msgstr ""
+msgstr "Status"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Cara Pintas Vidalia "
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Setup Relay\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Mengatur relay dan membantu jaringan tumbuh"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Lihat Jaringan"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Lihat peta jaringan Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Gunakan Identitas Baru"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Membuat sambungan berikutnya muncul seperti baru"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Lihat penggunaan bandwidth terbaru"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Lihat log rekaman pesan"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Lihat dokumentasi bantuan"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Konfigurasi Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Lihat versi dan informasi lisensi"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Keluar Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Tampilkan jendela ini pada startup"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Sembunyikan"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Sembunyikan jendela ini"
msgctxt "MainWindow"
msgid "Password Reset Failed"
+msgstr "Password Reset Gagal"
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
msgstr ""
+"Vidalia mencoba untuk mereset password kontrol Tor, tetapi tidak dapat me-"
+"restart perangkat lunak Tor. Silakan cek Task Manager untuk memastikan tidak"
+" ada proses Tor lain yang berjalan."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
+"Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
msgstr ""
+"Apakah Anda ingin memeriksa apakah paket baru tersedia untuk instalasi?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr ""
+msgstr "Koneksi Berpotensi Tidak Aman"
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
+msgstr "Tor secara otomatis menutup koneksi untuk melindungi penyamaran Anda."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr ""
+msgstr "Perbarui Gagal"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr ""
+msgstr "Perangkat lunak Anda telah terbarui"
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
+"Tidak ada paket perangkat lunak baru Tor tersedia untuk komputer Anda saat "
+"ini."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr ""
+msgstr "Instalasi Gagal"
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr ""
+msgstr "Vidalia tidak dapat menginstal pembaruan perangkat lunak Anda."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr ""
+msgstr "Kesalahan berikut terjadi:"
msgctxt "MainWindow"
msgid ""
"One of your applications%1appears to be making a potentially unencrypted and"
" unsafe connection to port %2."
msgstr ""
+"Salah satu aplikasi %1a Anda tampaknya berpotensi membuat sambungan tidak "
+"aman untuk port %2."
msgctxt "MainWindow"
msgid ""
@@ -1969,34 +2113,20 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
+"Segala yang dikirim melalui koneksi ini bisa dipantau. Mohon periksa "
+"konfigurasi aplikasi Anda dan hanya menggunakan protokol terenkripsi, "
+"seperti SSL, jika memungkinkan."
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "gagal (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"relay Anda munutup. Klik 'Stop' lagi untuk menghentikan relay Anda sekarang."
msgctxt "MainWindow"
msgid ""
@@ -2004,6 +2134,9 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
+"Anda sedang menjalankan relay. Mengakhiri relay Anda akan mengganggu koneksi"
+" buka dari klien. Apakah Anda ingin matikan secara sopan dan memberikan "
+"klien waktu untuk mencari relay baru?"
msgctxt "MainWindow"
msgid ""
@@ -2011,310 +2144,300 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
+"Vidalia mendeteksi bahwa perangkat lunak Tor keluar tak terduga. Silakan "
+"memeriksa log pesan untuk peringatan terbaru atau pesan kesalahan."
msgctxt "MainWindow"
msgid ", probably Telnet,"
-msgstr ""
+msgstr ", Mungkin Telnet,"
msgctxt "MainWindow"
msgid ", probably an email client,"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
+msgstr ", Mungkin klien email,"
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr ""
+msgstr "Kesalahan Setting Filter"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
+msgstr "Vidalia tidak dapat meregister log kejadian Tor's."
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr ""
+msgstr "Error Membuka File Log"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr ""
+msgstr "Vidalia tidak dapat membuka file log yang ditentukan."
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr ""
+msgstr "Log Filename Diperlukan"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+"Anda harus memasukkan sebuah nama berkas untuk dapat menyimpan pesan log ke "
+"sebuah file."
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr ""
+msgstr "Pilih Log File"
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr ""
+msgstr "Simpan Pesan Log"
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr ""
+msgstr "File teks (*. txt)"
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr ""
+msgstr "Vidalia"
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr ""
+msgstr "Cari di pesan Log"
msgctxt "MessageLog"
msgid "Find:"
-msgstr ""
+msgstr "Cari:"
msgctxt "MessageLog"
msgid "Not Found"
-msgstr ""
+msgstr "Tidak Ditemukan"
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr ""
+msgstr "Ditemukan 0 cocok."
msgctxt "MessageLog"
msgid "Message Log"
-msgstr ""
+msgstr "Log Pesan "
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr ""
+msgstr "Filter Pesan ..."
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr ""
+msgstr "Mengatur pesan filter"
msgctxt "MessageLog"
msgid "History Size..."
-msgstr ""
+msgstr "Ukuran histori ..."
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr ""
+msgstr "Tetapkan jumlah pesan maksimum untuk ditampilkan"
msgctxt "MessageLog"
msgid "Clear"
-msgstr ""
+msgstr "Hapus"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
+msgstr "Hapus semua pesan dari pesan Log (Ctrl + E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr ""
+msgstr "Ctrl + E"
msgctxt "MessageLog"
msgid "Copy"
-msgstr ""
+msgstr "Salin"
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr ""
+msgstr "Salin pesan yang dipilih ke clipboard (Ctrl + C)"
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr ""
+msgstr "Ctrl + C"
msgctxt "MessageLog"
msgid "Select All"
-msgstr ""
+msgstr "Pilih Semua"
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr ""
+msgstr "Pilih semua pesan (Ctrl + A)"
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr ""
+msgstr "Ctrl + A"
msgctxt "MessageLog"
msgid "Save All"
-msgstr ""
+msgstr "Simpan Semua"
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr ""
+msgstr "Simpan semua pesan ke file"
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr ""
+msgstr "Simpan Dipilih"
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr ""
+msgstr "Menyimpan pesan yang dipilih ke file"
msgctxt "MessageLog"
msgid "Settings"
-msgstr ""
+msgstr "Pengaturan"
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr ""
+msgstr "Sesuaikan pesan Pengaturan log"
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr ""
+msgstr "Ctrl + T"
msgctxt "MessageLog"
msgid "Help"
-msgstr ""
+msgstr "Bantuan"
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr ""
+msgstr "Tampilkan bantuan browser"
msgctxt "MessageLog"
msgid "F1"
-msgstr ""
+msgstr "F1"
msgctxt "MessageLog"
msgid "Close"
-msgstr ""
+msgstr "Tutup"
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr ""
+msgstr "Tutup pesan Log"
msgctxt "MessageLog"
msgid "Esc"
-msgstr ""
+msgstr "Esc"
msgctxt "MessageLog"
msgid "Find"
-msgstr ""
+msgstr "Cari"
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
+msgstr "Cari semua pesan yang berisi teks pencarian (Ctrl + F)"
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr ""
+msgstr "Ctrl + F"
msgctxt "MessageLog"
msgid "Time"
-msgstr ""
+msgstr "Waktu"
msgctxt "MessageLog"
msgid "Type"
-msgstr ""
+msgstr "Jenis"
msgctxt "MessageLog"
msgid "Message"
-msgstr ""
+msgstr "Pesan"
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr ""
+msgstr "Menyimpan pesan saat pengaturan Log"
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr ""
+msgstr "Simpan Pengaturan"
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr ""
+msgstr "Membatalkan perubahan yang dilakukan untuk pengaturan"
msgctxt "MessageLog"
msgid "Cancel"
-msgstr ""
+msgstr "Membatalkan"
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr ""
+msgstr "Filter pesan"
msgctxt "MessageLog"
msgid "Error"
-msgstr ""
+msgstr "Kesalahan"
msgctxt "MessageLog"
msgid "Warning"
-msgstr ""
+msgstr "Peringatan"
msgctxt "MessageLog"
msgid "Notice"
-msgstr ""
+msgstr "Pemberitahuan"
msgctxt "MessageLog"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "MessageLog"
msgid "Debug"
-msgstr ""
+msgstr "Debug"
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr ""
+msgstr "Pesan Log Sejarah"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr ""
+msgstr "Jumlah pesan untuk menampilkan di jendela log pesan"
msgctxt "MessageLog"
msgid "messages"
-msgstr ""
+msgstr "pesan"
msgctxt "MessageLog"
msgid "Browse"
-msgstr ""
+msgstr "Jelajahi"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
+msgstr "Aktifkan simpan otomatis semua pesan log baru ke sebuah file"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr ""
+msgstr "Secara otomatis menyimpan pesan log baru ke sebuah file"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr ""
+msgid "Basic"
+msgstr "Dasar"
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "Status Tor "
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Lebih lanjut"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Selalu Simpan Pesan Log Baru"
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
+"Pesan yang muncul ketika sesuatu telah sangat salah dan Tor tidak dapat "
+"dilanjutkan."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
+msgstr "Pesan yang hanya muncul ketika sesuatu yang tidak beres dengan Tor."
msgctxt "MessageLog"
msgid ""
@@ -2323,18 +2446,20 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
+"Pesan yang muncul jarang selama operasi Tor normal dan tidak dianggap "
+"sebagai kesalahan, tetapi Anda mungkin peduli."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
+msgstr "Pesan yang sering muncul selama operasi normal Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
+msgstr "Hyper-verbose pesan terutama menarik bagi pengembang Tor."
msgctxt "MessageLog"
msgid ""
@@ -2342,802 +2467,835 @@ msgid ""
"\n"
"%2."
msgstr ""
+"Tidak dapat menulis file %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Peta Jaringan"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr ""
+msgstr "Segarkan"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr ""
+msgstr "Segarkan daftar Tor relay dan koneksi"
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr ""
+msgstr "Ctrl + R"
msgctxt "NetViewer"
msgid "Help"
-msgstr ""
+msgstr "Bantuan"
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr ""
+msgstr "Tampilkan peta jaringan bantuan"
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr ""
+msgstr "Tampilkan peta jaringan bantuan"
msgctxt "NetViewer"
msgid "F1"
-msgstr ""
+msgstr "F1"
msgctxt "NetViewer"
msgid "Close"
-msgstr ""
+msgstr "Dekat"
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr ""
+msgstr "Tutup peta jaringan"
msgctxt "NetViewer"
msgid "Esc"
-msgstr ""
+msgstr "Esc"
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr ""
+msgstr "Perbesar"
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr ""
+msgstr "Zoom in pada peta jaringan"
msgctxt "NetViewer"
msgid "+"
-msgstr ""
+msgstr "+"
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr ""
+msgstr "Zoom Out"
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr ""
+msgstr "Zoom out pada peta jaringan"
msgctxt "NetViewer"
msgid "-"
-msgstr ""
+msgstr "-"
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr ""
+msgstr "Zoom Untuk Fit"
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
+msgstr "Memperbesar untuk cocok untuk semua sirkuit saat ini ditampilkan"
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr ""
+msgstr "Ctrl + Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr ""
+msgstr "Relay Tidak Ditemukan"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr ""
+msgstr "Tidak ada rincian tentang relay dipilih yang tersedia."
msgctxt "NetViewer"
msgid "Unknown"
-msgstr ""
+msgstr "Tidak diketahui"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr ""
+msgstr "Layar Penuh"
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr ""
+msgstr "Lihat peta jaringan sebagai jendela layar penuh"
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
+msgstr "Ctrl + F"
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr ""
+msgstr "Kesalahan Penghubung"
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr ""
+msgstr "Identifier Penghubung yang ditentukan tidak valid."
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr ""
+msgstr "Salin (Ctrl + C)"
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
+"Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk "
+"mengkonfigurasi Tor untuk menggunakan proxy untuk mengakses Internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
+"Anda harus menentukan satu atau lebih port yang diizinkan firewall Anda "
+"untuk terhubung."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr ""
+msgstr "'%1' bukan nomor port yang valid."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+"Periksa apakah jaringan lokal Anda memerlukan proxy untuk mengakses Internet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr ""
+msgstr "Saya menggunakan proxy untuk mengakses Internet"
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr ""
+msgstr "Pengaturan Proxy"
msgctxt "NetworkPage"
msgid "Username:"
-msgstr ""
+msgstr "Nama User:"
msgctxt "NetworkPage"
msgid "Password:"
-msgstr ""
+msgstr "Kata Kunci:"
msgctxt "NetworkPage"
msgid "Port:"
-msgstr ""
+msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+"Periksa untuk hanya melakukan koneksi ke relay menggunakan port diizinkan "
+"oleh firewall Anda"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr ""
+msgstr "Firewall saya hanya mengizinkan saya terhubung ke port tertentu"
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr ""
+msgstr "Pengaturan Firewall"
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr ""
+msgstr "Port yang diizinkan:"
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr ""
+msgstr "80, 443"
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
+"Periksa untuk mengenkripsi permintaan direktori dan, opsional, gunakan relay"
+" jembatan untuk mengakses jaringan Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr ""
+msgstr "ISP saya memblok koneksi ke jaringan Tor"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr ""
+msgstr "Pengaturan Penghubung"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr ""
+msgstr "Tambahkan sebuah Penghubung:"
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr ""
+msgstr "Lepaskan penghubung yang dipilih dari daftar"
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr ""
+msgstr "Salin penghubung dipilih ke clipboard"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr ""
+msgstr "Cari Penghubung Sekarang"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
msgstr ""
+"<a href=\"bridges.finding\">Bagaimana lagi saya bisa menemukan "
+"penghubung?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
+"<a href=\"bridges.finding\">Bagaimana saya dapat menemukan penghubung?</a>"
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
+"Tidak ada penghubung baru yang saat ini tersedia. Anda dapat menunggu "
+"beberapa saat lalu coba lagi, atau mencoba metode lain untuk menemukan "
+"penghubung baru."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
+"Klik Bantuan untuk melihat metode lain untuk menemukan penghubung baru."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr ""
+msgstr "Alamat:"
msgctxt "NetworkPage"
msgid "Type:"
-msgstr ""
+msgstr "Tipe:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr ""
+msgstr "Anda harus memilih jenis proxy."
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr ""
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
-msgstr ""
+msgstr "terima"
msgctxt "Policy"
msgid "reject"
-msgstr ""
+msgstr "tolak"
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr ""
+msgstr "Online"
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr ""
+msgstr "Hibernate"
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr ""
+msgstr "Offline"
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr ""
+msgstr "Lokasi:"
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr ""
+msgstr "Alamat IP:"
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr ""
+msgstr "Platform:"
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr ""
+msgstr "Bandwidth:"
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr ""
+msgstr "Uptime:"
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr ""
+msgstr "Terakhir Diperbarui:"
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr ""
+msgstr "Salin"
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr ""
+msgstr "Hibernasi"
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr ""
+msgstr "Online"
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr ""
+msgstr "Offline"
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr ""
+msgstr "Relay Details"
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr ""
+msgstr "Ringkasan"
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr ""
+msgstr "Nama:"
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr ""
+msgstr "Status:"
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr ""
+msgstr "Lokasi:"
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr ""
+msgstr "Alamat IP:"
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr ""
+msgstr "Platform:"
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr ""
+msgstr "Bandwidth:"
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr ""
+msgstr "Uptime:"
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr ""
+msgstr "Kontak:"
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr ""
+msgstr "Terakhir Diperbarui:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr ""
+msgstr "Descriptor"
msgctxt "RouterListItem"
msgid "Offline"
-msgstr ""
+msgstr "Offline"
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr ""
+msgstr "Hibernate"
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB / s"
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr ""
+msgstr "Relay"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr ""
+msgstr "Zoom untuk Relay"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr ""
+msgstr "%1 relay online"
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr ""
+msgstr "Salin"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr ""
+msgstr "Julukan"
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr ""
+msgstr "Sidik jari"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr ""
+msgstr "Penghubung Dukungan Tidak Tersedia"
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
+"Anda telah mengkonfigurasi Tor untuk bertindak sebagai penghubung relay "
+"untuk pengguna disensor, namun versi Anda Tor tidak mendukung penghubung."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
+"Silakan meng-upgrade perangkat lunak atau mengkonfigurasi Tor untuk "
+"bertindak sebagai relay Tor normal."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr ""
+msgstr "relay jembatan anda tidak aktif."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr ""
+msgstr "Anda harus menentukan paling tidak nama panggilan relay dan port."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr ""
+msgstr "Jalankan hanya sebagai klien"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Lalu lintas relay untuk jaringan Tor"
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr ""
+msgstr "Port Relay:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr ""
+msgstr "Hidupkan untuk dapat mirrir direktori"
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr ""
+msgstr "Mencoba untuk secara otomatis mengkonfigurasi penerusan port "
msgctxt "ServerPage"
msgid "Test"
-msgstr ""
+msgstr "Tes"
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr ""
+msgstr "Tampilkan topik bantuan di port forwarding"
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr ""
+msgstr "Direktori Port:"
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr ""
+msgstr "Direktori Nomor Port"
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr ""
+msgstr "Info Kontak:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr ""
+msgstr "Nama relay Anda"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+"Port di mana pengguna dan relay lain dapat berkomunikasi dengan relay Anda"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr ""
+msgstr "Nickname:"
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr ""
+msgstr "Pengaturan Dasar"
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
+"Untuk koneksi Internet dengan kecepatan download cepat tetapi lambat upload,"
+" silahkan isi di sini kecepatan upload anda."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr ""
+msgstr "Kabel / DSL 256 Kbps"
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr ""
+msgstr "Kable / DSL 512 Kbps"
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr ""
+msgstr "Kable / DSL 768 Kbps"
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr ""
+msgstr "T1/Kable/DSL 1.5 Mbps"
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr ""
+msgstr "> 1.5 Mbps"
msgctxt "ServerPage"
msgid "Custom"
-msgstr ""
+msgstr "Sesukanya"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
+msgstr "Pilih entri yang paling menyerupai koneksi Internet Anda"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr ""
+msgstr "Tampilkan topik bantuan pada tingkat batas bandwidth"
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr ""
+msgstr "Kecepatan Rata-rata"
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr ""
+msgstr "Rata-rata Batas bandwith jangka panjang "
msgctxt "ServerPage"
msgid "KB/s"
-msgstr ""
+msgstr "KB / s"
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr ""
+msgstr "Kecepatan Maksimum"
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr ""
+msgstr "Batas tingkat kecepatan bandwidth"
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
+"Kecepatan bandwidth maksimum Anda harus lebih besar dari atau sama dengan "
+"bandwidth rata-rata. Kedua nilai harus minimal 20 KB / s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Batas Bandwidth "
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
+msgstr "Ports 6660 - 6669 dan 6697"
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "Internet Relay Chat (IRC)"
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr ""
+msgstr "Port 110, 143, 993 dan 995"
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "Ambil Mail (POP, IMAP)"
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr ""
+msgstr "Port tidak ditentukan oleh checkbox lain"
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr ""
+msgstr "servis lain-lainnya"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
+msgstr "Port 706, 1863, 5050, 5190, 5222, 5223, 8300 dan 8888"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "Pesan Instan (IM)"
msgctxt "ServerPage"
msgid "Port 443"
-msgstr ""
+msgstr "Port 443"
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "Situs Web Aman (SSL)"
msgctxt "ServerPage"
msgid "Port 80"
-msgstr ""
+msgstr "Port 80"
msgctxt "ServerPage"
msgid "Websites"
-msgstr ""
+msgstr "Situs Web"
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr ""
+msgstr "Tampilkan topik bantuan mengenai kebijakan keluar"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
+"Apa sumber daya Internet harus pengguna akan dapat Anda akses dari relay?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
+"Tor masih akan memblokir beberapa surat keluar dan file berbagi aplikasi "
+"secara default untuk mengurangi spam dan penyalahgunaan lainnya."
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr ""
+msgstr "Kebijakan Keluar "
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
msgstr ""
+"Biarkan orang lain akses penghubung Anda dengan memberikan mereka baris ini:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
+"Ini adalah identitas relay penghubung yang dapat Anda berikan kepada orang "
+"lain"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
+msgstr "Salin relay penghubung identitas Anda ke clipboard"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr ""
+msgstr "Tidak ada Penggunaan terbaru"
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "Tidak ada klien yang menggunakan relay anda sekarang."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
+"Tinggalkan relay Anda berjalan sehingga klien memiliki kesempatan yang lebih"
+" baik untuk menemukan dan menggunakannya."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr ""
+msgstr "Histori Penghubung"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
+msgstr "Vidalia tidak dapat mengambil sejarah penggunaan penghubung Anda."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
+"Tor kembali respon tidak diformat dengan benar ketika diminta Vidalia "
+"sejarah penggunaan penghubung Anda."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr ""
+msgstr "Respon yang dikembalikan:%1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
+msgstr "Bantu pengguna disensor menjangkau jaringan Tor"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
+"<a href=\"#bridgeUsage\">Siapa yang telah menggunakan penghubung saya?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Apa ini?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
+msgstr "Secara otomatis mendistribusikan alamat penghubung saya"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr ""
+msgstr "Mirror Direktori Relay"
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
+"Alamat email di mana Anda bisa dihubungi jika ada masalah dengan relay Anda."
+" Anda juga mungkin mencakup sidik jari Anda PGP atau GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
+msgstr "Kesalahan ketika mencoba untuk membatalkan publikasi semua layanan"
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
+"Harap mengkonfigurasi setidaknya sebuah direktori layanan dan port virtual "
+"untuk setiap layanan yang ingin Anda simpan. Lepaskan yang lain."
msgctxt "ServicePage"
msgid "Error"
-msgstr ""
+msgstr "Kesalahan"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr ""
+msgstr "Silakan pilih Layanan."
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr ""
+msgstr "Pilih Direktori Layanan"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
+msgstr "Port Virtual hanya dapat berisi nomor port yang valid [1 .. 65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
+msgstr "Target hanya dapat berisi alamat: port, alamat, atau port."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr ""
+msgstr "Direktori sudah digunakan oleh layanan lain."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Form"
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr ""
+msgstr "Diperoleh Layanan Tersembunyi "
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr ""
+msgstr "Alamat Onion"
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr ""
+msgstr "Port Virtual "
msgctxt "ServicePage"
msgid "Target"
-msgstr ""
+msgstr "Sasaran"
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr ""
+msgstr "Path Direktori"
msgctxt "ServicePage"
msgid "Enabled"
-msgstr ""
+msgstr "Diaktifkan"
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr ""
+msgstr "Tambahkan layanan baru ke daftar"
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr ""
+msgstr "Hapus layanan yang dipilih dari daftar"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr ""
+msgstr "Salin alamat onion layanan terpilih ke clipboard"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+"Jelajahi dalam sistem file lokal dan direktori memilih untuk layanan yang "
+"dipilih"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr ""
+msgstr "Dibuat oleh Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Salin ke Clipboard"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Perangkat Lunak Tor adalah Lari"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Perangkat Lunak Tor tidak berjalan"
msgctxt "StatusEventWidget"
msgid ""
@@ -3145,6 +3303,9 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
+"Klik \"Start Tor\" di Vidalia Control Panel untuk me-restart perangkat lunak"
+" Tor. Jika Tor keluar tak terduga, pilih \"Advanced\" tab di atas untuk "
+"rincian tentang kesalahan apapun yang dihadapi."
msgctxt "StatusEventWidget"
msgid ""
@@ -3153,6 +3314,9 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
+"Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang tidak "
+"lagi dianjurkan. Silakan upgrade ke versi terbaru yang mungkin berisi "
+"keamanan, kehandalan dan perbaikan kinerja yang lebih baik."
msgctxt "StatusEventWidget"
msgid ""
@@ -3161,30 +3325,39 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
+"Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang mungkin "
+"tidak lagi bekerja dengan jaringan Tor saat ini. Silakan upgrade ke versi "
+"terbaru dari perangkat lunak, yang mungkin berisi keamanan , kehandalan dan "
+"perbaikan kinerja yang lebih baik."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Perangkat lunak Tor anda tidak up-to-date."
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Terhubung ke Jaringan Tor"
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
+"Kami berhasil membuat sambungan ke jaringan Tor. Anda sekarang dapat "
+"mengkonfigurasi aplikasi Anda untuk menggunakan Internet secara anonim."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor Software Error"
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
+"Perangkat lunak Tor mengalami sebuah bug internal. Silahkan melaporkan pesan"
+" kesalahan berikut ini untuk para pengembang Tor di bugs.torproject.org: "
+"\"%1\"\n"
msgctxt "StatusEventWidget"
msgid ""
@@ -3193,6 +3366,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di "
+"masa lalu dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor "
+"tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan waktu"
+" yang tepat."
msgctxt "StatusEventWidget"
msgid ""
@@ -3201,10 +3378,14 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di "
+"masa depan dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor"
+" tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan "
+"waktu yang tepat."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Jam Komputer Anda adalah Berpotensi Salah"
msgctxt "StatusEventWidget"
msgid ""
@@ -3213,6 +3394,10 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
+"Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat "
+"koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi "
+"enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan. Untuk "
+"perlindungan anda, Tor secara otomatis menutup koneksi ini."
msgctxt "StatusEventWidget"
msgid ""
@@ -3220,10 +3405,13 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
+"Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat "
+"koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi "
+"enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Berpotensi Koneksi Berbahaya !"
msgctxt "StatusEventWidget"
msgid ""
@@ -3232,10 +3420,14 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
+"Salah satu aplikasi Anda membentuk koneksi melalui Tor untuk \"%1\" "
+"menggunakan sebuah protokol yang dapat bocor informasi tentang tujuan Anda. "
+"Pastikan Anda mengkonfigurasi aplikasi Anda untuk menggunakan hanya SOCKS4a "
+"atau SOCKS5 dengan resolusi hostname remote."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "Unknown SOCKS Protokol"
msgctxt "StatusEventWidget"
msgid ""
@@ -3243,10 +3435,14 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
+"Salah satu aplikasi Anda mencoba untuk membuat sambungan melalui Tor "
+"menggunakan protokol yang Tor tidak mengerti. Pastikan Anda mengkonfigurasi "
+"aplikasi Anda untuk menggunakan hanya SOCKS4a atau SOCKS5 dengan resolusi "
+"hostname remote."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "Hostname Tujuan tidak valid "
msgctxt "StatusEventWidget"
msgid ""
@@ -3254,10 +3450,13 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
+"Salah satu aplikasi Anda mencoba untuk membuat koneksi melalui Tor untuk "
+"\"%1\", yang Tor tidak mengakui sebagai nama host yang valid. Silakan "
+"periksa konfigurasi aplikasi Anda."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr ""
+msgstr "Eksternal IP Address Berubah"
msgctxt "StatusEventWidget"
msgid ""
@@ -3265,10 +3464,13 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
+"Tor telah menetapkan alamat publik IP relay anda saat ini %1%2. Jika itu "
+"tidak benar, silakan mempertimbangkan pengaturan opsi 'Alamat' pada "
+"konfigurasi relay Anda."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "Pembajakan DNS Terdeteksi"
msgctxt "StatusEventWidget"
msgid ""
@@ -3276,6 +3478,10 @@ msgid ""
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
msgstr ""
+"Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu "
+"untuk domain yang tidak ada. Beberapa ISP dan lainnya DNS penyedia, seperti "
+"OpenDNS, diketahui untuk melakukan ini dalam rangka untuk menampilkan "
+"pencarian mereka sendiri atau halaman iklan."
msgctxt "StatusEventWidget"
msgid ""
@@ -3283,10 +3489,14 @@ msgid ""
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
msgstr ""
+"Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu "
+"untuk domain terkenal. Karena klien mengandalkan jaringan Tor relay untuk "
+"memberikan repsonses akurat DNS, relay Anda tidak akan dikonfigurasi sebagai"
+" relay keluar."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Memeriksa jangkauan Port Server"
msgctxt "StatusEventWidget"
msgid ""
@@ -3294,18 +3504,21 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
+"Tor sedang mencoba untuk menentukan apakah port server relay anda dapat "
+"dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. "
+"Tes ini bisa memakan waktu beberapa menit."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Port Server reachability Test Sukses!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "port server relay Anda adalah dicapai dari jaringan Tor!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Port Server reachability Test Gagal"
msgctxt "StatusEventWidget"
msgid ""
@@ -3314,10 +3527,14 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
+"port server relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya. "
+"Hal ini dapat terjadi jika Anda berada di belakang router atau firewall yang"
+" mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak benar "
+"alamat IP dan port server, periksa konfigurasi relay Anda."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Memeriksa jangkauan Port Direktori"
msgctxt "StatusEventWidget"
msgid ""
@@ -3325,18 +3542,21 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
+"Tor sedang mencoba untuk menentukan apakah port direktori relay Anda dapat "
+"dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. "
+"Tes ini bisa memakan waktu beberapa menit."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Direktori Port reachability Test Sukses!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "Port Direktori relay Anda dapat dicapai dari jaringan Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Test Jangkauan Port Direktori Gagal"
msgctxt "StatusEventWidget"
msgid ""
@@ -3345,20 +3565,26 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
+"Direktori port relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya."
+" Hal ini dapat terjadi jika Anda berada di belakang router atau firewall "
+"yang mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak "
+"benar alamat IP dan port direktori, periksa konfigurasi relay Anda."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Relay Descriptor Ditolak"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
+"deskripsi relay Anda, yang memungkinkan klien untuk terhubung ke relay Anda,"
+" ditolak oleh server direktori di %1:%2. Alasan yang diberikan adalah:%3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr ""
+msgstr "Relay Anda Online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3367,406 +3593,371 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
+"relay Anda sekarang online dan tersedia untuk Tor klien untuk digunakan. "
+"Anda akan melihat peningkatan lalu lintas jaringan yang ditampilkan oleh "
+"Grafik Bandwidth dalam beberapa jam sebagai klien lebih belajar tentang "
+"relay Anda. Terima kasih atas kontribusi ke jaringan Tor!"
msgctxt "Stream"
msgid "New"
-msgstr ""
+msgstr "Baru"
msgctxt "Stream"
msgid "Resolving"
-msgstr ""
+msgstr "Menyelesaikan"
msgctxt "Stream"
msgid "Connecting"
-msgstr ""
+msgstr "Menghubungkan"
msgctxt "Stream"
msgid "Open"
-msgstr ""
+msgstr "Buka"
msgctxt "Stream"
msgid "Failed"
-msgstr ""
+msgstr "Gagal"
msgctxt "Stream"
msgid "Closed"
-msgstr ""
+msgstr "Tertutup"
msgctxt "Stream"
msgid "Retrying"
-msgstr ""
+msgstr "Mencoba lagi"
msgctxt "Stream"
msgid "Remapped"
-msgstr ""
+msgstr "Dipetakan Ulang"
msgctxt "Stream"
msgid "Unknown"
-msgstr ""
-
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
+msgstr "Tidak diketahui"
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
-msgstr ""
+msgstr "Proses %1 gagal menghentikan. [%2]"
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr ""
+msgstr "Layanan Tor tidak terpasang."
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr ""
+msgstr "Tidak dapat memulai layanan Tor."
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr ""
+msgstr "Gagal hash password kontrol."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr ""
+msgstr "Mengedit torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
+"Simpan pengaturan. Jika dicentang itu hanya akan menerapkan setelan ke "
+"instance Tor saat ini."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Potong"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Salin"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Tempel"
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr ""
+msgstr "Undo"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr ""
+msgstr "Redo"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Pilih Semua"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr ""
+msgstr "Terapkan semua"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr ""
+msgstr "Terapkan terpilih"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Kesalahan koneksi ke Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
+"Seleksi kosong. Silakan pilih beberapa teks, atau periksa \"Terapkan semua\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Error pada baris %1: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Kesalahan"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
+msgstr "Kesalahan terjadi ketika membuka file torrc"
msgctxt "UPNPControl"
msgid "Success"
-msgstr ""
+msgstr "Sukses"
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Tidak ditemukan perangkat Aktif UPnP"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
+msgstr "Tidak berlaku diaktifkan UPnP-perangkat Internet gateway ditemukan"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr ""
+msgstr "WSAStartup gagal"
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr ""
+msgstr "Gagal menambahkan pemetaan port"
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr ""
+msgstr "Gagal mengambil pemetaan port"
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr ""
+msgstr "Gagal menghapus pemetaan port"
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr ""
+msgstr "Error tidak diketahui"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr ""
+msgstr "Menemukan perangkat aktif UPnP-"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr ""
+msgstr "Memperbarui pemetaan direktori port"
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr ""
+msgstr "Memperbarui pemetaan relay port"
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr ""
+msgstr "Test selesai dengan sukses!"
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr ""
+msgstr "Pengujian Dukungan UPnP"
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr ""
+msgstr "Pengujian Dukungan Universal Plug and Play "
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
+"Vidalia tidak dapat memeriksa pembaruan perangkat lunak yang tersedia karena"
+" tidak bisa menemukan '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
+"Vidalia tidak mampu untuk memeriksa pembaruan perangkat lunak yang tersedia "
+"karena proses update Tor tertutup secara tak terduga."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr ""
+msgstr "Memeriksa pembaruan yang tersedia ..."
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr ""
+msgstr "Sembunyikan"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr ""
+msgstr "Men-download pembaruan ..."
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr ""
+msgstr "Menginstal update software ..."
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "Selesai! Perangkat lunak Anda sekarang up to date."
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr ""
+msgstr "OK"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr ""
+msgstr "Software Updates"
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr ""
+msgstr "Memeriksa update ..."
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr ""
+msgstr "Membatalkan"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr ""
+msgstr "Software Updates Tersedia"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr ""
+msgstr "Ingatkan Saya Nanti"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr ""
+msgstr "Menginstal"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
+msgstr "Paket perangkat lunak berikut diperbarui siap untuk instalasi:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr ""
+msgstr "Paket"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr ""
+msgstr "Versi"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "Mengupload Laporan kerusakan"
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "Tidak dapat mengirim laporan:%1"
msgctxt "VMessageBox"
msgid "OK"
-msgstr ""
+msgstr "OK"
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr ""
+msgstr "Batal"
msgctxt "VMessageBox"
msgid "Yes"
-msgstr ""
+msgstr "Ya"
msgctxt "VMessageBox"
msgid "No"
-msgstr ""
+msgstr "Tidak ada"
msgctxt "VMessageBox"
msgid "Help"
-msgstr ""
+msgstr "Bantuan"
msgctxt "VMessageBox"
msgid "Retry"
-msgstr ""
+msgstr "Coba Lagi"
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr ""
+msgstr "Tampilkan Log"
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr ""
+msgstr "Tampilkan Setting"
msgctxt "VMessageBox"
msgid "Continue"
-msgstr ""
+msgstr "Lanjutkan"
msgctxt "VMessageBox"
msgid "Quit"
-msgstr ""
+msgstr "Berhenti"
msgctxt "VMessageBox"
msgid "Browse"
-msgstr ""
+msgstr "Jelajahi"
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr ""
+msgstr "Argumen tidak valid"
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr ""
+msgstr "Vidalia sudah berjalan"
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr ""
+msgstr "Menampilkan pesan penggunaan ini dan keluar."
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr ""
+msgstr "Mereset SEMUA pengaturan Vidalia yang tersimpan ."
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
+msgstr "Mengatur direktori Vidalia menggunakan untuk file data."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
+msgstr "Mengatur nama dan lokasi pidfile Vidalia's."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
+msgstr "Mengatur nama dan lokasi Vidalia's logfile."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
+msgstr "Mengatur verbositas log Vidalia."
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr ""
+msgstr "Atur gaya antarmuka Vidalia."
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr ""
+msgstr "Atur bahasa Vidalia."
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr ""
+msgstr "Informasi Penggunaan Vidalia "
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr ""
+msgstr "Tidak dapat membuka '%1' log file: %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Kode Bahasa yang ditentukan tidak valid:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Gaya GUI yang ditentukan tidak valid:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Tinglkat Log yang ditentukan tidak valid:"
msgctxt "Vidalia"
msgid ""
@@ -3774,35 +3965,40 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
+"Proses lain Vidalia ini mungkin sudah berjalan. Jika tidak benar ada proses "
+"lain Vidalia berjalan, Anda dapat memilih untuk melanjutkan pula. Apakah "
+"Anda ingin melanjutkan mulai Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr ""
+msgstr "%1 detik"
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr ""
+msgstr "%1 B / s"
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr ""
+msgstr "%1 KB / s"
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr ""
+msgstr "%1 MB / s"
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr ""
+msgstr "%1 GB / "
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr ""
+msgstr "%1 hari"
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr ""
+msgstr "%1 jam"
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr ""
+msgstr "%1 menit"
+
+
diff --git a/src/vidalia/i18n/po/is/vidalia_is.po b/src/vidalia/i18n/po/is/vidalia_is.po
index 11da7fe..0326b2e 100755
--- a/src/vidalia/i18n/po/is/vidalia_is.po
+++ b/src/vidalia/i18n/po/is/vidalia_is.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:00+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr "Sýna stillingar"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Bandvíddarnotkun Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Endurstilla"
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Hætta við"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Lykilorð er nauðsynlegt"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Muna lykilorðið mitt"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Keyra upp Tor þegar Vidalia er ræst"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1655,6 +1647,34 @@ msgid "New Identity"
msgstr "Nýtt auðkenni"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1663,6 +1683,10 @@ msgid "View"
msgstr "Sýn"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia hjálp"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Tókst ekki að ræsa vefskoðara"
@@ -1775,6 +1799,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1885,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1937,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2076,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2356,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2411,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2514,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2839,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3087,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3131,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3423,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3459,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3537,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3815,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/it/vidalia_it.po b/src/vidalia/i18n/po/it/vidalia_it.po
index f910bba..8a1c46e 100644
--- a/src/vidalia/i18n/po/it/vidalia_it.po
+++ b/src/vidalia/i18n/po/it/vidalia_it.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:28+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -237,6 +238,10 @@ msgid "Show Settings"
msgstr "Mostra Impostazioni"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Utilizzo di banda di Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reinizializza"
@@ -276,10 +281,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annulla"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Inizio la richiesta HTTPS di bridge..."
@@ -433,27 +434,20 @@ msgid "Control socket is not connected."
msgstr "Il socket di controllo non è connesso."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Password richiesta"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Ricorda la mia password"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia si è collegato a un processo Tor in corse che richiede una password."
+" Inserisci la tua password di controllo:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1349,6 +1343,10 @@ msgid "Browse"
msgstr "Sfoglia"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Avvia Tor quando Vidalia viene avviato"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1376,10 +1374,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Controlla adesso"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1667,6 +1661,34 @@ msgid "New Identity"
msgstr "Nuova identità"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1675,6 +1697,10 @@ msgid "View"
msgstr "Mostra"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Aiuto di Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Errore nell'avvio del browser web"
@@ -1787,6 +1813,10 @@ msgid "Tor is shutting down"
msgstr "Arresto di Tor in corso"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Ferma Tor adesso"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Ferma Tor"
@@ -1876,6 +1906,19 @@ msgstr ""
" Vidalia potrebbero non essere disponibili"
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Errore di autenticazione"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia non è riuscito ad autenticarsi al software Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"Verificare le impostazioni di autenticazione per la porta di controllo."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "È disponibile un aggiornamento di Tor"
@@ -1918,11 +1961,85 @@ msgid "Status"
msgstr "Stato"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Shortcut di Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Configurazione del relaying\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Imposta un relay e aiuta la rete a crescere"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Mostra la rete"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Mostra una mappa della rete Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Usa una nuova identità"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Fai apparire come nuove le prossime connessioni"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Guarda l'utilizzo recente della banda"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Guarda la cronologia dei messaggi di log"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Mostra la documentazione"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Configura Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Mostra informazioni sulla versione e sulla licenza"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Esci da Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Mostra questa finestra all'avvio"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Nascondi"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Nasconde questa finestra"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Reset della password fallito"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia ha provato a resettare la password di controllo di Tor, ma non è "
+"riuscito a riavviare Tor. Controlla il tuo Task Manager per assicurarsi che "
+"non vi sono altri processi Tor in esecuzione"
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1986,32 +2103,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "fallito (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Il tuo relay si sta spegnendo.\n"
+"Fai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
msgctxt "MainWindow"
msgid ""
@@ -2034,16 +2135,6 @@ msgstr ""
"Controlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fallito (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", probabilmente Telnet,"
@@ -2051,22 +2142,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", probabilmente un client email,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Il tuo relay si sta spegnendo.\n"
-"Fai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Errore nell'impostazione del filtro"
@@ -2320,14 +2395,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Salva automaticamente i nuovi messaggi su file"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Salva sempre i nuovi messaggi di log"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Salva sempre i nuovi messaggi di log"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2382,6 +2465,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mappa della rete Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ricarica"
@@ -2481,22 +2568,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Bridge non valido"
@@ -2836,6 +2907,10 @@ msgid "Run as a client only"
msgstr "Usa solo come client"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Fai da relay e scambia traffico per la rete Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta relay:"
@@ -3099,14 +3174,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Offri un mirror della directory dei relay"
@@ -3156,6 +3223,10 @@ msgid "Directory already in use by another service."
msgstr "Cartella già in uso da parte di un altro servizio."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Modulo"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Hidden service forniti"
@@ -3446,22 +3517,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Nuovo"
@@ -3498,12 +3553,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Sconosciuto"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Il processo %1 non è riuscito a terminare. [%2]"
@@ -3582,30 +3631,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Successo"
@@ -3891,3 +3916,5 @@ msgstr "%1 ore"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minuti"
+
+
diff --git a/src/vidalia/i18n/po/kn/vidalia_kn.po b/src/vidalia/i18n/po/kn/vidalia_kn.po
index e8a4552..98e8628 100644
--- a/src/vidalia/i18n/po/kn/vidalia_kn.po
+++ b/src/vidalia/i18n/po/kn/vidalia_kn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lb/vidalia_lb.po b/src/vidalia/i18n/po/lb/vidalia_lb.po
index aaf69a2..8c59985 100644
--- a/src/vidalia/i18n/po/lb/vidalia_lb.po
+++ b/src/vidalia/i18n/po/lb/vidalia_lb.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ln/vidalia_ln.po b/src/vidalia/i18n/po/ln/vidalia_ln.po
index ebca324..38be79b 100644
--- a/src/vidalia/i18n/po/ln/vidalia_ln.po
+++ b/src/vidalia/i18n/po/ln/vidalia_ln.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lo/vidalia_lo.po b/src/vidalia/i18n/po/lo/vidalia_lo.po
index 665ad26..9cff8a4 100644
--- a/src/vidalia/i18n/po/lo/vidalia_lo.po
+++ b/src/vidalia/i18n/po/lo/vidalia_lo.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lt/vidalia_lt.po b/src/vidalia/i18n/po/lt/vidalia_lt.po
index 515fae6..3917746 100644
--- a/src/vidalia/i18n/po/lt/vidalia_lt.po
+++ b/src/vidalia/i18n/po/lt/vidalia_lt.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/lv/vidalia_lv.po b/src/vidalia/i18n/po/lv/vidalia_lv.po
index 9ff589d..fe483a5 100644
--- a/src/vidalia/i18n/po/lv/vidalia_lv.po
+++ b/src/vidalia/i18n/po/lv/vidalia_lv.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mg/vidalia_mg.po b/src/vidalia/i18n/po/mg/vidalia_mg.po
index 9d86930..00a26ec 100644
--- a/src/vidalia/i18n/po/mg/vidalia_mg.po
+++ b/src/vidalia/i18n/po/mg/vidalia_mg.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mi/vidalia_mi.po b/src/vidalia/i18n/po/mi/vidalia_mi.po
index 0609e8d..61bcbad 100644
--- a/src/vidalia/i18n/po/mi/vidalia_mi.po
+++ b/src/vidalia/i18n/po/mi/vidalia_mi.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mk/vidalia_mk.po b/src/vidalia/i18n/po/mk/vidalia_mk.po
index fa090b3..0d2bf7e 100644
--- a/src/vidalia/i18n/po/mk/vidalia_mk.po
+++ b/src/vidalia/i18n/po/mk/vidalia_mk.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ml/vidalia_ml.po b/src/vidalia/i18n/po/ml/vidalia_ml.po
index 2188ff8..1d86767 100644
--- a/src/vidalia/i18n/po/ml/vidalia_ml.po
+++ b/src/vidalia/i18n/po/ml/vidalia_ml.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mn/vidalia_mn.po b/src/vidalia/i18n/po/mn/vidalia_mn.po
index e609e46..83d099d 100644
--- a/src/vidalia/i18n/po/mn/vidalia_mn.po
+++ b/src/vidalia/i18n/po/mn/vidalia_mn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mr/vidalia_mr.po b/src/vidalia/i18n/po/mr/vidalia_mr.po
index 52c4025..71325b4 100644
--- a/src/vidalia/i18n/po/mr/vidalia_mr.po
+++ b/src/vidalia/i18n/po/mr/vidalia_mr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ms/vidalia_ms.po b/src/vidalia/i18n/po/ms/vidalia_ms.po
index d5a0806..3430fac 100644
--- a/src/vidalia/i18n/po/ms/vidalia_ms.po
+++ b/src/vidalia/i18n/po/ms/vidalia_ms.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/mt/vidalia_mt.po b/src/vidalia/i18n/po/mt/vidalia_mt.po
index 8430936..503e511 100755
--- a/src/vidalia/i18n/po/mt/vidalia_mt.po
+++ b/src/vidalia/i18n/po/mt/vidalia_mt.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/my/vidalia_my.po b/src/vidalia/i18n/po/my/vidalia_my.po
index 1facd33..a7ea48b 100644
--- a/src/vidalia/i18n/po/my/vidalia_my.po
+++ b/src/vidalia/i18n/po/my/vidalia_my.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:00+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -233,6 +234,10 @@ msgid "Show Settings"
msgstr "Setting မ်ားအားျပရန္"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor bandwidth အသံုးျပဳမွဳအေျခအေန"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "အစမွျပန္စရန္"
@@ -272,10 +277,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ထြက္ရန္"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -429,26 +430,17 @@ msgid "Control socket is not connected."
msgstr "ထိန္းခ်ဳပ္မွဳ socket အားခ်ိတ္ဆက္၍မရပါ။"
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "လွ်ိဳ႕ဝက္ကုဒ္လိုအပ္သည္"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "ကၽြႏု္ပ္ လွ်ိဳ႕ဝက္ကုဒ္အားမွတ္ထားရန္"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1344,6 +1336,10 @@ msgid "Browse"
msgstr "Browse"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Tor ေဆာ့ဝဲကို Vidalia စတင္ခ်ိန္တြင္ စတင္ပါ"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1371,10 +1367,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1664,6 +1656,34 @@ msgid "New Identity"
msgstr "ကုိယ္ပိုင္အမွတ္အသားအသစ္"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1672,6 +1692,10 @@ msgid "View"
msgstr "ၾကည့္ရႈရန္"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia အကူအညီ"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Web browser စတင္ရာတြင္ မွားယြင္းမႈ"
@@ -1784,6 +1808,10 @@ msgid "Tor is shutting down"
msgstr "Tor ပိတ္သိမ္းေနပါသည္"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Tor ကုိ ယခု ရပ္တန္႕ပါ"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor ကုိ ရပ္တန္႕ပါ"
@@ -1872,6 +1900,21 @@ msgstr ""
"လုပ္ေဆာင္ႏုိင္မႈမ်ား မရရွိႏုိင္ပါ"
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ ခ်ိဳ႕ယြင္းခ်က္"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+"Vidalia မွ Tor ေဆာ့ဝဲသို႕ မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ မျပဳလိုႏိုင္ပါ။ (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"ေက်းဇူးျပဳ၍ သင္၏ ထိန္းခ်ဳပ္မႈ port မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ "
+"ခ်ိန္ညိွခ်က္မ်ားကို စစ္ေဆးပါ"
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor အသစ္ျဖည့္သြင္းခ်က္မ်ား ရရွႏုိင္ပါျပီ"
@@ -1918,11 +1961,85 @@ msgid "Status"
msgstr "အေျခအေန"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Shortcuts"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Relaying ကုိ ထည့္သြင္းျခင္း\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Relay တစ္ခု ထည့္သြင္း၍ Network ကုိ ၾကီးထြားေအာင္ ျပဳလုပ္ပါ"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Network ကုိ ၾကည့္ရႈရန္"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Tor Network ၏ ေျမပံုကို ၾကည့္ရႈရန္"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "ကုိယ္ပိုင္ အမွတ္အသားတစ္ခု အသံုးျပဳရန္"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "ေနာက္ဆက္တဲြ ဆက္သြယ္မႈ အသစ္ ျပဳလုပ္ရန္"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "လတ္တေလာ bandwidth အသံုးျပဳမႈ ၾကည့္ရႈရန္"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း history ကို ၾကည့္ရႈရန္"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "အကူအညီ မွတ္တမ္းမ်ား ၾကည့္ရႈရန္"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Vidalia ကုိ ခ်ိန္ညိႇယူရန္"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "version ႏွင့္ လုိင္စင္ အခ်က္အလက္မ်ား ၾကည့္ရႈရန္"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Vidalia မွ ထြက္ရန္"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "ဤ windows ကို စနစ္စတင္လ်င္ ျပသရန္"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "ဖံုးကြယ္ထားရန္"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "ဤ windows ကုိ ဖုံုးကြယ္ထားရန္"
+
+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 ""
+"Vidalia မွ Tor ၏ ထိန္းခ်ဳပ္မႈ စကားဝွက္ကုိ ျပင္ဆင္သတ္မွတ္စဥ္ Tor ေဆာ့ဝဲကုိ "
+"စတင္ျခင္း မျပဳလုပ္ႏုိင္ပါ။ ေက်းဇူးျပဳ၍ သင္၏ Task Manager တြင္ အျခား Tor "
+"လုပ္ငန္းစဥ္မ်ား ဖြင့္ထားျခင္း ရွိမရွိ စစ္ေဆးပါ။"
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1982,31 +2099,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2024,16 +2123,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2041,20 +2130,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "ခ်ိန္ညွိမႈမ်ား စိစစ္မႈ ခ်ိဳ႕ယြင္းခ်က္"
@@ -2313,14 +2388,22 @@ msgid "Automatically save new log messages to a file"
msgstr "သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကို အလိုအေလ်ာက္ ဖုိင္တစ္ခုသို႕ သိမ္းပါ"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "သတင္းအခ်က္အလက္မွတ္တမ္းအသစ္မ်ားကို အျမဲတမ္း သိမ္းပါ"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+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."
@@ -2360,6 +2443,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Network ေျမပံု"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "ျပန္လည္ အသစ္တင္ျပပါ"
@@ -2460,22 +2547,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "မဆီေလ်ာ္ေသာ Bridge"
@@ -2815,6 +2886,10 @@ msgid "Run as a client only"
msgstr "Client ကဲ့သုိ႕သာ အလုပ္လုပ္ေဆာင္ပါ"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor Network အတြက္ Relay traffic"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Relay Port:"
@@ -3073,14 +3148,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3129,6 +3196,10 @@ msgid "Directory already in use by another service."
msgstr "Directory သည္ အျခား ဝန္ေဆာင္မႈတစ္ခုမွ အသံုးျပဳႏွင့္ျပီး ျဖစ္ပါသည္"
msgctxt "ServicePage"
+msgid "Form"
+msgstr "ျဖည့္စြက္ပံုစံ"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "လွ်ိဳ႕ဝွက္ဝန္ေဆာင္မႈမ်ား ရရွိျပီး ျဖစ္ပါသည္"
@@ -3419,22 +3490,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "အသစ္"
@@ -3471,12 +3526,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "မသိရပါ"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "လုပ္ေဆာင္မႈ %1 ရပ္တန္႕ရန္ မေအာင္ျမင္ပါ [%2]"
@@ -3555,30 +3604,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "ေအာင္ျမင္ပါသည္"
@@ -3860,3 +3885,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nah/vidalia_nah.po b/src/vidalia/i18n/po/nah/vidalia_nah.po
index d85f07d..844bdf6 100644
--- a/src/vidalia/i18n/po/nah/vidalia_nah.po
+++ b/src/vidalia/i18n/po/nah/vidalia_nah.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:50+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nap/vidalia_nap.po b/src/vidalia/i18n/po/nap/vidalia_nap.po
index e29d861..b55a2f0 100644
--- a/src/vidalia/i18n/po/nap/vidalia_nap.po
+++ b/src/vidalia/i18n/po/nap/vidalia_nap.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:50+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nb/vidalia_nb.po b/src/vidalia/i18n/po/nb/vidalia_nb.po
index e239aa1..82e054c 100644
--- a/src/vidalia/i18n/po/nb/vidalia_nb.po
+++ b/src/vidalia/i18n/po/nb/vidalia_nb.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:56+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -235,6 +236,10 @@ msgid "Show Settings"
msgstr "Vis innstillinger"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor båndbreddeforbruk"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Tilbakestill"
@@ -274,10 +279,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Avbryt"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Starter HTTPS-broforespørsel"
@@ -431,27 +432,20 @@ msgid "Control socket is not connected."
msgstr "Kontroll-socket er ikke tilkoblet."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Passord kreves"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Husk passordet"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia har koblet seg til en Tor-prosess som krever et passord. Vennligst "
+"skriv inn ditt kontrollpassord:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1346,6 +1340,10 @@ msgid "Browse"
msgstr "Bla"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Start Tor når Vidalia starter"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1373,10 +1371,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Sjekk nå"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1664,6 +1658,34 @@ msgid "New Identity"
msgstr "Ny Identitet"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1672,6 +1694,10 @@ msgid "View"
msgstr "Vis"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia Hjelp"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Feil ved start av nettleser"
@@ -1784,6 +1810,10 @@ msgid "Tor is shutting down"
msgstr "Tor stenger ned"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Stopp Tor nå"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Stopp Tor"
@@ -1872,6 +1902,18 @@ msgstr ""
"funksjoner kan være utilgjengelig."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Autentiseringsfeil"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia kunne ikke autentisere mot Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Vennligst sjekk innstillingene for autentisering mot kontrollporten"
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-oppdatering tilgjengelig"
@@ -1915,11 +1957,85 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Snarveier"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Konfigurer videresending (Relé)\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Sett opp en relé og bistå med å hjelpe nettverket"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Vis Nettverket"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Vis kart over Tor-nettverket"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Bruk Ny Identitet"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Gjør at påfølgende forbindelser ser ut som nye"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Vis nylig båndbreddeforbruk"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Vis meldingshistorie"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Vis hjelpetekstene"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Konfigurer Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Vis versjons- og lisensinformasjon"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Avslutt Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Vis dette vinduet ved oppstart"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Skjul"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Skjul dette vinduet"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Tilbakestilling av passord feilet"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia prøvde å tilbakestille Tors kontrollpassord, men klarte ikke å "
+"starte Tor på nytt. Vennligst sjekk din Oppgavebehandler for å være sikker "
+"på at ingen andre Tor-prosesser kjører."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1983,32 +2099,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "feilet (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Din relé stenges ned.\n"
+"Trykk på \"Stopp\" igjen for å stenge din relé nå."
msgctxt "MainWindow"
msgid ""
@@ -2031,16 +2131,6 @@ msgstr ""
"Vennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "feilet (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", sannsynligvis Telnet,"
@@ -2048,22 +2138,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", sannsynligvis en epostklient,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Din relé stenges ned.\n"
-"Trykk på \"Stopp\" igjen for å stenge din relé nå."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Feilet ved innstilling av Filter"
@@ -2317,14 +2391,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Lagre automatisk nye loggmeldinger til en fil"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Alltid lagre nye loggmeldinger"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Alltid lagre nye loggmeldinger"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2379,6 +2461,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Nettverkskart"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Oppdater"
@@ -2478,22 +2564,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ugyldig Bro"
@@ -2834,6 +2904,10 @@ msgid "Run as a client only"
msgstr "Kjør kun som klient"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Videresend trafikk for Tor-nettverket (Relé)"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Reléport:"
@@ -3090,14 +3164,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Speil relékatalogen"
@@ -3146,6 +3212,10 @@ msgid "Directory already in use by another service."
msgstr "Katalog allerede i bruk av en annen tjeneste."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Skjema"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Valgte skjulte tjenester"
@@ -3434,22 +3504,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Ny"
@@ -3486,12 +3540,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Ukjent"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Prosess %1 nektet å stoppe. [%2]"
@@ -3570,30 +3618,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Vellykket"
@@ -3879,3 +3903,5 @@ msgstr "%1 timer"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minutter"
+
+
diff --git a/src/vidalia/i18n/po/ne/vidalia_ne.po b/src/vidalia/i18n/po/ne/vidalia_ne.po
index 32a07d6..1336ea5 100644
--- a/src/vidalia/i18n/po/ne/vidalia_ne.po
+++ b/src/vidalia/i18n/po/ne/vidalia_ne.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:50+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nl/vidalia_nl.po b/src/vidalia/i18n/po/nl/vidalia_nl.po
index 3ff5e7e..28f746a 100644
--- a/src/vidalia/i18n/po/nl/vidalia_nl.po
+++ b/src/vidalia/i18n/po/nl/vidalia_nl.po
@@ -1,11 +1,13 @@
#
+# <louisboy at msn.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 20:01+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: LittleNacho <louisboy at msn.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -138,59 +140,63 @@ msgstr "Selecteer de map om de gegevens van Tor op te slaan"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr ""
+msgstr "Tor Control"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "Gebruik TCP-verbinding (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr ""
+msgstr "Pad:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Gebruik Unix domein socket (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr ""
+msgstr "Bewerk huidige torrc"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "LET OP: dit zal de momenteel geladen torrc bewerken"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "ControlSocket pad bestaat niet."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
+"Het opgegeven Tor configuratie locatie bestand bevat tekens die niet kunnen "
+"worden weergegeven in uw huidige systeem 8-bits tekenset codering."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
+"De opgegeven data Tor directory bevat tekens die niet kunnen worden "
+"weergegeven in uw huidige systeem 8-bits tekenset codering."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "U hebt uw torrc pad veranderd, wilt u Tor opnieuw opstarten? "
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor Configuratie Bestand (torrc),, Alle bestanden (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Selecteer een bestand om te gebruiken voor Tor socket pad"
msgctxt "AdvancedPage"
msgid ""
@@ -235,6 +241,10 @@ msgid "Show Settings"
msgstr "Instellingen Weergeven"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor bandbreedte gebruik"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reset"
@@ -274,10 +284,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "HTTPS bridge verzoek is gestart..."
@@ -431,27 +437,20 @@ msgid "Control socket is not connected."
msgstr "Control socket is niet verbonden."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Paswoord noodzakelijk"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Onthoud mijn paswoord"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia probeert een verbinding op te zetten met een gestart Tor proces dat "
+"een paswoord nodig heeft. Gelieve het paswoord op te geven: "
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1169,7 +1168,7 @@ msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Zaïre"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1269,11 +1268,11 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Verstuur een Crash Rapport"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "In Vidalia is een fout opgetreden, het is nodig af te sluiten"
msgctxt "CrashReportDialog"
msgid ""
@@ -1282,46 +1281,55 @@ msgid ""
"report does not contain any personally identifying information, but your "
"connection to the crash reporting server may not be anonymous."
msgstr ""
+"Een crash rapport is gemaakt dat je automatisch kan versturen naar de "
+"Vidalia ontwikkelaars om te helpen en te identificeren van het probleem en "
+"het probleem vervolgens op te lossen. Het ingediende rapport bevat geen "
+"persoonlijke informatie, maar de verbinding met de crash rapportage server "
+"kan niet anoniem gebeuren."
msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
msgstr ""
+"Gelieve ook een beschrijving van wat je deed vóór de toepassing crashte "
+"(optioneel):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "Stuur mijn crash rapport naar de Vidalia ontwikkelaars"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "Herstart Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr ""
+msgstr "Niet opnieuw opstarten"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Niet in staat om Vidalia opnieuw te starten "
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
+"We waren niet in staat om Vidalia automatisch te herstarten. Gelieve "
+"handmatig Vidalia opnieuw te starten."
msgctxt "CrashReportUploader"
msgid "Connecting..."
-msgstr ""
+msgstr "Verbinden..."
msgctxt "CrashReportUploader"
msgid "Sending crash report..."
-msgstr ""
+msgstr "Het verzenden van crashrapport ..."
msgctxt "CrashReportUploader"
msgid "Receiving response..."
-msgstr ""
+msgstr "Het ontvangen van reactie..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1348,6 +1356,10 @@ msgid "Browse"
msgstr "Bladeren"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "De Tor toepassing starten als Vidalia start"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1375,10 +1387,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Nu controleren"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1603,27 +1611,27 @@ msgstr "Onbekend"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr ""
+msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr ""
+msgstr "Bericht"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Fout"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr ""
+msgstr "Onbekende"
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1666,6 +1674,34 @@ msgid "New Identity"
msgstr "Nieuwe Identiteit"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1674,6 +1710,10 @@ msgid "View"
msgstr "Bekijk"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia Help"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Fout tijdens het starten van de browser"
@@ -1786,6 +1826,10 @@ msgid "Tor is shutting down"
msgstr "Tor is bezig met afsluiten."
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Tor nu stoppen"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor stoppen"
@@ -1874,6 +1918,18 @@ msgstr ""
"verschillende functies van Vidalia niet beschikbaar."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Aanmeldfout"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia kon zich niet bij de Tor software aanmelden (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Controleer de beheerspoort aanmeldinstellingen."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor update beschikbaar"
@@ -1918,11 +1974,86 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Snelkoppeling"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Relaying Instellen\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Begin een relay en help het netwerk groeien"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Bekijk het Netwerk"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Bekijk een kaart van het Tor netwerk"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Gebruik een Nieuwe Identiteit"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Laat de eerstvolgende verbindingen nieuw lijken"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Bekijk recent bandbreedte gebruik"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Bekijk log berichten geschiedenis"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Bekijk de help documentatie"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Vidalia configureren"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Bekijk versie en licentie informatie"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Vidalia afsluiten"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Toon dit scherm bij het opstarten"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Verbergen"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Dit scherm niet tonen"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Wachtwoord reset faalde"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia probeerde Tor's controle wachtwoord te resetten, maar was niet niet "
+"in staat om de Tor software te herstarten. Controleert u alstublieft uw "
+"Taakbeheerder om er zeker van te zijn dat er geen andere Tor processen "
+"draaien."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1981,6 +2112,8 @@ msgid ""
"One of your applications%1appears to be making a potentially unencrypted and"
" unsafe connection to port %2."
msgstr ""
+"Een van uw applicaties%1a lijkt verbinding te maken met een potentieel "
+"onveilige en niet-versleutelde verbinding met poort%2."
msgctxt "MainWindow"
msgid ""
@@ -1988,34 +2121,21 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
+"Alles wat worden verzonden via deze verbinding zou kunnen worden "
+"gecontroleerd. Controleer uw applicatie configuratie en het gebruik alleen "
+"gecodeerde protocollen, zoals SSL, indien mogelijk."
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "mislukt (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Uw relay is aan het afsluiten.\n"
+"Klik opnieuw op 'Stop' om uw relay nu te stoppen."
msgctxt "MainWindow"
msgid ""
@@ -2038,16 +2158,6 @@ msgstr ""
"Controleert u alstublieft de berichtenlog voor recente waarschuwingen of foutmeldingen."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "mislukt (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", mogelijk Telnet,"
@@ -2055,22 +2165,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", mogelijk een email cliënt,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Uw relay is aan het afsluiten.\n"
-"Klik opnieuw op 'Stop' om uw relay nu te stoppen."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Fout bij Instellen Filter"
@@ -2327,24 +2421,36 @@ msgid "Automatically save new log messages to a file"
msgstr "Automatisch nieuwe log berichten opslaan naar bestand"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Altijd Nieuwe Log Berichten Opslaan"
+msgid "Basic"
+msgstr "Basis"
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "Tor status"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Altijd Nieuwe Log Berichten Opslaan"
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
+"Bericht dat verschijnt wanneer iets\n"
+"helemaal is foutgegaan en daardoor Tor niet meer kan doorgaan. "
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
+"Berichten die alleen verschijnen wanneer \n"
+"iets is foutgelopen met Tor."
msgctxt "MessageLog"
msgid ""
@@ -2353,18 +2459,25 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
+"Berichten die onregelmatig verschijnen tijdens de normale Tor gebruik en "
+"worden niet beschouwd als fouten, maar die wel interessant voor u kunnen "
+"zijn. "
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
+"Berichten die regelmatig verschijnen \n"
+"tijdens normale Tor gebruik."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
+"Hyper-uitgebreide berichten, met name van belang zijn voor Tor "
+"ontwikkelaars."
msgctxt "MessageLog"
msgid ""
@@ -2377,6 +2490,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Netwerk Kaart"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ververs"
@@ -2476,29 +2593,13 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ongeldige Brug"
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr ""
+msgstr "De opgegeven brug id is niet geldig."
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
@@ -2509,56 +2610,66 @@ msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
+"U moet zowel over een IP-adres of hostnaam en een poortnummer beschikken "
+"voor het configureren van Tor om een proxy te gebruiken voor toegang tot "
+"internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
+"U moet overeen of meer poorten beschikken waarop uw firewall u in staat "
+"stelt verbinding te maken."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr ""
+msgstr "'%1' is geen geldige poort nummer "
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+"Controleer of uw lokale netwerk een proxyserver vereist voor toegang tot het"
+" internet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr ""
+msgstr "Ik gebruik een proxy voor de toegang tot het internet"
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr ""
+msgstr "Proxy-instellingen"
msgctxt "NetworkPage"
msgid "Username:"
-msgstr ""
+msgstr "Gebruikersnaam:"
msgctxt "NetworkPage"
msgid "Password:"
-msgstr ""
+msgstr "Wachtwoord:"
msgctxt "NetworkPage"
msgid "Port:"
-msgstr ""
+msgstr "Poort:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+"Controleer of ik alleen verbinding maak met relays die poorten gebruiken die"
+" door mijn firewall toegestaan zijn."
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+"Mijn firewall laat me alleen toe verbinding te maken met bepaalde poorten"
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr ""
+msgstr "Firewall-instellingen"
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr ""
+msgstr "Toegestane Poorten:"
msgctxt "NetworkPage"
msgid "80, 443"
@@ -2569,76 +2680,82 @@ msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
+"Controleer om de verzoeken van de directory te versleutelen, en optioneel, "
+"gebruik maken van brug relays om toegang te maken tot het Tor netwerk"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr ""
+msgstr "Mijn ISP blokkeert verbindingen met het Tor netwerk"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr ""
+msgstr "Bridge-instellingen"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr ""
+msgstr "Voeg een Bridge toe:"
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr ""
+msgstr "Verwijder de geselecteerde bruggen uit de lijst"
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr ""
+msgstr "Kopieer de geselecteerde bruggen naar het klembord"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr ""
+msgstr "Nu bruggen zoeken"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Hoe kan ik anders bruggen vinden?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Hoe vind ik bruggen?</a>"
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
+"Geen nieuwe bruggen zijn op dit moment beschikbaar.U kunt een tijdje wachten"
+" of het opnieuw te proberen, of probeer een andere methode voor het vinden "
+"van nieuwe bruggen."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
+"Klik op Help om andere methoden voor het vinden van nieuwe bruggen te zien."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr ""
+msgstr "Adres:"
msgctxt "NetworkPage"
msgid "Type:"
-msgstr ""
+msgstr "Type:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr ""
+msgstr "U moet de proxy-type selecteren."
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr ""
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2706,11 +2823,11 @@ msgstr "Onbekend"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr ""
+msgstr "Relay Details"
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr ""
+msgstr "Overzicht"
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2750,7 +2867,7 @@ msgstr "Laatst Bijgewerkt:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr ""
+msgstr "Descriptor"
msgctxt "RouterListItem"
msgid "Offline"
@@ -2766,15 +2883,15 @@ msgstr "%1 KB/s"
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr ""
+msgstr "Relay"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr ""
+msgstr "Zoom naar Relay"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr ""
+msgstr "%1 relay's online"
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2782,59 +2899,67 @@ msgstr "Kopiëren"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr ""
+msgstr "Nickname"
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr ""
+msgstr "Afdruk"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr ""
+msgstr "Brug Ondersteuning niet beschikbaar"
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
+"U hebt geconfigureerd om Tor te laten fungeren als een brug relay voor "
+"gecensureerde gebruikers, maar uw versie van Tor ondersteunt geen bruggen."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
+"Upgrade uw Tor software of stel in om Tor als een normale Tor relay te "
+"laten fungeren."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr ""
+msgstr "Uw brug relay is niet actief"
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr ""
+msgstr "U moet in ieder geval een relay nickname en een poort ingeven."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr ""
+msgstr "Uitvoeren als een client alleen"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Verwerk verkeer van het Tor netwerk"
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr ""
+msgstr "Relay Poort:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr ""
+msgstr "Staat te stellen om de relay's directory te spiegelen"
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr ""
+msgstr "Poging om port forwarding automatisch in te stelen."
msgctxt "ServerPage"
msgid "Test"
-msgstr ""
+msgstr "Test"
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr ""
+msgstr "Toon Help-onderwerp voor poort forwarding"
msgctxt "ServerPage"
msgid "Directory Port:"
@@ -2850,11 +2975,12 @@ msgstr "Contact Info:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr ""
+msgstr "Naam van uw relay"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+"Poort waarop gebruikers en andere relays kunnen communiceren met uw relay"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2994,12 +3120,17 @@ msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
+"Welke Internet-bronnen moeten gebruikers in staat stellen om toegang te "
+"krijgen vanuit u relay?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
+"Tor zullen sommige uitgaande e-mail en bestand delende applicaties nog "
+"steeds blokkeren door een instelling om spam en ander misbruik te "
+"verminderen."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3007,30 +3138,33 @@ msgstr "Uitgaand Beleid"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
+msgstr "Laat anderen uw brug toegang verlenen door hen deze lijn te geven:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
+"Dit is de identiteit van uw brug relay dat je kunt geven aan andere mensen"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
+msgstr "Kopieer uw brug relay's identiteit naar het klembord"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr ""
+msgstr "Geen recente Gebruik"
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr ""
+msgstr "Geen cliënten hebben gebruik gemaakt van uw relay onlangs."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
+"Laat uw relay aan, zodat cliënten dan een betere kans hebben op het vinden "
+"en het gebruiken van uw relay."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3046,54 +3180,52 @@ msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
+"Tor ontvangde een onjuiste geformatteerd reactie wanneer Vidalia uw brug's "
+"gebruik geschiedenis aanvroeg. "
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr ""
+msgstr "Het onvangende reactie was: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
+msgstr "Help gecensureerd gebruikers te bereiken van het Tor netwerk"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr ""
+msgstr "<a href\"#bridgeUsage\">Wie heeft mijn brug gebruikt?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Wat is dit?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
+msgstr "Verdeel automatisch mijn brug adres"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr ""
+msgstr "Spiegel van de Relay Directory"
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
+"E-mailadres waarop u kan worden bereikt als er een probleem is met uw "
+"server. Je zou ook uw PGP of GPG afdruk kunnen in plaatsen."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
+msgstr "Fout bij het weghalen van alle diensten"
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
+"Configureer tenminste een dienst directory en een virtuele poort voor elke "
+"dienst die u wilt opslaan. Verwijder de andere."
msgctxt "ServicePage"
msgid "Error"
@@ -3101,83 +3233,88 @@ msgstr "Fout"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr ""
+msgstr "Selecteer een dienst."
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr ""
+msgstr "Selecteer Service Directory"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
+msgstr "Virtuele Poort mag alleen geldig poortnummers [1 .. 65535] bevatten."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
+msgstr "Het doel mag alleen deze adressen bevatten:poort, adres, of poort."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr ""
+msgstr "Directory al in gebruik door een andere dienst."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Vorm"
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr ""
+msgstr "Aangeboden Verborgen Diensten"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr ""
+msgstr "Onion Adres"
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr ""
+msgstr "Virtuele Poort"
msgctxt "ServicePage"
msgid "Target"
-msgstr ""
+msgstr "Doel"
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr ""
+msgstr "Pad van directory"
msgctxt "ServicePage"
msgid "Enabled"
-msgstr ""
+msgstr "Ingeschakeld"
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr ""
+msgstr "Voeg een nieuwe dienst op de lijst toe"
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr ""
+msgstr "Verwijder de geselecteerde diensten uit de lijst"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr ""
+msgstr "Kopieer onion adres van de geselecteerde diensten naar het prikbord"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+"Blader in de lokale bestandssysteem en kies directory voor gekozen dienst"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr ""
+msgstr "Gemaakt door Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Kopieir naar klembord"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr ""
+msgstr "De Tor software wordt uitgevoerd"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "U gebruikt momenteel versie \"%1\" van de Tor software."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "De Tor-software is niet actief"
msgctxt "StatusEventWidget"
msgid ""
@@ -3185,6 +3322,10 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
+"Klik op \"Start Tor\" in het Vidalia Configuratiescherm om de Tor software "
+"opnieuw te starten. Als Tor onverwacht stopte, selecteer het tabblad "
+"\"Geavanceerd\" hierboven voor meer informatie over de ondervonden eventuele"
+" fouten."
msgctxt "StatusEventWidget"
msgid ""
@@ -3193,6 +3334,8 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
+"U gebruikt momenteel versie \"%1\" van de Tor software, deze versie word niet meer aangeraden. Upgrade alstublieft naar de recentste versie van de software, die immers belangrijke beveiliging, betrouwbaarheids en prestatie updates en herstellingen kunnen bevatten.\n"
+" "
msgctxt "StatusEventWidget"
msgid ""
@@ -3201,30 +3344,38 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
+"U gebruikt momenteel versie \"%1\" van de Tor software, die immers niet meer"
+" kan werken met het huidige Tor netwerk. Upgrade alstublieft naar de "
+"recentste versie van de software, die immers belangrijke beveiliging, "
+"betrouwbaarheids en prestatie updates en herstellingen kunnen bevatten."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Uw Tor Software is niet meer up-to-date."
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Aangesloten op het Tor netwerk"
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
+"We waren in staat om met succes een verbinding met het Tor-netwerk te maken."
+" U kunt nu uw toepassingen op het internet anoniem gebruiken."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor Software fout"
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
+"De Tor software heeft een interne bug opgespoord. Meld de volgende fout-"
+"bericht naar de Tor ontwikkelaars op bugs.torproject.org:\"%1\"\n"
msgctxt "StatusEventWidget"
msgid ""
@@ -3233,6 +3384,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"Tor heeft opgemerkt dat de klok van uw computer kan worden ingesteld naar %1"
+" seconden in het verleden volgens de bron \"%2\". Als uw klok niet correct "
+"is, zal Tor niet juist kunnen functioneren. Stel u klok alstublieft juist "
+"in."
msgctxt "StatusEventWidget"
msgid ""
@@ -3241,10 +3396,14 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"Tor heeft opgemerkt dat de klok van uw computer kan worden ingesteld naar %1"
+" seconden in de toekomst volgens de bron \"%2\". Als uw klok niet correct "
+"is, zal Tor niet juist kunnen functioneren. Stel u klok alstublieft juist "
+"in."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "De klok van uw computer is potentieel onjuist "
msgctxt "StatusEventWidget"
msgid ""
@@ -3253,6 +3412,10 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
+"Een van uw applicaties op uw computer heeft geprobeerd om een niet-"
+"beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde "
+"informatie over het Tor netwerk is gevaarlijk en word niet aangeraden. Voor "
+"uw veiligheid, heeft Tor automatisch deze verbinding geblokkeerd."
msgctxt "StatusEventWidget"
msgid ""
@@ -3260,10 +3423,13 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
+"Een van uw applicaties op uw computer heeft geprobeerd om een niet-"
+"beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde "
+"informatie over het Tor netwerk is gevaarlijk en word niet aangeraden."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Potentieel gevaarlijke verbinding!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3272,10 +3438,14 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
+"Een van uw applicaties heeft een verbinding opgezet door Tor naar \"%1\" "
+"gebruik makend van een protocol dat informatie van uw bestemming kan leken. "
+"Verzeker u alstublieft ervan dat uw applicaties zo ingesteld zijn dat ze "
+"alleen SOCKS4a of SOCKS5 met een afgezonderde hostname resolution gebruiken."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "Onbekend SOCKS protocol"
msgctxt "StatusEventWidget"
msgid ""
@@ -3283,10 +3453,14 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
+"Een van uw applicaties heeft geprobeerd om een verbinding via Tor met "
+"behulp van een protocol dat Tor niet begrijpt vast te stellen te maken. Zorg"
+" ervoor dat u uw toepassingen ingesteld zijn om alleen SOCKS4a of SOCKS5 te "
+"gebruiken met hostnaam resolutie."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "Ongeldige bestemming Hostnaam"
msgctxt "StatusEventWidget"
msgid ""
@@ -3294,10 +3468,13 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
+"Een van uw applicaties heeft een verbinding opgezet door Tor naar \"%1\", "
+"Tor herkend deze hostname niet als een geldige hostname. Controleer "
+"alstublieft de instellingen van uw applicaties."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr ""
+msgstr "Externe IP-adres veranderd"
msgctxt "StatusEventWidget"
msgid ""
@@ -3305,10 +3482,13 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
+"Tor heeft bepaald dat uw relay's openbare IP-adres momenteel %1%2 is. Als "
+"dit niet correct is, raadpleeg alstublieft de instelling 'Adres' in uw "
+"relay's instellingen."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "DNS Hijacking gedetecteerd"
msgctxt "StatusEventWidget"
msgid ""
@@ -3316,6 +3496,10 @@ msgid ""
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
msgstr ""
+"Tor heeft gedetecteerd dat uw DNS-provider valse reacties heeft toegezonden "
+"naar domeinen die niet bestaan. Sommige ISP's en andere DNS-aanbieders, "
+"zoals OpenDNS, staan bekend om dit te doen om hun eigen zoektocht of "
+"reclame's weer te geven."
msgctxt "StatusEventWidget"
msgid ""
@@ -3323,10 +3507,14 @@ msgid ""
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
msgstr ""
+"Tor heeft gedetecteerd dat uw DNS-provider valse reacties heeft toegezonden "
+"naar bekende domeinen. Aangezien de cliënten vertrouwen op Tor netwerk "
+"relays om nauwkeurige DNS reacties, zullen uw relais niet worden "
+"geconfigureerd als een exit relay."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Controle Server Port Bereikbaarheid"
msgctxt "StatusEventWidget"
msgid ""
@@ -3334,18 +3522,21 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
+"Tor probeert te bepalen als uw relay's server poort te bereiken is via het "
+"Tor netwerk door zichzelf te verbinden naar %1:%2. Deze test kan een paar "
+"minuten in beslag nemen. "
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Server Poort Bereikbaarheid test geslaagd!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "Uw relay server poort is bereikbaar vanaf het Tor netwerk!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Server Port Bereikbaarheid Test mislukt"
msgctxt "StatusEventWidget"
msgid ""
@@ -3354,10 +3545,14 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
+"Uw relay's server poort is niet bereikbaar voor andere Tor cliënten. Dit kan"
+" gebeuren als u achter een router of een firewall zit die poort fowarding "
+"veriest. Als %1:%2 niet uw correcte IP-adres en serverpoort is, controleer "
+"dan alstublieft uw relay's instellingen. "
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Controleert Directory Poort Bereikbaarheid"
msgctxt "StatusEventWidget"
msgid ""
@@ -3365,18 +3560,21 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
+"Tor probeert te bepalen als uw relay's directory poort beschikbaar is vanaf "
+"het Tor netwerk door zichzelf te verbinden naar %1:%2. Deze test kan een "
+"paar minuten in beslag nemen."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Directory Poort Bereikbaarheid test geslaagd!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "Uw relay's directory poort is bereikbaar vanaf het Tor netwerk!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Directory Poort Bereikbaarheid Test mislukt"
msgctxt "StatusEventWidget"
msgid ""
@@ -3385,20 +3583,27 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
+"Uw relay's directory poort is niet bereikbaar voor andere cliënten. Dit kan "
+"gebeuren als u achter een router of een firewall zit die een poort fowarding"
+" vereist. Als %1:%2 niet uw correcte IP-adres en directory poort is, "
+"controleer alstublieft uw relay's instellingen. "
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Relay Descriptor Afgewezen"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
+"Uw relay's descriptor, die het mogelijk maakt voor cliënten om verbinding te"
+" maken met uw relay, was verworpen door de directory server op %1/%2. De "
+"reden daarvoor was: %3 "
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr ""
+msgstr "Uw Relay is online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3407,22 +3612,10 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
+"Uw relay is nu online en beschikbaar voor Tor-cliënten voor te gebruiken. U "
+"ziet een toename van het netwerkverkeer blijkt uit de bandbreedte Graph "
+"binnen een paar uur als meer klanten weten te komen over je relay. Dank u "
+"voor bij te dragen aan het Tor netwerk!"
msgctxt "Stream"
msgid "New"
@@ -3454,18 +3647,12 @@ msgstr "Opnieuw"
msgctxt "Stream"
msgid "Remapped"
-msgstr ""
+msgstr "Opnieuw toegewezen"
msgctxt "Stream"
msgid "Unknown"
msgstr "Onbekend"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Stoppen van proces %1 mislukt. [%2]"
@@ -3480,165 +3667,147 @@ msgstr "Starten Tor service mislukt."
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr ""
+msgstr "Mislukt om de controle van het wachtwoord te hashen."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr ""
+msgstr "Bezig met bewerken van torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
+"Instellingen opslaan. Indien niet aangevinkt zal alleen instellingen van het"
+" huidige Tor instantie toevoegt worden."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Knip"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Kopiëren"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Plakken"
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr ""
+msgstr "Ongedaan maken"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr ""
+msgstr "Vorige ingave herstellen"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Alles selecteren"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr ""
+msgstr "Voeg alles toe"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr ""
+msgstr "Voeg alleen de selectie toe "
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Fout bij verbinding maken met Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
+msgstr "Selectie is leeg. Selecteer een stuk tekst, of \"Apply all\" "
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Fout op lijn %1: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Fout"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
+msgstr "Er is een fout opgetreden tijdens het openen "
msgctxt "UPNPControl"
msgid "Success"
-msgstr ""
+msgstr "Succes"
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Geen UPnP-apparaten gevonden"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
+msgstr "Er is geen geldig UPnP-internet gateway-apparaten gevonden"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr ""
+msgstr "WSAStartup mislukt"
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr ""
+msgstr "Niet in geslaagd om een poort indeling toe te voegen"
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr ""
+msgstr "Niet in geslaagd om een poort indeling op te halen"
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr ""
+msgstr "Niet in geslaagd om een poort indeling te verwijderen"
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr ""
+msgstr "Onbekende fout"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr ""
+msgstr "Het ontdekken van UPnP-apparaten"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr ""
+msgstr "Updaten directory poort indeling"
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr ""
+msgstr "Updaten van relay poort indeling"
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr ""
+msgstr "Test succesvol afgerond!"
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr ""
+msgstr "Testen UPnP Ondersteuning"
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr ""
+msgstr "Het testen van Universal Plug & Play ondersteuning"
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
+"Vidalia kon niet controleren op beschikbare software updates omdat het dit "
+"niet kon vinden '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
+"Vidalia was niet in staat om te controleren op beschikbare software-updates,"
+" want Tor's update-proces stopte onverwacht."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr ""
+msgstr "Controleren op beschikbare updates ..."
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3646,15 +3815,15 @@ msgstr "Verbergen"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr ""
+msgstr "Downloaden van updates ..."
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr ""
+msgstr "Het installeren van update software ..."
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr ""
+msgstr "Klaar! Uw software is nu up-to-date."
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3662,11 +3831,11 @@ msgstr "OK"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr ""
+msgstr "Software-updates"
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr ""
+msgstr "Controleren op updates ..."
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3674,19 +3843,20 @@ msgstr "Annuleren"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr ""
+msgstr "Software-updates beschikbaar"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr ""
+msgstr "Herinner mij later"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr ""
+msgstr "Installeren"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
msgstr ""
+"De volgende bijgewerkte software pakketten zijn klaar voor installatie:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3694,15 +3864,15 @@ msgstr "Backspace"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr ""
+msgstr "Versie"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "Uploaden van Crash Rapport"
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "Kan rapport niet verzenden: %1"
msgctxt "VMessageBox"
msgid "OK"
@@ -3798,15 +3968,15 @@ msgstr "Openen mislukt van log bestand '%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr ""
+msgstr "Ongeldige taal code:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr ""
+msgstr "Ongeldig GUI-stijl:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr ""
+msgstr "Ongeldige opgegeven logboekbestand:"
msgctxt "Vidalia"
msgid ""
@@ -3814,10 +3984,12 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
+"Een ander Vidalia proces is mogelijk reeds actief is. Als er geen andere Vidalia proces actief is, kunt u ervoor kiezen om toch door te gaan. \n"
+"Wilt u doorgaan met het starten van Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr ""
+msgstr "%1 sec"
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -3846,3 +4018,5 @@ msgstr "%1 uren"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minuten"
+
+
diff --git a/src/vidalia/i18n/po/nn/vidalia_nn.po b/src/vidalia/i18n/po/nn/vidalia_nn.po
index 24c55b4..90ebc20 100644
--- a/src/vidalia/i18n/po/nn/vidalia_nn.po
+++ b/src/vidalia/i18n/po/nn/vidalia_nn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:50+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/nso/vidalia_nso.po b/src/vidalia/i18n/po/nso/vidalia_nso.po
index b966b2a..944508b 100644
--- a/src/vidalia/i18n/po/nso/vidalia_nso.po
+++ b/src/vidalia/i18n/po/nso/vidalia_nso.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:43+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:41+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/oc/vidalia_oc.po b/src/vidalia/i18n/po/oc/vidalia_oc.po
index ed69d19..f3ace62 100644
--- a/src/vidalia/i18n/po/oc/vidalia_oc.po
+++ b/src/vidalia/i18n/po/oc/vidalia_oc.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pa/vidalia_pa.po b/src/vidalia/i18n/po/pa/vidalia_pa.po
index 67b1b2c..b40ee73 100755
--- a/src/vidalia/i18n/po/pa/vidalia_pa.po
+++ b/src/vidalia/i18n/po/pa/vidalia_pa.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pap/vidalia_pap.po b/src/vidalia/i18n/po/pap/vidalia_pap.po
index 965c5e9..b0ed7e9 100644
--- a/src/vidalia/i18n/po/pap/vidalia_pap.po
+++ b/src/vidalia/i18n/po/pap/vidalia_pap.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pl/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po
index f854e02..43ab396 100644
--- a/src/vidalia/i18n/po/pl/vidalia_pl.po
+++ b/src/vidalia/i18n/po/pl/vidalia_pl.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:57+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,6 +237,10 @@ msgid "Show Settings"
msgstr "Pokaż ustawienia"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Użycie Łącza"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Resetuj"
@@ -275,10 +280,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Anuluj"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Wysyłanie żądania HTTPS do mostu..."
@@ -432,27 +433,20 @@ msgid "Control socket is not connected."
msgstr "Gniazdo sterujące nie jest podłączone."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Wymagane hasło"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Zapamiętaj hasło"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia połączyła się z usługą Tora, który wymaga hasła. Proszę wprowadzić "
+"hasło:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1347,6 +1341,10 @@ msgid "Browse"
msgstr "Przeglądaj"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Uruchamiaj Tora gdy Vidalia startuje"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1374,10 +1372,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Sprawdź teraz"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1665,6 +1659,34 @@ msgid "New Identity"
msgstr "Nowa Tożsamość"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1673,6 +1695,10 @@ msgid "View"
msgstr "Widok"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Pomoc Vidalii"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Błąd przy uruchamianiu przeglądarki internetowej"
@@ -1785,6 +1811,10 @@ msgid "Tor is shutting down"
msgstr "Zamykanie Tora"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Zatrzymaj teraz Tora"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Zatrzymaj Tora"
@@ -1873,6 +1903,18 @@ msgstr ""
"funkcji może być niedostępnych."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Błąd uwierzytelnienia"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia nie zdołała uwierzytelnić się oprogramowaniu Tor."
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Proszę sprawdzić port sterujący autentykacją."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Aktualizacja Tora jest dostępna"
@@ -1916,11 +1958,85 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Skróty Vidalii"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Ustawienia węzła\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Uruchom węzeł i pomóż w rozbudowie sieci."
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Pokaż Sieć"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Pokaż mapę sieci Tora"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Użyj Nowej Tożsamości"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Uczyń kolejne połączenia jako nowe"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Pokaż ostatnie zużycie przepustowości"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Pokaż historię logów"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Pokaż dokumentację pomocy"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Konfiguruj Vidalię"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Pokaż informację o wersji i licencji"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Zamknij Vidalię"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Pokazuj to okno na starcie"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Ukryj"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ukryj to okno"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Resetowanie hasła nie powiodło się"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia próbowała zresetować hasło sterujące Tora, ale nie udało się "
+"ponownie uruchomić aplikacji Tor. Sprawdź w Menedżerze zadań czy nie ma "
+"uruchomionych procesów Tora."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1983,32 +2099,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "nie powiodło się (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Twój węzeł zostanie wyłączony.\n"
+"\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
msgctxt "MainWindow"
msgid ""
@@ -2031,16 +2131,6 @@ msgstr ""
"Proszę sprawdzić logi w celu poznania przyczyny."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "nie powiodło się (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", prawdopodobnie Telnet,"
@@ -2048,22 +2138,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", prawdopodobnie klient e-mail,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Twój węzeł zostanie wyłączony.\n"
-"\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Błąd ustawiania filtru"
@@ -2317,14 +2391,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Automatycznie zapisuj wiadomości do pliku"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Zawsze zapisuj nowe wiadomości"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Zawsze zapisuj nowe wiadomości"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2378,6 +2460,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa Sieci"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Odśwież"
@@ -2477,22 +2563,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Niepoprawny Węzeł-Most"
@@ -2830,6 +2900,10 @@ msgid "Run as a client only"
msgstr "Działaj tylko jako klient"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Udostępnij moje łącze dla sieci Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Port węzła:"
@@ -3088,14 +3162,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Przechowuj kopię Katalogu Węzłów"
@@ -3144,6 +3210,10 @@ msgid "Directory already in use by another service."
msgstr "Katalog jest aktualnie w użyciu przez inną usługę."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formularz"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Dostarczane ukryte usługi"
@@ -3432,22 +3502,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Nowe"
@@ -3484,12 +3538,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Nieznane"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Nieudana próba zatrzymania procesu %1. [%2]"
@@ -3568,30 +3616,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Sukces"
@@ -3877,3 +3901,5 @@ msgstr "%1 godzin"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minut"
+
+
diff --git a/src/vidalia/i18n/po/pms/vidalia_pms.po b/src/vidalia/i18n/po/pms/vidalia_pms.po
index a0f7ffb..9ebe381 100644
--- a/src/vidalia/i18n/po/pms/vidalia_pms.po
+++ b/src/vidalia/i18n/po/pms/vidalia_pms.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ps/vidalia_ps.po b/src/vidalia/i18n/po/ps/vidalia_ps.po
index 52baa3f..3ced494 100644
--- a/src/vidalia/i18n/po/ps/vidalia_ps.po
+++ b/src/vidalia/i18n/po/ps/vidalia_ps.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/pt/vidalia_pt.po b/src/vidalia/i18n/po/pt/vidalia_pt.po
index 435ea41..50feb8e 100644
--- a/src/vidalia/i18n/po/pt/vidalia_pt.po
+++ b/src/vidalia/i18n/po/pt/vidalia_pt.po
@@ -1,11 +1,13 @@
#
+# <miguelmacedo at netcabo.pt>, 2011.
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:55+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"Last-Translator: miguelmacedo <miguelmacedo at netcabo.pt>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +26,7 @@ msgstr "Licença"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia"
+msgstr "Vidalia 0.2.0"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
@@ -42,8 +44,8 @@ msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"Você seleccionou 'Password' para autenticação, mas não especificou uma "
-"senha."
+"Você seleccionou autenticação de 'Password' , mas não especificou uma "
+"password."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -99,7 +101,7 @@ msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Senha"
+msgstr "Password"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
@@ -140,59 +142,64 @@ msgstr "Seleccione o directório usado para guardar os do software Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr ""
+msgstr "Controle Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "Usar ligação TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr ""
+msgstr "Endereço:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Usar ficha de domínio Unix (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr ""
+msgstr "Editar o torrc actual"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "NOTA: isto vai editar o torrc carregado actualmente"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "O endereço ControlSocket não existe"
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
+"A configuração Tor de localização de ficheiros contém caracteres que não "
+"podem ser representados no seu actual sistema de codificação de caracteres "
+"de 8 bits."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
+"O directório de dados Tor especificado, contém caracteres que não podem ser "
+"representados no seu actual sistema de codificação de caracteres de 8 bits."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Aviso"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "Mudou o endereço torrc, quer reiniciar o Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Ficheiro de Configuração do Tor (torrc);;Todos os ficheiros(*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Escolha um ficheiro para usar como endereço da ficha Tor"
msgctxt "AdvancedPage"
msgid ""
@@ -237,6 +244,10 @@ msgid "Show Settings"
msgstr "Mostrar Configurações"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Utilização de Largura de Banda do Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reiniciar"
@@ -276,13 +287,9 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "A iniciar o pedido de bridge HTTPS..."
+msgstr "A iniciar o pedido de ponte HTTPS..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -290,23 +297,23 @@ msgstr "A estabelecer ligação com %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "A enviar o pedido de bridges HTTPS..."
+msgstr "A enviar o pedido de pontes HTTPS..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "A descarregar a lista de bridges..."
+msgstr "A descarregar a lista de pontes..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "A descarregar as Bridges"
+msgstr "A descarregar as Pontes"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Impossível descarregar as bridges: %1"
+msgstr "Impossível descarregar as pontes: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "A tentar novamente o pedido de bridge..."
+msgstr "A tentar novamente o pedido de ponte..."
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -322,7 +329,7 @@ msgstr "Clientes dos seguintes países tem utilizado o seu relay desde %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Relatório de utilização da Bridge"
+msgstr "Relatório de utilização da Ponte"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
@@ -433,27 +440,20 @@ msgid "Control socket is not connected."
msgstr "O socket de controle não está conectado."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Necessário palavra-passe"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Memorizar a minha palavra-passe"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"O Vidalia estabeleceu uma ligação a um processo do Tor que necessita de "
+"palavra-passe. Por favor introduza a sua palavra-passe:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -501,7 +501,7 @@ msgstr "Austrália"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaijão "
+msgstr "Azerbaidjão "
msgctxt "CountryInfo"
msgid "Bahamas"
@@ -509,7 +509,7 @@ msgstr "Bahamas"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladeche "
+msgstr "Bangladesh"
msgctxt "CountryInfo"
msgid "Barbados"
@@ -517,7 +517,7 @@ msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielorrússia"
+msgstr "Bielo-rússia"
msgctxt "CountryInfo"
msgid "Belgium"
@@ -549,7 +549,7 @@ msgstr "Brasil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr "Principado do Brunei"
msgctxt "CountryInfo"
msgid "Bulgaria"
@@ -581,7 +581,7 @@ msgstr "Cabo Verde"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "República central Africana"
+msgstr "República Centro Africana"
msgctxt "CountryInfo"
msgid "Chad"
@@ -605,7 +605,7 @@ msgstr "Comores"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, A República Democrática de"
+msgstr "Congo, A República Democrática do"
msgctxt "CountryInfo"
msgid "Congo"
@@ -617,7 +617,7 @@ msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Cote dâ Ivoire"
+msgstr "Costa do Marfim"
msgctxt "CountryInfo"
msgid "Croatia"
@@ -641,11 +641,11 @@ msgstr "Dinamarca"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr ""
+msgstr "Djibuti"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Domínica"
+msgstr "Dominica"
msgctxt "CountryInfo"
msgid "Dominican Republic"
@@ -761,15 +761,15 @@ msgstr "Quénia"
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuweit"
+msgstr "Koweit"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Quirguistão"
+msgstr "Quirziguistão"
msgctxt "CountryInfo"
msgid "Laos"
@@ -793,7 +793,7 @@ msgstr "Libéria"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Licença"
+msgstr "Liechtenstein"
msgctxt "CountryInfo"
msgid "Lithuania"
@@ -813,7 +813,7 @@ msgstr "Madagáscar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malavi"
+msgstr "Malawi"
msgctxt "CountryInfo"
msgid "Malaysia"
@@ -821,7 +821,7 @@ msgstr "Malásia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr "Malí"
msgctxt "CountryInfo"
msgid "Malta"
@@ -837,7 +837,7 @@ msgstr "Mauritânia"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Maurício"
+msgstr "Maurícias"
msgctxt "CountryInfo"
msgid "Micronesia"
@@ -849,7 +849,7 @@ msgstr "Moldávia"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr "Mónaco"
msgctxt "CountryInfo"
msgid "Mongolia"
@@ -901,7 +901,7 @@ msgstr "Nigéria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Prosseguir"
+msgstr "Noruega"
msgctxt "CountryInfo"
msgid "Oman"
@@ -925,7 +925,7 @@ msgstr "Panamá"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Nova Guiné"
+msgstr "Papua-Nova Guiné"
msgctxt "CountryInfo"
msgid "Paraguay"
@@ -949,11 +949,11 @@ msgstr "Portugal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Catar"
+msgstr "Qatar"
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Romênia"
+msgstr "Roménia"
msgctxt "CountryInfo"
msgid "Russia"
@@ -973,7 +973,7 @@ msgstr "Santa Lúcia"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "São Vicente e Granadinas"
+msgstr "São Vicente e Grenadinas"
msgctxt "CountryInfo"
msgid "Samoa"
@@ -981,19 +981,19 @@ msgstr "Samoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr "São Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "São Tomé & Príncipe"
+msgstr "São Tomé e Príncipe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Arabia Saudita"
+msgstr "Arábia Saudita"
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Geral"
+msgstr "Senegal"
msgctxt "CountryInfo"
msgid "Serbia"
@@ -1001,7 +1001,7 @@ msgstr "Sérvia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seicheles"
+msgstr "Seychelles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
@@ -1009,7 +1009,7 @@ msgstr "Serra Leoa"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Cingapura"
+msgstr "Singapura"
msgctxt "CountryInfo"
msgid "Slovakia"
@@ -1065,7 +1065,7 @@ msgstr "Síria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajiquistão"
+msgstr "Tadjiquistão"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1089,7 +1089,7 @@ msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad & Tobago"
+msgstr "Trinidad e Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
@@ -1101,7 +1101,7 @@ msgstr "Turquia"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turquemenistão"
+msgstr "Turkmenistão"
msgctxt "CountryInfo"
msgid "Tuvalu"
@@ -1117,7 +1117,7 @@ msgstr "Ucrânia"
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Emirados Árabes Unidos"
+msgstr "Emiratos Árabes Unidos"
msgctxt "CountryInfo"
msgid "United Kingdom"
@@ -1169,7 +1169,7 @@ msgstr "Zimbábue"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1185,7 +1185,7 @@ msgstr "Áustria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Barém"
+msgstr "Bahrain"
msgctxt "CountryInfo"
msgid "Benin"
@@ -1197,7 +1197,7 @@ msgstr "Etiópia"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr "Fidji"
msgctxt "CountryInfo"
msgid "Finland"
@@ -1265,15 +1265,15 @@ msgstr "Mianmar"
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr "Taiwan (Formosa)"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Enviar um relatório de erro"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "O Vidalia encontrou um erro e irá encerrar"
msgctxt "CrashReportDialog"
msgid ""
@@ -1282,46 +1282,55 @@ msgid ""
"report does not contain any personally identifying information, but your "
"connection to the crash reporting server may not be anonymous."
msgstr ""
+"Foi automaticamente criado um relatório de erro que poderá enviar "
+"automaticamente para os programadores do Vidalia que ajudará a identificar e"
+" resolver o problema. O relatório a enviar não contém nenhuma informação "
+"pessoal identificativa, mas a sua ligação para o servidor de relatórios de "
+"erro poderá não ser anónima."
msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
msgstr ""
+"Por favor descreva também o que estava a fazer antes da aplicação ter dado "
+"erro (opcional):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "Enviar o meu relatório de erro para os programadores do Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "Reiniciar o Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr ""
+msgstr "Não reiniciar"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Incapaz de reiniciar o Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
+"Fomos incapazes de reiniciar o Vidalia automaticamente. Por favor reinicie "
+"manualmente."
msgctxt "CrashReportUploader"
msgid "Connecting..."
-msgstr ""
+msgstr "Ligando..."
msgctxt "CrashReportUploader"
msgid "Sending crash report..."
-msgstr ""
+msgstr "Enviando relatório de erro..."
msgctxt "CrashReportUploader"
msgid "Receiving response..."
-msgstr ""
+msgstr "A receber resposta..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1329,7 +1338,7 @@ msgstr "Executáveis (*.exe)"
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Selecione o Diretório para o Tor"
+msgstr "Selecione endereço para o Tor"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
@@ -1348,6 +1357,10 @@ msgid "Browse"
msgstr "Navegar"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Iniciar o software Tor quando iniciar o Vidalia"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1375,10 +1388,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Verificar Agora"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1397,15 +1406,15 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Receber:"
+msgstr "Recebido:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Enviar:"
+msgstr "Enviado:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "O Arquivo XML de Conteúdo fornecido não é válido."
+msgstr "O Arquivo XML fornecido não é um documento de Conteúdos válido."
msgctxt "HelpBrowser"
msgid "Search reached end of document"
@@ -1441,7 +1450,7 @@ msgstr "Backspace"
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Prosseguir"
+msgstr "Avançar"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
@@ -1501,7 +1510,7 @@ msgstr "Encontrar Próximo"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Sensível a Caixa Alta/Baixa"
+msgstr "Sensível a maiúsculas/minúsculas"
msgctxt "HelpBrowser"
msgid "Whole words only"
@@ -1513,11 +1522,11 @@ msgstr "Tópicos de Ajuda"
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Conteúdo"
+msgstr "Conteúdos"
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Busca"
+msgstr "Procura"
msgctxt "HelpBrowser"
msgid "Searching for:"
@@ -1533,7 +1542,7 @@ msgstr "Erro ao Carregar os Conteúdos de Ajuda:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Abrir Hiperligação Externa"
+msgstr " A Abrir Ligação Externa"
msgctxt "HelpTextBrowser"
msgid ""
@@ -1541,8 +1550,8 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"O Vidalia pode abrir a hiperligação que escolheu no seu browser padrão. Se o"
-" seu browser não estiver configurado para utilizar o Tor então os seus "
+"O Vidalia pode abrir a hiperligação que escolheu no seu navegador padrão. Se"
+" o seu navegador não estiver configurado para utilizar o Tor então os seus "
"pedidos não serão anónimos."
msgctxt "HelpTextBrowser"
@@ -1551,15 +1560,15 @@ msgstr "Deseja que o Vidalia abra a ligação no seu Navegador Web?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Incapaz de Abrir Hiperlização"
+msgstr "Incapaz de Abrir Hiperligação"
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"O Vidalia foi incapaz de abrir a ligação no seu Navegador Web. Pode ainda "
-"copiar o endereço (URL) e colá-lo no seu Navegador Web."
+"O Vidalia foi incapaz de abrir a ligação seleccionada no seu Navegador Web. "
+"Pode ainda copiar o URL e colá-lo no seu Navegador Web."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1603,31 +1612,31 @@ msgstr "Desconhecido"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr ""
+msgstr "Limpando erros"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Informação"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr ""
+msgstr "Nota"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Aviso"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Erro"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr ""
+msgstr "Desconhecido"
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Iníciar Tor"
+msgstr "Iniciar Tor"
msgctxt "MainWindow"
msgid "Exit"
@@ -1639,7 +1648,7 @@ msgstr "Gráfico de Largura de Banda"
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Log de Mensagens"
+msgstr "Registo de Mensagens"
msgctxt "MainWindow"
msgid "Network Map"
@@ -1666,16 +1675,48 @@ msgid "New Identity"
msgstr "Nova Identidade"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
msgctxt "MainWindow"
msgid "View"
-msgstr "Visualizar"
+msgstr "Ver"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ajuda do Vidalia"
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Erro ao iniciar navegador web:"
+msgstr "Erro ao iniciar navegador web"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
@@ -1715,7 +1756,7 @@ msgstr "A carregar o estado da rede"
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr ""
+msgstr "A carregar o certificados de autoridade"
msgctxt "MainWindow"
msgid "Requesting relay information"
@@ -1739,7 +1780,7 @@ msgstr "Conectado à rede Tor"
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Estado de inicialização desconhecido"
+msgstr "Estado de inicialização não reconhecido"
msgctxt "MainWindow"
msgid "miscellaneous"
@@ -1767,7 +1808,7 @@ msgstr "Erro de leitura/escrita "
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "sem rota para o host"
+msgstr "sem rota para o hospedeiro"
msgctxt "MainWindow"
msgid "insufficient resources"
@@ -1786,6 +1827,10 @@ msgid "Tor is shutting down"
msgstr "Tor a encerrar"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Parar Tor Agora"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Parar Tor"
@@ -1807,7 +1852,8 @@ msgid ""
"name and location of your Tor executable is specified."
msgstr ""
"O Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para "
-"garantir o nome e a localização correta do executável do Tor especificado."
+"garantir o nome e a localização correta do executável do Tor foram "
+"especificados."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1859,19 +1905,33 @@ msgstr "Diretório de Dados"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Controlo de Cookie (control_auth_cookie)"
+msgstr "Cookie de Controlo (control_auth_cookie)"
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Erro ao se Registar para Eventos"
+msgstr "Erro ao Registar-se para Eventos"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"O Vidalia foi incapaz de registar alguns eventos. Muitas das suas "
-"características podem estar indisponível."
+"O Vidalia foi incapaz de registar-se para alguns eventos. Muitas das "
+"características do Vidalia podem estar indisponíveis."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Erro de Autenticação"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia foi incapaz de autenticar o software Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"Por favor, verifique as suas configurações de autenticação da porta de "
+"controle."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1883,7 +1943,7 @@ msgid ""
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
"A versão instalada do Tor está desactualizada ou deixou de ser recomendada. "
-"Por favor, visite o página do sítio do Tor para descarregar a última versão."
+"Por favor, visite o página do Tor para descarregar a última versão."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1893,7 +1953,8 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr "As novas conexões irão parecer diferentes das conexões antigas."
+msgstr ""
+"Todas as ligações seguintes irão parecer diferentes das ligações antigas."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1917,11 +1978,85 @@ msgid "Status"
msgstr "Estado"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Atalhos do Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Instalação do Retransmissor\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Crie um retransmissor e ajudar a rede a crescer"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Ver a Rede"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Ver um mapa da rede Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Use uma Nova Identidade"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Faça com que as ligações subsequentes pareçam novas"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Ver a recente utilização da largura de banda"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Ver o histórico do registo das mensagens"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Ver documentação de ajuda"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Configurar o Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Ver versão e a informação da licença"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Sair do Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Mostrar esta janela ao iniciar"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Ocultar"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ocultar esta janela"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Falha na Redefinição da Palavra-Chave"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia tentou redefinir a palavra-chave de controlo do Tor, mas foi incapaz"
+" de reiniciar o software Tor. Por favor, verifique o seu Gestor de Tarefas "
+"para garantir que não há outros processos Tor em execução."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1935,31 +2070,31 @@ msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Conexão potencialmente insegura"
+msgstr "Ligação Potencialmente Insegura"
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"O Tor encerrou automaticamente a sua conexão a fim de proteger o seu "
+"O Tor encerrou automaticamente a sua ligação a fim de proteger o seu "
"anonimato."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Falhou"
+msgstr "Falhou actualização"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "O seu siftware está actualizado"
+msgstr "O seu software está actualizado"
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"Neste momento não existem disponíveis novos pacotes de software Tor para o "
-"seu computador."
+"Neste momento não estão disponíveis novos pacotes de software Tor para o seu"
+" computador."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -1967,7 +2102,7 @@ msgstr "Falha na Instalação"
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "O Vidalia não conseguiu instalar o serviço do Tor."
+msgstr "O Vidalia não conseguiu instalar as suas actualizações de software."
msgctxt "MainWindow"
msgid "The following error occurred:"
@@ -1985,34 +2120,21 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
+"Qualquer coisa enviada por esta ligação pode estar a ser monitorizada. Por "
+"favor verifique a configuração da sua aplicação e use apenas protocolos "
+"encriptados como o SSL, se possível."
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "Falhou (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"O seu retransmissor está a encerrar.\n"
+"Clique 'Stop' novamente para parar o seu retransmissor agora."
msgctxt "MainWindow"
msgid ""
@@ -2020,7 +2142,7 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Está actualmete a executar um retransmissor. Encerrando o seu retransmissor irá interromper qualquer conexão aberta de clientes.\n"
+"Está actualmente a executar um retransmissor. Encerrando o seu retransmissor irá interromper qualquer conexão aberta de clientes.\n"
"\n"
"Gostaria de encerrar graciosamente e dar tempo aos clientes para encontrar um novo retransmissor?"
@@ -2032,17 +2154,7 @@ msgid ""
msgstr ""
"Vidalia detectou que o software Tor encerrou inesperadamente.\n"
"\n"
-"Por favor, verifique no seu log a existência de mensagens de alerta recente ou mensagens de erro."
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Falhou (%1)"
+"Por favor, verifique no seu registo de mensagens se há mensagens de aviso ou de erro."
msgctxt "MainWindow"
msgid ", probably Telnet,"
@@ -2052,59 +2164,43 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", provavelmente um cliente de email,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"O seu retransmissor está a encerrar.\n"
-"Clique 'Stop' novamente para parar o seu retransmissor agora."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Erro na Definição do Filtro"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "O Vidalia foi incapaz de registrar os eventos de log do Tor."
+msgstr "O Vidalia foi incapaz de registar-se no registo de eventos do Tor."
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Erro ao Abrir o Arquivo de Log"
+msgstr "Erro ao Abrir o Ficheiro de Registo"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "O Vidalia foi incapaz de abrir o arquivo especificado."
+msgstr "O Vidalia foi incapaz de abrir o arquivo de registo especificado."
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "O Nome do Arquivo de Log é Requerido"
+msgstr "O Nome do Arquivo de Registo é Requerido"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
-"Você deve entrar com um nome de arquivo para ser capaz de salvar o log de "
-"mensagens para um arquivo."
+"Tem de escrever um nome de ficheiro para ser capaz de salvar o registo "
+"mensagens para um ficheiro."
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Selecione o Arquivo de Log"
+msgstr "Selecione o Arquivo de Registo"
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Salve as Mensagens do Log"
+msgstr "Salve as Mensagens do Registo"
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Arquivos Texto (*.txt)"
+msgstr "Ficheiros de Texto (*.txt)"
msgctxt "MessageLog"
msgid "Vidalia"
@@ -2112,7 +2208,7 @@ msgstr "Vidalia"
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Procurar no Log de Mensagens"
+msgstr "Procurar no Registo de Mensagens"
msgctxt "MessageLog"
msgid "Find:"
@@ -2124,11 +2220,11 @@ msgstr "Não Encontrado"
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "A procura encontrou 0 ocorrências."
+msgstr "A procura encontrou 0 correspondências."
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Log de Mensagens"
+msgstr "Registo de Mensagens"
msgctxt "MessageLog"
msgid "Message Filters..."
@@ -2144,7 +2240,7 @@ msgstr "Tamanho do Histórico..."
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Definir o número máximo de mensagens a serem visualizadas"
+msgstr "Definir o número máximo de mensagens a mostrar"
msgctxt "MessageLog"
msgid "Clear"
@@ -2152,7 +2248,7 @@ msgstr "Limpar"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Limpar todas as mensagens do Log de Mensagens (Ctrl+E)"
+msgstr "Limpar todas as mensagens do Registo de Mensagens (Ctrl+E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2165,7 +2261,7 @@ msgstr "Copiar"
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
-"Copiar as mensagens selecionadas para a área de transferência (Ctrl+C)"
+"Copiar as mensagens seleccionadas para a área de transferência (Ctrl+C)"
msgctxt "MessageLog"
msgid "Ctrl+C"
@@ -2173,11 +2269,11 @@ msgstr "Ctrl+C"
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Selecionar Todos"
+msgstr "Seleccionar Todos"
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Selecionar todas as mensagens (Ctrl+A)"
+msgstr "Seleccionar todas as mensagens (Ctrl+A)"
msgctxt "MessageLog"
msgid "Ctrl+A"
@@ -2189,15 +2285,15 @@ msgstr "Salvar Todas"
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Salvar todas as mensagens para um arquivo"
+msgstr "Salvar todas as mensagens para um ficheiro"
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Salvar as Selecionadas"
+msgstr "Salvar as Seleccionadas"
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Salvar as mensagens selecionadas para um arquivo"
+msgstr "Salvar as mensagens seleccionadas para um ficheiro"
msgctxt "MessageLog"
msgid "Settings"
@@ -2205,7 +2301,7 @@ msgstr "Configurações"
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Ajustar a Configuração do Log de Mensagens"
+msgstr "Ajustar a Configuração do Registo de Mensagens"
msgctxt "MessageLog"
msgid "Ctrl+T"
@@ -2229,7 +2325,7 @@ msgstr "Fechar"
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Fechar o Log de Mensagens"
+msgstr "Fechar o Registo de Mensagens"
msgctxt "MessageLog"
msgid "Esc"
@@ -2241,7 +2337,7 @@ msgstr "Procurar"
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Procurar todas as mensagens contendo o texto (Ctrl+F)"
+msgstr "Procurar todas as mensagens contendo o texto da procura(Ctrl+F)"
msgctxt "MessageLog"
msgid "Ctrl+F"
@@ -2261,7 +2357,7 @@ msgstr "Mensagem"
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Salvar a configuração do Log de Mensagens corrente"
+msgstr "Salvar a configuração do Registo de Mensagens actual"
msgctxt "MessageLog"
msgid "Save Settings"
@@ -2269,7 +2365,7 @@ msgstr "Salvar as Configurações"
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Cancela as mudanças efetuadas na configuração"
+msgstr "Cancela as mudanças efectuadas na configuração"
msgctxt "MessageLog"
msgid "Cancel"
@@ -2293,7 +2389,7 @@ msgstr "Nota"
msgctxt "MessageLog"
msgid "Info"
-msgstr "Info"
+msgstr "Informação"
msgctxt "MessageLog"
msgid "Debug"
@@ -2301,11 +2397,11 @@ msgstr "Depuração"
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Histórico de Mensagens do Log"
+msgstr "Histórico de Registo de Mensagens"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Número de mensagens mostradas na janela de mensagens do log"
+msgstr "Número de mensagens mostradas na janela do Registo de mensagens"
msgctxt "MessageLog"
msgid "messages"
@@ -2318,27 +2414,36 @@ msgstr "Navegar"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
msgstr ""
-"Habilitar o salvamento automatico de todas as mensagens de log para arquivo"
+"Habilitar o salvamento automático de todas as mensagens novas do registo "
+"para um ficheiro"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Salvar automaticamente as novas mensagens de log para arquivo"
+msgstr "Salvar automaticamente as novas mensagens do registo para um ficheiro"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Sempre Salvar Novas Mensagens de Log"
+msgid "Basic"
+msgstr "Básico"
msgctxt "MessageLog"
-msgid "toolbar"
-msgstr ""
+msgid "Tor Status"
+msgstr "Estado do Tor"
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr "Avançado"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Salvar Sempre Mensagens do Registo Novas"
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Mensagens que aparecem quando algo de muito errado \n"
-"acontecem e o Tor não consegue prosseguir."
+"Mensagens que aparecem quando algo\n"
+"de muito errado aconteceu e o Tor não consegue prosseguir."
msgctxt "MessageLog"
msgid ""
@@ -2355,10 +2460,10 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Mensagens que raramente aparecem \n"
-"durante a operação normal do Tor e não \n"
-"são considerados erros, mas você pode \n"
-"preocupar-se."
+"Mensagens que aparecem pouco frequentemente\n"
+"durante o funcionamento normal do Tor e não \n"
+"são considerados erros, mas você podem\n"
+"interessar-lhe."
msgctxt "MessageLog"
msgid ""
@@ -2387,12 +2492,16 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa da Rede Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Atualizar"
+msgstr "Actualizar"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Refrescar a lista de retransmissões e conexões do Tor"
+msgstr "Refrescar a lista de retransmissões e ligações do Tor"
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2452,11 +2561,11 @@ msgstr "-"
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Ajustar o Zoom"
+msgstr "Zoom para enquadrar"
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Ajustar o Zoom para conter todos os circuitos mostrados"
+msgstr "Zoom para enquadrar todos os circuitos mostrados"
msgctxt "NetViewer"
msgid "Ctrl+Z"
@@ -2464,7 +2573,7 @@ msgstr "Ctrl+Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Arquivo Não Encontrado"
+msgstr "Retransmissor Não Encontrado"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
@@ -2486,29 +2595,13 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "Bridge inválida"
+msgstr "Ponte inválida"
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "A bridge especificada não é válida."
+msgstr "A ponte especificada não é válida."
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
@@ -2519,8 +2612,8 @@ msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Deve especificar tanto um endereço IP ou hostname como um número de porta "
-"para configurar o Tor a utilizar um proxy para aceder à Internet."
+"Deve especificar tanto um endereço IP ou nome do hospedeiro como um número "
+"de porta para configurar o Tor a utilizar um proxy para aceder à Internet."
msgctxt "NetworkPage"
msgid ""
@@ -2528,7 +2621,7 @@ msgid ""
"connect."
msgstr ""
"Deve especificar uma ou mais portas para que o seu firewall permita a sua "
-"conexão."
+"ligação."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2635,31 +2728,31 @@ msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr ""
+msgstr "Endereço:"
msgctxt "NetworkPage"
msgid "Type:"
-msgstr ""
+msgstr "Tipo:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr ""
+msgstr "Tem de seleccionar o tipo de Proxy"
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr ""
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2671,7 +2764,7 @@ msgstr "Rejeitar"
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Ativo"
+msgstr "Activo"
msgctxt "RouterDescriptor"
msgid "Hibernating"
@@ -2679,7 +2772,7 @@ msgstr "Hibernando"
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Inativo"
+msgstr "Inactivo"
msgctxt "RouterDescriptorView"
msgid "Location:"
@@ -2699,11 +2792,11 @@ msgstr "Largura de Banda:"
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Ativo a:"
+msgstr "Activo a:"
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Última Atualização:"
+msgstr "Última Actualização:"
msgctxt "RouterDescriptorView"
msgid "Copy"
@@ -2715,11 +2808,11 @@ msgstr "Hibernando"
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Ativo"
+msgstr "Activo"
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Inativo"
+msgstr "Inactivo"
msgctxt "RouterInfoDialog"
msgid "Unknown"
@@ -2735,11 +2828,11 @@ msgstr "Sumário"
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Apelido:"
+msgstr "Nome:"
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Estado"
+msgstr "Estado:"
msgctxt "RouterInfoDialog"
msgid "Location:"
@@ -2759,15 +2852,15 @@ msgstr "Largura de Banda:"
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Ativo a:"
+msgstr "Activo a:"
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Informações de contato:"
+msgstr "Contacto:"
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Última Atualização:"
+msgstr "Última Actualização:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
@@ -2775,7 +2868,7 @@ msgstr "Descritor"
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Inativo"
+msgstr "Inactivo"
msgctxt "RouterListItem"
msgid "Hibernating"
@@ -2791,11 +2884,11 @@ msgstr "Retransmissor"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Ampliar o Retransmisor"
+msgstr "Ampliar o Retransmissor"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 retransmissor online"
+msgstr "%1 retransmissores activos"
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2811,15 +2904,15 @@ msgstr "Impressão Digital"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Suporte Bridge Indisponível"
+msgstr "Suporte de Ponte Indisponível"
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Configurou o Tor para actuar como uma bridge retransmisora para utilizadores"
-" censurados, mas a sua versão do Tor não oferece suporte a bridges."
+"Configurou o Tor para actuar como uma ponte retransmissora para utilizadores"
+" censurados, mas a sua versão do Tor não suporta pontes."
msgctxt "ServerPage"
msgid ""
@@ -2827,23 +2920,27 @@ msgid ""
"relay."
msgstr ""
"Actualize o seu software Tor ou configure-o para actuar como um "
-"retransmissor normal."
+"retransmissor normal Tor."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "O relay da sua bridge não está a ser executado."
+msgstr "A sua ponte retransmissora não está a correr."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Deve especificar pelo menos uma alcunha de relay e porta."
+msgstr "Deve especificar pelo menos uma alcunha de retransmissor e porta."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Executar apenas um cliente"
+msgstr "Executar apenas como cliente"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Retransmitir o tráfego para a rede Tor"
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Porta da Relay:"
+msgstr "Porta da Retransmissão:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
@@ -2863,19 +2960,19 @@ msgstr "Mostrar o tópico de ajuda sobre a porta de reencaminhamento"
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Porta do Diretório:"
+msgstr "Porta do Directório:"
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Número da Porta do Diretório"
+msgstr "Número da Porta do Directório"
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Informações de contato:"
+msgstr "Informações de contacto:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nome do seu relay"
+msgstr "Nome do seu retransmissor"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
@@ -2885,7 +2982,7 @@ msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Apelido:"
+msgstr "Alcunha:"
msgctxt "ServerPage"
msgid "Basic Settings"
@@ -2896,7 +2993,7 @@ msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"Para conexões de internet de alta velocidade de download mas baixa de "
+"Para ligações de internet de alta velocidade de download mas baixa de "
"upload, por favor liste sua velocidade de upload aqui."
msgctxt "ServerPage"
@@ -2925,7 +3022,7 @@ msgstr "Personalizada"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Selecione a opção que seja mais adequada a sua conexão de Internet"
+msgstr "Seleccione a opção que seja mais adequada a sua conexão de Internet"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -2949,7 +3046,7 @@ msgstr "Taxa Máxima"
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Teto máximo da taxa de largura de banda"
+msgstr "Tecto máximo da taxa de largura de banda"
msgctxt "ServerPage"
msgid ""
@@ -2969,7 +3066,7 @@ msgstr "Portas 6660 - 6669 e 6697"
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Sala de bate-papo (IRC)"
+msgstr "Sala de chat de retransmissor (IRC)"
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
@@ -2977,7 +3074,7 @@ msgstr "Portas 110, 143, 993 e 995"
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Recuperar E-mail (POP, IMAP)"
+msgstr "Obter E-mail (POP, IMAP)"
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
@@ -2985,7 +3082,7 @@ msgstr "Portas não especificadas nas outras opções"
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Misc Outros Serviços"
+msgstr "Miscelânea Outros Serviços"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
@@ -3029,8 +3126,8 @@ msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Por defeito o Tor ainda bloqueará alguns e-mail's e aplicações de partilha "
-"de ficheiros para reduzir o spam e outros abusos."
+"O Tor ainda bloqueará por defeito, alguns e-mail's de saída e aplicações de "
+"partilha de ficheiros para reduzir o spam e outros abusos."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3038,18 +3135,18 @@ msgstr "Polìticas de Saída"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Permitir que outros acedam à bridge, dando-lhes esta linha:"
+msgstr "Permitir que outros acedam à ponte, por lhes dar esta linha:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
-"Esta é a identidade da sua bridge de retransmissão que você pode dar a "
-"outras pessoas"
+"Esta é a identidade da sua ponte de retransmissão que poderá dar a outras "
+"pessoas"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Copiar a identidade da sua bridge de retransmissão para o clipboard"
+msgstr "Copiar a identidade da sua ponte de retransmissão para o clipboard"
msgctxt "ServerPage"
msgid "No Recent Usage"
@@ -3064,24 +3161,24 @@ msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Deixe a executar o seu retransmissor para que os clientes tenham mais "
+"Deixe a correr o seu retransmissor para que os clientes tenham mais "
"hipóteses de o encontrar e usar."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Histórico de Mensagens do Log"
+msgstr "Histórico da Ponte"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "O Vidalia foi incapaz de registrar os eventos de log do Tor."
+msgstr "O Vidalia foi incapaz de obter o histórico de uso da sua ponte."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor retornou uma resposta formatada incorretamente quando o Vidalia "
-"solicitou o histórico de utilização da sua bridge."
+"Tor encontrou uma resposta formatada incorrectamente quando o Vidalia "
+"solicitou o histórico de utilização da sua ponte."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3093,23 +3190,15 @@ msgstr "Ajudar os utilizadores censurados a alcançar a rede Tor"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Quem utilizou a minha bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">Quem utilizou a minha ponte?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">O que é isto?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
+msgstr "Distribuir automaticamente o endereço da minha ponte"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
@@ -3126,7 +3215,7 @@ msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
+msgstr "Erro quando tentava retirar todos os serviços"
msgctxt "ServicePage"
msgid ""
@@ -3142,7 +3231,7 @@ msgstr "Erro"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Por favor, selecione um Serviço."
+msgstr "Por favor, seleccione um Serviço."
msgctxt "ServicePage"
msgid "Select Service Directory"
@@ -3158,7 +3247,11 @@ msgstr "Alvo só pode conter o endereço:porta, endereço, ou porta."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Pasta em uso por outro serviço."
+msgstr "Pasta já em uso por outro serviço."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formulário"
msgctxt "ServicePage"
msgid "Provided Hidden Services"
@@ -3166,7 +3259,7 @@ msgstr "Serviços Ocultos Prestados"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr ""
+msgstr "Morada na Cebola"
msgctxt "ServicePage"
msgid "Virtual Port"
@@ -3182,7 +3275,7 @@ msgstr "Caminho da Pasta"
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Permitir"
+msgstr "Permitido"
msgctxt "ServicePage"
msgid "Add new service to list"
@@ -3194,7 +3287,7 @@ msgstr "Remover o serviço seleccionado da lista"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Copiar para o clipboard o endereço onion do serviço seleccionado"
+msgstr "Copiar para o clipboard o endereço cebola do serviço seleccionado"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
@@ -3208,19 +3301,19 @@ msgstr "Criado por Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Copiar para o Clipboard"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr ""
+msgstr "O software Tor está a correr"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Está actualmente a correr a versão \"%1\" do software Tor"
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "O software Tor não está a correr"
msgctxt "StatusEventWidget"
msgid ""
@@ -3228,6 +3321,9 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
+"Prima \"Iniciar Tor\" no painel de controlo do Vidalia para reiniciar o "
+"software Tor. Se o Tor desligar inesperadamente, seleccione a aba "
+"\"Avançado\" para detalhes acerca de quaisquer erros encontrados. "
msgctxt "StatusEventWidget"
msgid ""
@@ -3236,6 +3332,10 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
+"Está actualmente a correr a versão \"%1\" do software Tor, que já não é "
+"recomendada. Por favor melhore para a versão mais recente do software, que "
+"pode conter melhoramentos importantes de segurança, fiabilidade e "
+"desempenho."
msgctxt "StatusEventWidget"
msgid ""
@@ -3244,30 +3344,38 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
+"Está actualmente a correr a versão \"%1\" do software Tor, que pode já não "
+"funcionar na actual rede Tor. Por favor melhore para a versão mais recente "
+"do software, que pode conter melhoramentos importantes de segurança, "
+"fiabilidade e desempenho."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "O seu software está fora da validade"
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Ligado à rede Tor"
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
+"Conseguimos estabelecer com sucesso uma ligação à rede Tor. Poderá agora "
+"configurar as suas aplicações para usar a internet anonimamente."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr ""
+msgstr "Erro de software Tor"
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
+"O software Tor encontrou um erro interno. Por favor reporte a seguinte "
+"mensagem de erro aos programadores em bugs.torproject.org:\"%1\"\n"
msgctxt "StatusEventWidget"
msgid ""
@@ -3276,6 +3384,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"O Tor determinou que o relógio do seu computador pode estar atrasado %1 "
+"segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o"
+" Tor não poderá funcionar. Por favor verifique se o seu computador tem a "
+"hora correcta."
msgctxt "StatusEventWidget"
msgid ""
@@ -3284,10 +3396,14 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"O Tor determinou que o relógio do seu computador pode estar adiantado %1 "
+"segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o"
+" Tor não poderá funcionar. Por favor verifique se o seu computador tem a "
+"hora correcta."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "O relógio do seu computador está potencialmente incorrecto."
msgctxt "StatusEventWidget"
msgid ""
@@ -3296,6 +3412,10 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
+"Uma das aplicações do seu computador pode ter tentado fazer uma ligação não "
+"encriptada através do Tor pela porta %1. Enviar informação não encriptada "
+"através da rede Tor é perigoso e não recomendado. Para sua protecção, o Tor "
+"fechou automaticamente esta ligação."
msgctxt "StatusEventWidget"
msgid ""
@@ -3303,10 +3423,13 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
+"Uma das aplicações do seu computador pode ter tentado fazer uma ligação não "
+"encriptada através do Tor pela porta %1. Enviar informação não encriptada "
+"através da rede Tor é perigoso e não recomendado."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Ligação potencialmente perigosa!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3315,10 +3438,14 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
+"Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\" "
+"usando um protocolo que pode verter informação acerca do seu destino. Por "
+"favor configure as suas aplicações para usar apenas SOCKS4a ou SOCKS5 com "
+"resolução remota de nome de hospedeiro. "
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "Protocolo SOCKS desconhecido"
msgctxt "StatusEventWidget"
msgid ""
@@ -3326,10 +3453,14 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
+"Uma das suas aplicações tentou estabelecer uma ligação através do Tor usando"
+" um protocolo que não é reconhecidor. Por favor configure as suas aplicações"
+" para usar apenas SOCKS4a ou SOCKS5 com resolução remota de nome de "
+"hospedeiro. "
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "Nome de Hospedeiro de destino inválido"
msgctxt "StatusEventWidget"
msgid ""
@@ -3337,10 +3468,13 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
+"Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\", "
+"que o Tor não reconhece como nome de hospedeiro válido. Por favor verifique "
+"a configuração das suas aplicações."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr ""
+msgstr "O endereço de IP externo mudou"
msgctxt "StatusEventWidget"
msgid ""
@@ -3348,10 +3482,13 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
+"O Tor determinou que o IP público do seu retransmissor é actualmente %1%2. "
+"Se isto não for correcto, por favor considere usar a opção ?Endereço? na "
+"configuração do seu retransmissor."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "Rapto de DNS detectado"
msgctxt "StatusEventWidget"
msgid ""
@@ -3359,6 +3496,10 @@ msgid ""
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
msgstr ""
+"O Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para "
+"domínios que não existem. Alguns ISPs e outros fornecedores de DNS, como o "
+"OpenDNS, são conhecidos por isto para poderem mostrar as suas próprias "
+"procuras ou páginas de anúncios."
msgctxt "StatusEventWidget"
msgid ""
@@ -3366,10 +3507,14 @@ msgid ""
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
msgstr ""
+"Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para "
+"domínios bem conhecidos. Uma vez que os clientes confiam nos retransmissores"
+" da rede Tor para fornecer respostas DNS precisas, o seu retransmissor não "
+"será configurado como um retransmissor de saída."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Verificando a acessibilidade da Porta do Servidor"
msgctxt "StatusEventWidget"
msgid ""
@@ -3380,15 +3525,16 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Teste de acessibilidade da porta do servidor com sucesso!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
msgstr ""
+"A porta do servidor do seu retransmissor é acessível desde a rede Tor!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Teste de acessibilidade da porta do servidor falhou"
msgctxt "StatusEventWidget"
msgid ""
@@ -3397,10 +3543,14 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
+"A porta de servidor do seu retransmissor não é acessível por outros clientes"
+" Tor. Isto pode acontecer se tiver um router ou uma firewall que requeira "
+"uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de servidor "
+"correctopor favor verifique a configuraçaõ do seu retransmissor."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Verificando a acessibilidade do directório de portas"
msgctxt "StatusEventWidget"
msgid ""
@@ -3408,18 +3558,22 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
+"O Tor está a tentar determinar se o directório de portas do seu "
+"retransmissor é acessível pela rede Tor, ligando-se a si em %1:%2. Este "
+"teste pode deorar vários minutos."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Teste de acessibilidade do directório de portas com sucesso!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
msgstr ""
+"O directório de portas do seu retransmissor é acessível pela rede Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Teste de acessibilidade do directório de portas falhou"
msgctxt "StatusEventWidget"
msgid ""
@@ -3428,20 +3582,27 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
+"O directório de portas do seu retransmissor não é acessível por outros "
+"clientes Tor. Isto pode acontecer se tiver um router ou uma firewall que "
+"requeira uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de "
+"servidor correctopor favor verifique a configuraçaõ do seu retransmissor."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Descritor do retransmissor rejeitado"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
+"O descritor do seu retransmissor, que permite aos clientes ligarem-se ao seu"
+" retransmissor foi rejeitado pelo servidor do directório em %1:%2. A razão "
+"dada foi: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr ""
+msgstr "O seu retransmissor esá online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3450,22 +3611,10 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
+"O seu retransmissor está agora online e disponível para os clientes Tor "
+"usarem. Deverá notar um aumento no tráfego de rede mostrado no Gráfico de "
+"Largura de Banda dentro de algumas horas, à medida que mais clientes saibam "
+"do seu retransmissor. Obrigado por contribuir para a rede Tor."
msgctxt "Stream"
msgid "New"
@@ -3477,11 +3626,11 @@ msgstr "Resolvendo"
msgctxt "Stream"
msgid "Connecting"
-msgstr "Conectando"
+msgstr "Ligando"
msgctxt "Stream"
msgid "Open"
-msgstr "Conectado"
+msgstr "Ligado"
msgctxt "Stream"
msgid "Failed"
@@ -3489,7 +3638,7 @@ msgstr "Falhou"
msgctxt "Stream"
msgid "Closed"
-msgstr "Desconectado"
+msgstr "Fechado"
msgctxt "Stream"
msgid "Retrying"
@@ -3503,12 +3652,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Desconhecido"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "O Processo %1 não pôde ser encerrado. [%2]"
@@ -3527,89 +3670,68 @@ msgstr "Falha de Hashing na palavra-chave de controlo."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr ""
+msgstr "Editando torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
+"Gravar definições. Se não marcado, só se aplicará às definições actuais do "
+"Tor."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Cortar"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Copiar"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Colar"
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr ""
+msgstr "Voltar atrás"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr ""
+msgstr "Voltar a fazer"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Escolher todos"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr ""
+msgstr "Aplicar a todos"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr ""
+msgstr "Aplicar apenas aos seleccionados"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Erro ao conectar ao Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
+"Selecção vazia. Por favor seleccione algum texto, ou escolha Aplicar a todos"
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Erro na linha %1:\"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Erro"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
+msgstr "Um erro ocorreu quando abria o ficheiro torrc"
msgctxt "UPNPControl"
msgid "Success"
@@ -3617,11 +3739,12 @@ msgstr "Sucesso"
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Não foram encontrados aparelhos activados para UPnP"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+"Não foram encontrados aparelhos de porta de Internet activados para UPnP "
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3645,15 +3768,15 @@ msgstr "Erro desconhecido"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Descobrindo dispositivos permitidos para UPnP"
+msgstr "Descobrindo dispositivos activados para UPnP"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr ""
+msgstr "Actualizando o mapeamento do directório de portas"
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Actualizar o mapeamento da porta de retransmissão"
+msgstr "Actualizando o mapeamento da porta de retransmissão"
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
@@ -3672,8 +3795,8 @@ msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Vidalia foi incapaz de verificar se há atualizações de software disponíveis,"
-" porque não pôde encontrar '%1'."
+"Vidalia foi incapaz de verificar se há actualizações de software "
+"disponíveis, porque não pôde encontrar '%1'."
msgctxt "UpdateProcess"
msgid ""
@@ -3725,7 +3848,7 @@ msgstr "Actualizações do Software Disponíveis"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Lembrar mais tarde"
+msgstr "Lembrar-me mais tarde"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3739,19 +3862,19 @@ msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Backspace"
+msgstr "Embalagem"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "versão"
+msgstr "Versão"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "Enviando relatório de erro"
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "Impossível enviar relatório: %1"
msgctxt "VMessageBox"
msgid "OK"
@@ -3779,7 +3902,7 @@ msgstr "Tentar Novamente"
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Mostrar o Log"
+msgstr "Mostrar o Registo"
msgctxt "VMessageBox"
msgid "Show Settings"
@@ -3815,7 +3938,7 @@ msgstr "Redefinição de TODAS as configurações guardadas do Vidalia."
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Define a pasta que o Vidalia usa para armazena os ficheiros de dados"
+msgstr "Define a pasta que o Vidalia usa para armazenar os ficheiros de dados"
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
@@ -3823,19 +3946,19 @@ msgstr "Define o nome e a localização dos pidfiles do Vidalia."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Indicar o nome e caminho do arquivo de log do Vidalia."
+msgstr "Indicar o nome e caminho do ficheiro de registo do Vidalia."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Indicar a verbosidade dos logs do Vidalia."
+msgstr "Indicar a verbosidade dos registos do Vidalia."
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Selecionar estilo da interface do Vidalia."
+msgstr "Seleccionar estilo da interface do Vidalia."
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Selecionar Idioma do Vidalia."
+msgstr "Seleccionar Idioma do Vidalia."
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
@@ -3843,7 +3966,7 @@ msgstr "Informação de Uso do Vidalia"
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Não foi possível abrir o arquivo de log '%1': %2"
+msgstr "Não foi possível abrir o arquivo de registo '%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
@@ -3851,11 +3974,11 @@ msgstr "É Inválido o código do idioma especificado:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Especificado estilo inválido de GUI:"
+msgstr "Estilo especificado de GUI inválido:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Especificado nível de log inválido:"
+msgstr "Especificado nível de registo inválido:"
msgctxt "Vidalia"
msgid ""
@@ -3863,7 +3986,7 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Possivelmente já está em execução outro processo Vidalia. Se já estiver em execução outro processo do Vidalia, pode optar por continuar de qualquer maneira.\n"
+"Possivelmente já está em execução outro processo Vidalia. Se realmente não estiver em execução outro processo do Vidalia, pode optar por continuar de qualquer maneira.\n"
"\n"
"Gostaria de continuar a iniciar o Vidalia?"
@@ -3898,3 +4021,5 @@ msgstr "%1 horas"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minutos"
+
+
diff --git a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
index 6a395a6..1fd6286 100644
--- a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
+++ b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:57+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -232,6 +233,10 @@ msgid "Show Settings"
msgstr "Exibir parâmetros"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Largura de banda usada pelo Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reinicializar"
@@ -271,10 +276,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,26 +429,17 @@ msgid "Control socket is not connected."
msgstr "Conexão de controle não estabelecida."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Senha requerida"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Remember my password"
+msgstr "Lembrar senha"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1343,6 +1335,10 @@ msgid "Browse"
msgstr "Procurar"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Iniciar Tor e Vidalia juntos"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1370,10 +1366,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 kb/s"
@@ -1661,6 +1653,34 @@ msgid "New Identity"
msgstr "Nova identidade"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1669,6 +1689,10 @@ msgid "View"
msgstr "Ver"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ajuda do Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Erro ao iniciar navegador de internet"
@@ -1783,6 +1807,10 @@ msgid "Tor is shutting down"
msgstr "Encerrando Tor"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Parar o Tor agora"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Parar Tor"
@@ -1873,6 +1901,18 @@ msgstr ""
" funções ficarão indisponíveis."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Erro de autenticação"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia foi incapaz de autenticar-se no aplicativo Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Por favor, verifique suas configurações da porta de controle"
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Atualização disponível para o Tor"
@@ -1918,11 +1958,85 @@ msgid "Status"
msgstr "Estado"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Atalhos do Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Configurar servidor\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Configure um servidor e ajude no crescimento da rede"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Visualizar rede"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Exibir mapa da rede Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Usar nova identidade"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Fazer conexões subsequentes parecerem novas"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Ver utilização recente de banda"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Ver histórico das mensagens de registro"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Ver documentação de ajuda"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Configurar Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Obter versão e informações de licenciamento"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Fechar Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Mostrar esta janela no inicio"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Esconder"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Esconder esta janela"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Falha ao restabelecer senha"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia tentou restabelecer a senha de controle do Tor, no entanto foi "
+"incapaz de reiniciar este aplicativo. Por favor verifique se não existe "
+"outra instancia do Tor em execução."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1982,31 +2096,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2024,16 +2120,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2041,20 +2127,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Erro ao configurar filtro"
@@ -2312,14 +2384,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Salvar, automaticamente, novas mensagens de registro para um arquivo"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Sempre salvar novas mensagens de registro"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Sempre salvar novas mensagens de registro"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2359,6 +2439,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa da rede Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Atualizar"
@@ -2458,22 +2542,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ponte inválida"
@@ -2812,6 +2880,10 @@ msgid "Run as a client only"
msgstr "Executar somente como cliente"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Encaminhar tráfego para rede Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta do servidor:"
@@ -3065,14 +3137,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3120,6 +3184,10 @@ msgid "Directory already in use by another service."
msgstr "Diretório já em uso por outro serviço."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Form"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Serviços ocultos oferecidos"
@@ -3410,22 +3478,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Novo"
@@ -3462,12 +3514,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Desconhecido"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Falha ao interromper o processo %1. [%2]"
@@ -3546,30 +3592,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Sucesso"
@@ -3849,3 +3871,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ru/vidalia_ru.po b/src/vidalia/i18n/po/ru/vidalia_ru.po
index f2d74a0..5734659 100644
--- a/src/vidalia/i18n/po/ru/vidalia_ru.po
+++ b/src/vidalia/i18n/po/ru/vidalia_ru.po
@@ -1,10 +1,12 @@
#
+# axe <axe.rode at ymail.com>, 2011.
+# Андрей Костенко <andrey at kostenko.name>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:39+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
@@ -235,6 +237,10 @@ msgid "Show Settings"
msgstr "Показать настройки"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor трафик"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Сброс"
@@ -274,10 +280,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отменить"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Начинаем HTTPS-запрос мостa ..."
@@ -431,27 +433,20 @@ msgid "Control socket is not connected."
msgstr "Контрольный сокет не подключен."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Необходим пароль"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Запомнить пароль"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia подключилась к работающему процессу Tor, который требует пароль. "
+"Пожалуйста, введите свой пароль:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1346,6 +1341,10 @@ msgid "Browse"
msgstr "Обзор"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Запускать Tor при запуске Vidalia"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1373,10 +1372,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Проверить сейчас"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 КБ/с"
@@ -1663,6 +1658,34 @@ msgid "New Identity"
msgstr "Сменить личину"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1671,6 +1694,10 @@ msgid "View"
msgstr "Просмотр"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Помощь"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Ошибка при запуске веб-браузера"
@@ -1783,6 +1810,10 @@ msgid "Tor is shutting down"
msgstr "Tor останавливается"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Остановить Tor прямо сейчас"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Остановить Tor"
@@ -1871,6 +1902,19 @@ msgstr ""
"функций Vidalia могут быть недоступны."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Ошибка аутентификации"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+"Vidalia не смогла подтвердить подлинность программного обеспечения Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Пожалуйста, проверьте настройки управления портом аутентификации."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Обновление Tor доступно"
@@ -1914,11 +1958,85 @@ msgid "Status"
msgstr "Статус"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Ярлыки Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Настройка сервера\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Настройте сервер и помогите росту сети"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Обзор сети"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Обзор карты сети Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Сменить личину"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Последующие соединения будут новыми"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Посмотреть текущий трафик"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Показать историю журнала сообщений"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Просмотреть помощь"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Настроить Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Посмотреть информацию о версии и о лицензии"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Выход Vidalia"
+
+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 ""
+"Vidalia пыталась сбросить пароль управления Tor, но была не в состоянии "
+"перезагрузить программное обеспечение Tor. Пожалуйста, проверьте диспетчер "
+"задач, чтобы убедиться, что нет больше никаких работающих процессов Tor."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr "Установленная версия Tor устарела или не рекомендуется."
@@ -1982,32 +2100,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "не удалось (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Ваш сервер выключается. Нажмите на кнопку \"Стоп\" для остановки вашего "
+"сервера сейчас."
msgctxt "MainWindow"
msgid ""
@@ -2030,16 +2132,6 @@ msgstr ""
"или сообщения об ошибках."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "не удалось (%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", вероятно, Telnet,"
@@ -2047,22 +2139,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", вероятно, клиент электронной почты,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Ваш сервер выключается. Нажмите на кнопку \"Стоп\" для остановки вашего "
-"сервера сейчас."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Ошибка при установке фильтра"
@@ -2318,14 +2394,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Автоматически сохранять новые сообщения в файл"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Всегда сохранять новые сообщения"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+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."
@@ -2370,6 +2454,10 @@ msgid ""
msgstr "Невозможно записать файл %1 %2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Карта сети Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Обновить"
@@ -2469,22 +2557,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Неверный мост"
@@ -2829,6 +2901,10 @@ msgid "Run as a client only"
msgstr "Режим работы только как клиент"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Серверный трафик сети Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Порт сервера:"
@@ -3088,14 +3164,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Зеркало каталога серверов"
@@ -3145,6 +3213,10 @@ msgid "Directory already in use by another service."
msgstr "Каталог уже используется другой службой."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Форма"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Предоставленный скрытый сервис"
@@ -3435,22 +3507,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Создать"
@@ -3487,12 +3543,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Неизвестно"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Процесс %1 не удалось остановить. [%2]"
@@ -3571,30 +3621,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Успех"
@@ -3885,3 +3911,5 @@ msgstr "%1 часов"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 мин"
+
+
diff --git a/src/vidalia/i18n/po/sco/vidalia_sco.po b/src/vidalia/i18n/po/sco/vidalia_sco.po
index 0a76d76..710c7e0 100644
--- a/src/vidalia/i18n/po/sco/vidalia_sco.po
+++ b/src/vidalia/i18n/po/sco/vidalia_sco.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:43+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:41+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/son/vidalia_son.po b/src/vidalia/i18n/po/son/vidalia_son.po
index cc59096..c5fde3f 100644
--- a/src/vidalia/i18n/po/son/vidalia_son.po
+++ b/src/vidalia/i18n/po/son/vidalia_son.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:42+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/su/vidalia_su.po b/src/vidalia/i18n/po/su/vidalia_su.po
index c7779a7..b0c343e 100644
--- a/src/vidalia/i18n/po/su/vidalia_su.po
+++ b/src/vidalia/i18n/po/su/vidalia_su.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/sw/vidalia_sw.po b/src/vidalia/i18n/po/sw/vidalia_sw.po
index d7e175a..257ffc6 100755
--- a/src/vidalia/i18n/po/sw/vidalia_sw.po
+++ b/src/vidalia/i18n/po/sw/vidalia_sw.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ta/vidalia_ta.po b/src/vidalia/i18n/po/ta/vidalia_ta.po
index bff8877..b89c502 100644
--- a/src/vidalia/i18n/po/ta/vidalia_ta.po
+++ b/src/vidalia/i18n/po/ta/vidalia_ta.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:46+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/te/vidalia_te.po b/src/vidalia/i18n/po/te/vidalia_te.po
index 65ad3df..188b0f3 100644
--- a/src/vidalia/i18n/po/te/vidalia_te.po
+++ b/src/vidalia/i18n/po/te/vidalia_te.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/templates/vidalia.pot b/src/vidalia/i18n/po/templates/vidalia.pot
index eb6964e..3070fb0 100644
--- a/src/vidalia/i18n/po/templates/vidalia.pot
+++ b/src/vidalia/i18n/po/templates/vidalia.pot
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
@@ -223,6 +223,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -262,10 +266,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -419,21 +419,15 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid "You will need to shut down the Tor process before Vidalia can launch a new one."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process."
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1321,6 +1315,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1348,10 +1346,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1629,6 +1623,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1637,6 +1659,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1749,6 +1775,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1825,6 +1855,18 @@ msgid "Vidalia was unable to register for some events. Many of Vidalia's feature
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1861,111 +1903,127 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid "Configure Vidalia"
msgstr ""
msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2."
+msgid "View version and license information"
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."
+msgid "Exit Vidalia"
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid "Show this window on startup"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Hide"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid "Hide this window"
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+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 "Actions"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia tried to restart Tor, but was not able to. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Installation Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "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"
@@ -1974,11 +2032,23 @@ msgid "Your relay is shutting down.\n"
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+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 was unable to reload Tor's configuration."
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2234,11 +2304,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2275,6 +2353,10 @@ msgid "Cannot write file %1\n"
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2374,22 +2456,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2703,6 +2769,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -2935,14 +3005,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -2984,6 +3046,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3203,22 +3269,6 @@ 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 "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3255,10 +3305,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid "Vidalia has not started Tor. You need to stop Tor through the interface you started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3335,30 +3381,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/tg/vidalia_tg.po b/src/vidalia/i18n/po/tg/vidalia_tg.po
index 041d2e1..9fa44e6 100644
--- a/src/vidalia/i18n/po/tg/vidalia_tg.po
+++ b/src/vidalia/i18n/po/tg/vidalia_tg.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/th/vidalia_th.po b/src/vidalia/i18n/po/th/vidalia_th.po
index 8c0768f..7762017 100644
--- a/src/vidalia/i18n/po/th/vidalia_th.po
+++ b/src/vidalia/i18n/po/th/vidalia_th.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:56+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -232,6 +233,10 @@ msgid "Show Settings"
msgstr "แสดง ส่วนตั้งค่า"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "การใช้ Bandwidth ของ Tor"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "ล้างทิ้ง"
@@ -271,10 +276,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ยกเลิก"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,26 +429,17 @@ msgid "Control socket is not connected."
msgstr "ไม่ได้เชื่อมต่อกับ socket ควบคุม"
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "กรุณาใส่รหัสผ่าน"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Remember my password"
+msgstr "จดจำรหัสผ่าน"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1343,6 +1335,10 @@ msgid "Browse"
msgstr "เลือก"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "เริ่มการทำงาน Tor ด้วยเมื่อ Vidalia เริ่มทำงาน"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1370,10 +1366,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1663,6 +1655,34 @@ msgid "New Identity"
msgstr "สร้างตัวตนใหม่"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1671,6 +1691,10 @@ msgid "View"
msgstr "มองดู"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "ส่วนช่วยเหลือ Vidalia"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "ผิดพลาดในการสั่งเริ่มโปรแกรมท่องอินเตอร์เน็ต(web browser)"
@@ -1783,6 +1807,10 @@ msgid "Tor is shutting down"
msgstr "กำลังปิดการทำงาน Tor"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "หยุด Tor เดี๋ยวนี้"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "หยุด Tor"
@@ -1871,6 +1899,18 @@ msgstr ""
"ทำให้ความสามารถหลายๆอย่างของ Vidalia อาจไม่สามารถใช้งานได้"
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "ผิดพลาด ในการขอสิทธิ"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia ไม่สามารถขอสิทธิเข้าถึงโปรแกรม Tor ได้. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "กรุณาตรวจสอบ การตั้งค่าการให้สิทธิ port ควบคุมของคุณ"
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "มีโปรแกรม Tor รุ่นใหม่กว่าที่ใช้อยู่ปัจจุบัน"
@@ -1913,11 +1953,85 @@ msgid "Status"
msgstr "สถานะ"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "ปุ่มลัด Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "ตั้งตนเป็น Relay\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "ตั้งตนเป็น Relay ช่วยเหลือขยายเครือข่ายให้ Tor"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "ดูแผนที่เครือข่าย"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "ดูแผนที่เครือข่าย Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "เปลี่ยนตัวตนใหม่"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "จะส่งผลให้เราย้ายไปใช้ จุดออกของ Tor เครื่องใหม่ จนดูเหมือนเป็นอีกคน"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "ดูระดับการใช้ bandwidth"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "ดูข้อความสิ่งที่ทำไป"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "ดูเอกสารช่วยเหลือ"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "ตั้งค่า Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "ดู รุ่น และ ข้อมูลลิขสิทธิ"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "ปิดโปรแกรม Vidalia"
+
+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 ""
+"Vidalia พยายามล้างรหัสผ่าน ในการควบคุม Tor ทิ้ง. "
+"แต่ไม่สามารถเริ่มการทำงานโปรแกรม Tor ใหม่ได้. กรุณาตรวจสอบแก้ไขบน Task "
+"Manager เพื่อให้มั่นใจได้ว่า Tor ตัวเดิม ไม่ได้ทำงานอยู่."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1977,31 +2091,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2019,16 +2115,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2036,20 +2122,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "ผิดพลาด ในการตั้งค่าตัวกรอง"
@@ -2303,14 +2375,22 @@ msgid "Automatically save new log messages to a file"
msgstr "จัดเก็บ ข้อความสิ่งที่เพิ่งทำไปใหม่ๆ ลงไฟล์โดยอัตโนมัติ"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+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."
@@ -2350,6 +2430,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "แผนที่เครือข่าย Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "แสดงใหม่"
@@ -2449,22 +2533,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Bridge ไม่ถูกต้อง "
@@ -2806,6 +2874,10 @@ msgid "Run as a client only"
msgstr "เป็นตัวลูก (ใช้งานอย่างเดียว)"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "เป็น Tor Relay (ช่วยส่งผ่านข้อมูลต่างๆให้เครือข่าย Tor ด้วย)"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "เลข Port Relay:"
@@ -3063,14 +3135,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3118,6 +3182,10 @@ msgid "Directory already in use by another service."
msgstr "ที่จัดเก็บนี้มีบริการอื่นใช้อยู่แล้ว"
msgctxt "ServicePage"
+msgid "Form"
+msgstr "แบบฟอร์ม"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "การให้บริการแบบซ่อนตัวตน"
@@ -3406,22 +3474,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "สร้างใหม่"
@@ -3458,12 +3510,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "ไม่ทราบ"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "ล้มเหลวในการหยุดการทำงาน %1. [%2]"
@@ -3542,30 +3588,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "สำเร็จ"
@@ -3844,3 +3866,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ti/vidalia_ti.po b/src/vidalia/i18n/po/ti/vidalia_ti.po
index 6528cb1..eaa7645 100644
--- a/src/vidalia/i18n/po/ti/vidalia_ti.po
+++ b/src/vidalia/i18n/po/ti/vidalia_ti.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/tk/vidalia_tk.po b/src/vidalia/i18n/po/tk/vidalia_tk.po
index 4c3059b..797c107 100644
--- a/src/vidalia/i18n/po/tk/vidalia_tk.po
+++ b/src/vidalia/i18n/po/tk/vidalia_tk.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:45+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/tr/vidalia_tr.po b/src/vidalia/i18n/po/tr/vidalia_tr.po
index 4b839b8..975d91c 100644
--- a/src/vidalia/i18n/po/tr/vidalia_tr.po
+++ b/src/vidalia/i18n/po/tr/vidalia_tr.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:56+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -234,6 +235,10 @@ msgid "Show Settings"
msgstr "Ayarları göster"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor Ağ Kullanımı"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Sıfırla"
@@ -273,10 +278,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "İptal"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "HTTPS isteğini başlatıyor..."
@@ -430,27 +431,20 @@ msgid "Control socket is not connected."
msgstr "Kontrol soketi bağlı değil."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
+msgid "Password Required"
+msgstr "Parola Gerekiyor"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Parolamı Hatırla"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
+"Vidalia parola gerektiren bir Tor sürecine bağlandı. Lütfen kontrol "
+"parolasını giriniz:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1345,6 +1339,10 @@ msgid "Browse"
msgstr "Gözat"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Vidalia başladığında, Tor yazılımını da başlat"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1372,10 +1370,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Şimdi kontrol et"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1663,6 +1657,34 @@ msgid "New Identity"
msgstr "Yeni Bağlantı"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1671,6 +1693,10 @@ msgid "View"
msgstr "Görünüm"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Yardım"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Web gezgini başlatırlırken hata oluştu"
@@ -1783,6 +1809,10 @@ msgid "Tor is shutting down"
msgstr "Kapatılıyor"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Durdur"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Durdur"
@@ -1870,6 +1900,18 @@ msgstr ""
"fonksiyonu çalışmıyor olabilir."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Kimlik doğrulamada hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Tor'un doğruluğu sağlanamadı.(%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Lütfen kimlik doğrulama portunuzu kontrol edin."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor'un yeni güncelleştirmesi var"
@@ -1913,11 +1955,85 @@ msgid "Status"
msgstr "Durum"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Kısayollar"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Bağlantı ayarları\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Kendi ağınızı kurarak bu hizmetin büyümesine yardımcı olabilirsiniz."
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Ağı göster"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Tor Ağını haritada göster"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Kimliği Yenile"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Yeni bağlantılar oluşturur"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Band kullanımı"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Günlük kayıtları"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Yardım"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Ayarlar"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Sürüm ve Lisans"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Çıkış"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Başlangıçta göster"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Gizle"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Pencereyi gizle"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Şifre sıfırlanamadı"
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 ""
+"Vidilia kontrol şifresinizi sıfırlamayı denedi, ama başaramadı.Lütfen "
+"programı yeniden başlatın.Ayrıca görev yöneticinizden başka tor programının "
+"çalışmadığından emin olun."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1980,32 +2096,14 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "Hata(%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr ""
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Bağlantınız sonlandırılıyor."
msgctxt "MainWindow"
msgid ""
@@ -2028,16 +2126,6 @@ msgstr ""
"Günlük kayıtlarından hata sebebini kontrol edebilirsiniz."
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Hata(%1)"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", Telnet,"
@@ -2045,20 +2133,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", e-posta istemcisi,"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Bağlantınız sonlandırılıyor."
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Filtreler ayarlanırken hata oluştu"
@@ -2312,14 +2386,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Yeni günlük mesajlarını otomatik kaydet"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Yeni günlük mesajlarını herzaman kaydet"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Yeni günlük mesajlarını herzaman kaydet"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2368,6 +2450,10 @@ msgstr ""
"%2."
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Ağ haritası"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Yenile"
@@ -2467,22 +2553,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Hatalı köprü"
@@ -2822,6 +2892,10 @@ msgid "Run as a client only"
msgstr "Sadece kullanıcı olarak çalıştır"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor ağının bir parçası olmak istiyorum"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Aktarım portu:"
@@ -3077,14 +3151,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Geçit dizinini yansıla"
@@ -3133,6 +3199,10 @@ msgid "Directory already in use by another service."
msgstr "Bu klasör zaten başka bir hizmet tarafından kullanılıyor."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Form"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Arkaplan hizmetleri"
@@ -3421,22 +3491,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Yeni"
@@ -3473,12 +3527,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Bilinmeyen"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "%1 işlemini durdurken hata oluştu.[%2]"
@@ -3557,30 +3605,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Başarılı"
@@ -3864,3 +3888,5 @@ msgstr " saat"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 dakika"
+
+
diff --git a/src/vidalia/i18n/po/ur/vidalia_ur.po b/src/vidalia/i18n/po/ur/vidalia_ur.po
index 219c3e1..49d5f5f 100644
--- a/src/vidalia/i18n/po/ur/vidalia_ur.po
+++ b/src/vidalia/i18n/po/ur/vidalia_ur.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:47+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/ve/vidalia_ve.po b/src/vidalia/i18n/po/ve/vidalia_ve.po
index a3e9723..ff3e342 100644
--- a/src/vidalia/i18n/po/ve/vidalia_ve.po
+++ b/src/vidalia/i18n/po/ve/vidalia_ve.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:48+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/vi/vidalia_vi.po b/src/vidalia/i18n/po/vi/vidalia_vi.po
index 49489eb..c1711fa 100755
--- a/src/vidalia/i18n/po/vi/vidalia_vi.po
+++ b/src/vidalia/i18n/po/vi/vidalia_vi.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:54+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +232,10 @@ msgid "Show Settings"
msgstr "Hiện những Thiết lập"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Cách dùng Tor Bandwidth"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Đặt lại"
@@ -270,10 +275,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Thôi"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +428,17 @@ msgid "Control socket is not connected."
msgstr "Socket kiểm soát không được kết nối."
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "Mật khẩu bắt buộc"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "Ghi nhớ mật khẩu của tôi"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1334,10 @@ msgid "Browse"
msgstr "Trình duyệt"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Bắt đầu phần mềm Tor khi bắt đầu Vidalia"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "The-onion-router"
@@ -1369,10 +1365,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1660,6 +1652,34 @@ msgid "New Identity"
msgstr "Giám định Mới"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1668,6 +1688,10 @@ msgid "View"
msgstr "Xem"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia Trợ giúp"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Lỗi bắt đầu trình duyệt web"
@@ -1780,6 +1804,10 @@ msgid "Tor is shutting down"
msgstr "Tor là tắt"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Dừng Tor Now"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Dừng Tor"
@@ -1868,6 +1896,19 @@ msgstr ""
"của Vidalia có thể không có sẵn."
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Lỗi xác thực"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia không thể xác nhận phần mềm Tor. (% 1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"Vui lòng kiểm tra các thiết lập xác thực cổng truy nhập điều khiển của bạn."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Có sẵn Cập nhật Tor "
@@ -1911,11 +1952,85 @@ msgid "Status"
msgstr "Tình trạng"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "đường tắt Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Thiết lập tiếp nhận\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Thiết lập một chuyển tiếp và giúp phát triển mạng lưới"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Xem các mạng"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Xem một bản đồ của mạng Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Sử dụng một Identity mới"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Làm cho các kết nối tiếp theo tro*? tha`nh mới"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Xem băng thông sử dụng gần đây"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Xem lịch sử tin đăng nhập "
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Xem tài liệu trợ giúp"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Cấu hình Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Xem thông tin về phiên bản và giấy phép"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Thoát khỏi Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Hiển thị cửa sổ này lu'c khởi động"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "giấu"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ẩn cửa sổ này"
+
+msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Đặt lại mật khẩu bị lỗi"
msgctxt "MainWindow"
msgid ""
+"Vidalia tried to reset Tor's control password, but was not able to restart "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+"Vidalia đã thu*? đặt lại mật khẩu điều khiển Tor, nhưng đã không thể khởi "
+"động lại phần mềm Tor. Vui lòng kiểm tra quản lý công việc của bạn để đảm "
+"bảo không có tiến trình Tor khác đang chạy."
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -1975,31 +2090,13 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
@@ -2017,16 +2114,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2034,20 +2121,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Lỗi Thiết Filter"
@@ -2305,14 +2378,22 @@ msgid "Automatically save new log messages to a file"
msgstr "Tự động lưu các tin nhắn đăng nhập mới vào một tập tin"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Tor Status"
msgstr ""
msgctxt "MessageLog"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2352,6 +2433,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Bản đồ mạng Tor"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "Cập nhật"
@@ -2451,22 +2536,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Cầu không hợp lệ"
@@ -2806,6 +2875,10 @@ msgid "Run as a client only"
msgstr "Chạy chi? như một khách hàng"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tiếp sức giao thông cho mạng Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Cổng tiếp sức:"
@@ -3063,14 +3136,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3117,6 +3182,10 @@ msgid "Directory already in use by another service."
msgstr "Thư mục đã được sử dụng bởi dịch vụ khác."
msgctxt "ServicePage"
+msgid "Form"
+msgstr "Mẫu"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Những dịch vụ ẩn được cung cấp"
@@ -3407,22 +3476,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Mới"
@@ -3459,12 +3512,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Không biết"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Quá trình % 1 không ngừng. [% 2]"
@@ -3543,30 +3590,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Thành công"
@@ -3845,3 +3868,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
index bfd1279..9f2f689 100644
--- a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
+++ b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
@@ -1,10 +1,11 @@
#
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-06 19:59+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-07-27 01:11+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -234,6 +235,10 @@ msgid "Show Settings"
msgstr "显示设定"
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor 带宽使用"
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "复位设定"
@@ -273,10 +278,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "取消"
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "开始 HTTPS 网桥请求..."
@@ -430,27 +431,18 @@ msgid "Control socket is not connected."
msgstr "控制接口当前未连接。"
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
-msgstr ""
+msgid "Password Required"
+msgstr "需要密码"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
+msgid "Remember my password"
+msgstr "记住我的密码"
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
-msgstr ""
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
+msgstr "Vidalia 已经连接至一个运行中的需要密码的 Tor 进程。请输入您的控制密码："
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1345,6 +1337,10 @@ msgid "Browse"
msgstr "浏览"
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Vidalia 启动时运行 Tor 软件"
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1372,10 +1368,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "现在检查"
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/秒"
@@ -1658,6 +1650,34 @@ msgid "New Identity"
msgstr "更换身份"
msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1666,6 +1686,10 @@ msgid "View"
msgstr "查看"
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia 帮助"
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "启动浏览器时发生了错误"
@@ -1778,6 +1802,10 @@ msgid "Tor is shutting down"
msgstr "正在关闭 Tor"
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "立刻停止 Tor"
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "停止 Tor"
@@ -1860,6 +1888,18 @@ msgid ""
msgstr "Vidalia 无法注册某些事件，可能造成 Vidalia 的很多功能不可用。"
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "认证出错"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia无法通过Tor软件的认证。(%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "请检查控制端口验证设定."
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "有可用的 Tor 更新"
@@ -1900,11 +1940,82 @@ msgid "Status"
msgstr "状态"
msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia 快捷方式"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "设置中继服务器\n"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "创建中继节点帮助Tor网络成长"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "查看网络地图"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "查看 Tor 网络的分布图"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "更换身份"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "创建一个新的网络连接"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "浏览最近的带宽使用情况"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "浏览日志记录"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "查看帮助文档"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "配置 Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "查看版本和授权信息"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "退出 Vidalia"
+
+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 "Vidalia尝试重置Tor的控制密码，但无法重新启动Tor。请检查任务管理器确保没有其他的Tor进程运行。"
+
+msgctxt "MainWindow"
+msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr "当前安装的Tor版本已经过时，不再推荐使用。"
@@ -1964,32 +2075,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Stop"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Restart"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Reload Tor's config"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Actions"
-msgstr ""
+msgid "failed (%1)"
+msgstr "失败（%1）"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"正在关闭您的中继服务。\n"
+"再次单击'停止'立刻关闭中继。"
msgctxt "MainWindow"
msgid ""
@@ -2012,16 +2107,6 @@ msgstr ""
"请检查消息日志获取最近的警告及错误信息。"
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "失败（%1）"
-
-msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr "，也许是Telnet程序，"
@@ -2029,22 +2114,6 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr "，也许是Email客户端，"
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"正在关闭您的中继服务。\n"
-"再次单击'停止'立刻关闭中继。"
-
-msgctxt "MainWindow"
-msgid "Error reloading configuration"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
-msgstr ""
-
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "设定过滤条件时发生错误"
@@ -2298,14 +2367,22 @@ msgid "Automatically save new log messages to a file"
msgstr "自动保存新的消息内容至文件"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "总是保存新消息"
+msgid "Basic"
+msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+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."
@@ -2350,6 +2427,10 @@ msgstr ""
"%2。"
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor 网络地图"
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr "刷新"
@@ -2449,22 +2530,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "无效网桥"
@@ -2790,6 +2855,10 @@ msgid "Run as a client only"
msgstr "仅运行客户端功能"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor 网络中继"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "中继端口:"
@@ -3036,14 +3105,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "镜像中继目录"
@@ -3090,6 +3151,10 @@ msgid "Directory already in use by another service."
msgstr "此目录已被其他服务占用。"
msgctxt "ServicePage"
+msgid "Form"
+msgstr "表单"
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "已提供隐藏服务"
@@ -3378,22 +3443,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "新建"
@@ -3430,12 +3479,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "未知"
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "进程 %1 停止失败. [%2]"
@@ -3514,30 +3557,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "成功"
@@ -3819,3 +3838,5 @@ msgstr "%1 小时"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 分"
+
+
diff --git a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
index 6877ae2..093bf99 100755
--- a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
+++ b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:46+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/i18n/po/zu/vidalia_zu.po b/src/vidalia/i18n/po/zu/vidalia_zu.po
index 68927a4..2da7607 100644
--- a/src/vidalia/i18n/po/zu/vidalia_zu.po
+++ b/src/vidalia/i18n/po/zu/vidalia_zu.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-05-03 14:28+0000\n"
-"PO-Revision-Date: 2011-05-08 18:49+0000\n"
+"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"PO-Revision-Date: 2011-08-10 10:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,6 +231,10 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -270,10 +274,6 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BandwidthGraph"
-msgid "Bandwidth Graph"
-msgstr ""
-
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,26 +427,17 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Problem connecting to Tor"
+msgid "Password Required"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Tor is already running, but Vidalia can't connect to it.\n"
-"\n"
-"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"You will need to shut down the Tor process before Vidalia can launch a new "
-"one."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia can try to restart Tor for you. Doing so will close all currently "
-"active connections through your Tor process."
+"Vidalia has connected to a running Tor process that requires a password. "
+"Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1342,6 +1333,10 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1369,10 +1364,6 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Connect to Tor automatically"
-msgstr ""
-
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1655,6 +1646,34 @@ 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 ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1663,6 +1682,10 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,6 +1798,10 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1857,6 +1884,18 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+
+msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1897,115 +1936,138 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia Shortcuts"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Setup Relaying"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Set up a relay and help the network grow"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "View the Network"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "View a map of the Tor network"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Use a New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Make subsequent connections appear new"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "View recent bandwidth usage"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View log message history"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "View help documentation"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+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 ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "toolBar"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Start"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Restart"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Reload Tor's config"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Actions"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to restart Tor, but was not able to. Please check your Task "
-"Manager to ensure there are no other Tor processes running."
+"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"
@@ -2013,25 +2075,31 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid ""
+"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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid "Error reloading configuration"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to reload Tor's configuration."
+msgid ", probably an email client,"
msgstr ""
msgctxt "MessageLog"
@@ -2287,11 +2355,19 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Basic"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Advanced"
msgstr ""
msgctxt "MessageLog"
-msgid "toolbar"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
@@ -2334,6 +2410,10 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2433,22 +2513,6 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
-msgctxt "NetViewer"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Relay"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Connection"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Status"
-msgstr ""
-
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2774,6 +2838,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3018,14 +3086,6 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3070,6 +3130,10 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3358,22 +3422,6 @@ msgid ""
" the Tor network!"
msgstr ""
-msgctxt "StatusTab"
-msgid "Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "StatusTab"
-msgid "Show on startup"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3410,12 +3458,6 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
-msgctxt "TorControl"
-msgid ""
-"Vidalia has not started Tor. You need to stop Tor through the interface you "
-"started it."
-msgstr ""
-
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3494,30 +3536,6 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Ctrl+X"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+C"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+V"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+Shift+Z"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Ctrl+A"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3796,3 +3814,5 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
+
diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp
index 0f1c0c9..7e3e9c2 100644
--- a/src/vidalia/log/MessageLog.cpp
+++ b/src/vidalia/log/MessageLog.cpp
@@ -26,8 +26,6 @@
#include <QMessageBox>
#include <QClipboard>
-#include <QToolBar>
-
/* Message log settings */
#define SETTING_MSG_FILTER "MessageFilter"
#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
@@ -56,9 +54,8 @@
* \param parent The parent widget of this MessageLog object.
* \param flags Any desired window creation flags.
*/
-MessageLog::MessageLog(QStatusBar *st, QWidget *parent)
-: VidaliaTab(tr("Message Log"), "MessageLog", parent),
- _statusBar(st)
+MessageLog::MessageLog(QWidget *parent, Qt::WFlags flags)
+: VidaliaWindow("MessageLog", parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -80,8 +77,7 @@ MessageLog::MessageLog(QStatusBar *st, QWidget *parent)
/* Sort in ascending chronological order */
ui.listMessages->sortItems(LogTreeWidget::TimeColumn,
Qt::AscendingOrder);
-
- ui.frmSettings->setVisible(false);
+ ui.listNotifications->sortItems(0, Qt::AscendingOrder);
}
/** Default Destructor. Simply frees up any memory allocated for member
@@ -125,19 +121,6 @@ MessageLog::createActions()
connect(ui.btnBrowse, SIGNAL(clicked()),
this, SLOT(browse()));
- QToolBar *tb = new QToolBar(tr("toolbar"));
- tb->addAction(ui.actionSave_All);
- tb->addAction(ui.actionSave_Selected);
- tb->addAction(ui.actionCopy);
- tb->addAction(ui.actionSelect_All);
- tb->addAction(ui.actionFind);
- tb->addAction(ui.actionClear);
- tb->addAction(ui.actionSettings);
- tb->addAction(ui.actionHelp);
-
- tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- ui.verticalLayout->insertWidget(0, tb);
-
#if defined(Q_WS_MAC)
ui.actionHelp->setShortcut(QString("Ctrl+?"));
#endif
@@ -169,7 +152,6 @@ void
MessageLog::retranslateUi()
{
ui.retranslateUi(this);
- setTitle(tr("Message Log"));
setToolTips();
}
@@ -182,6 +164,7 @@ MessageLog::loadSettings()
DEFAULT_MAX_MSG_COUNT).toUInt();
ui.spnbxMaxCount->setValue(maxMsgCount);
ui.listMessages->setMaximumMessageCount(maxMsgCount);
+ ui.listNotifications->setMaximumItemCount(maxMsgCount);
/* Set whether or not logging to file is enabled */
_enableLogging = getSetting(SETTING_ENABLE_LOGFILE,
@@ -279,6 +262,7 @@ MessageLog::saveSettings()
/* Update the maximum displayed item count */
saveSetting(SETTING_MAX_MSG_COUNT, ui.spnbxMaxCount->value());
ui.listMessages->setMaximumMessageCount(ui.spnbxMaxCount->value());
+ ui.listNotifications->setMaximumItemCount(ui.spnbxMaxCount->value());
/* Save message filter and refilter the list */
uint filter = 0;
@@ -367,20 +351,29 @@ MessageLog::save(const QStringList &messages)
void
MessageLog::saveSelected()
{
- save(ui.listMessages->selectedMessages());
+ if (ui.tabWidget->currentIndex() == 0)
+ save(ui.listNotifications->selectedEvents());
+ else
+ save(ui.listMessages->selectedMessages());
}
/** Saves all shown messages to a file. */
void
MessageLog::saveAll()
{
- save(ui.listMessages->allMessages());
+ if (ui.tabWidget->currentIndex() == 0)
+ save(ui.listNotifications->allEvents());
+ else
+ save(ui.listMessages->allMessages());
}
void
MessageLog::selectAll()
{
- ui.listMessages->selectAll();
+ if (ui.tabWidget->currentIndex() == 0)
+ ui.listNotifications->selectAll();
+ else
+ ui.listMessages->selectAll();
}
/** Copies contents of currently selected messages to the 'clipboard'. */
@@ -389,7 +382,10 @@ MessageLog::copy()
{
QString contents;
- contents = ui.listMessages->selectedMessages().join("\n");
+ if (ui.tabWidget->currentIndex() == 0)
+ contents = ui.listNotifications->selectedEvents().join("\n");
+ else
+ contents = ui.listMessages->selectedMessages().join("\n");
if (!contents.isEmpty()) {
/* Copy the selected messages to the clipboard */
@@ -402,7 +398,10 @@ MessageLog::copy()
void
MessageLog::clear()
{
- ui.listMessages->clearMessages();
+ if (ui.tabWidget->currentIndex() == 0)
+ ui.listNotifications->clear();
+ else
+ ui.listMessages->clearMessages();
}
/** Prompts the user for a search string. If the search string is not found in
@@ -422,10 +421,18 @@ MessageLog::find()
QTreeWidgetItem *firstItem = 0;
/* Pick the right tree widget to search based on the current tab */
- QList<LogTreeItem *> results = ui.listMessages->find(text, true);
- if (results.size() > 0) {
- tree = ui.listMessages;
- firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
+ if (ui.tabWidget->currentIndex() == 0) {
+ QList<StatusEventItem *> results = ui.listNotifications->find(text, true);
+ if (results.size() > 0) {
+ tree = ui.listNotifications;
+ firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
+ }
+ } else {
+ QList<LogTreeItem *> results = ui.listMessages->find(text, true);
+ if (results.size() > 0) {
+ tree = ui.listMessages;
+ firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
+ }
}
if (! firstItem) {
@@ -454,13 +461,11 @@ MessageLog::log(tc::Severity type, const QString &message)
/* This is a workaround to force Qt to update the statusbar text (if any
* is currently displayed) to reflect the new message added. */
- QString currStatusTip;
- if(_statusBar && _onTop)
- currStatusTip = _statusBar->currentMessage();
- if (!currStatusTip.isEmpty()) {
- currStatusTip = ui.listMessages->statusTip();
- _statusBar->showMessage(currStatusTip);
- }
+ QString currStatusTip = ui.statusbar->currentMessage();
+ if (!currStatusTip.isEmpty()) {
+ currStatusTip = ui.listMessages->statusTip();
+ ui.statusbar->showMessage(currStatusTip);
+ }
/* If we're saving log messages to a file, go ahead and do that now */
if (_enableLogging) {
diff --git a/src/vidalia/log/MessageLog.h b/src/vidalia/log/MessageLog.h
index a4bad9d..f9905e1 100644
--- a/src/vidalia/log/MessageLog.h
+++ b/src/vidalia/log/MessageLog.h
@@ -17,7 +17,7 @@
#define _MESSAGELOG_H
#include "ui_MessageLog.h"
-#include "VidaliaTab.h"
+#include "VidaliaWindow.h"
#include "LogFile.h"
#include "TorControl.h"
#include "VidaliaSettings.h"
@@ -25,13 +25,13 @@
class LogTreeItem;
class QStringList;
-class MessageLog : public VidaliaTab
+class MessageLog : public VidaliaWindow
{
Q_OBJECT
public:
/** Default constructor **/
- MessageLog(QStatusBar *st = 0, QWidget *parent = 0);
+ MessageLog(QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default destructor **/
~MessageLog();
@@ -90,8 +90,6 @@ private:
/* The log file used to store log messages. */
LogFile _logFile;
- QStatusBar *_statusBar;
-
/** Qt Designer generatated QObject **/
Ui::MessageLog ui;
};
diff --git a/src/vidalia/log/MessageLog.ui b/src/vidalia/log/MessageLog.ui
index c72c0ba..f5a90cf 100644
--- a/src/vidalia/log/MessageLog.ui
+++ b/src/vidalia/log/MessageLog.ui
@@ -1,273 +1,237 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MessageLog</class>
- <widget class="QWidget" name="MessageLog">
+ <widget class="QMainWindow" name="MessageLog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>534</width>
- <height>521</height>
+ <width>698</width>
+ <height>625</height>
</rect>
</property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
<property name="windowTitle">
- <string notr="true"/>
+ <string>Message Log</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="LogTreeWidget" name="listMessages">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="uniformRowHeights">
- <bool>true</bool>
- </property>
- <property name="itemsExpandable">
- <bool>false</bool>
- </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
- <column>
- <property name="text">
- <string>Time</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Type</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Message</string>
+ <property name="windowIcon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/format-justify-fill.png</normaloff>:/images/32x32/format-justify-fill.png</iconset>
+ </property>
+ <property name="statusTip">
+ <string/>
+ </property>
+ <property name="autoFillBackground">
+ <bool>true</bool>
+ </property>
+ <property name="unifiedTitleAndToolBarOnMac">
+ <bool>false</bool>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>12</number>
+ </property>
+ <property name="topMargin">
+ <number>12</number>
+ </property>
+ <property name="rightMargin">
+ <number>12</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tabBasic">
+ <attribute name="title">
+ <string>Basic</string>
+ </attribute>
+ <layout class="QGridLayout" name="basicTabLayout">
+ <property name="margin">
+ <number>12</number>
</property>
- </column>
+ <item row="0" column="0">
+ <widget class="StatusEventWidget" name="listNotifications">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAsNeeded</enum>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="indentation">
+ <number>0</number>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <attribute name="headerShowSortIndicator" stdset="0">
+ <bool>true</bool>
+ </attribute>
+ <attribute name="headerShowSortIndicator" stdset="0">
+ <bool>true</bool>
+ </attribute>
+ <column>
+ <property name="text">
+ <string>Tor Status</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
</widget>
- </item>
- <item>
- <widget class="QFrame" name="frmSettings">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>520</width>
- <height>183</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>520</width>
- <height>183</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="visible">
- <bool>true</bool>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QGridLayout">
+ <widget class="QWidget" name="tabAdvanced">
+ <attribute name="title">
+ <string>Advanced</string>
+ </attribute>
+ <layout class="QGridLayout" name="advancedTabLayout">
<property name="margin">
- <number>3</number>
+ <number>12</number>
</property>
- <property name="spacing">
- <number>3</number>
- </property>
- <item row="0" column="2">
- <layout class="QHBoxLayout" name="_2">
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QVBoxLayout" name="_3">
- <item>
- <widget class="QPushButton" name="btnSaveSettings">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Saves the current Message Log settings</string>
- </property>
- <property name="text">
- <string>Save Settings</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnCancelSettings">
- <property name="minimumSize">
- <size>
- <width>90</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Cancels changes made to settings</string>
- </property>
- <property name="text">
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item row="0" column="0" rowspan="2">
- <widget class="QGroupBox" name="groupBox">
+ <item row="0" column="0">
+ <widget class="LogTreeWidget" name="listMessages">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="title">
- <string>Message Filter</string>
+ <property name="autoFillBackground">
+ <bool>false</bool>
</property>
- <layout class="QVBoxLayout" name="_4">
- <item>
- <widget class="QCheckBox" name="chkTorErr">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Error</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorWarn">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Warning</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorNote">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Notice</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorInfo">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Info</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset>
- </property>
- </widget>
- </item>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>Time</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Message</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="frmSettings">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>520</width>
+ <height>183</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>520</width>
+ <height>183</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="visible">
+ <bool>false</bool>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <item row="0" column="2">
+ <layout class="QHBoxLayout">
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
<item>
- <widget class="QCheckBox" name="chkTorDebug">
+ <widget class="QPushButton" name="btnSaveSettings">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string/>
+ <string>Saves the current Message Log settings</string>
</property>
<property name="text">
- <string>Debug</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/applications-system.png</normaloff>:/images/16x16/applications-system.png</iconset>
+ <string>Save Settings</string>
</property>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QGroupBox" name="grou">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title">
- <string>Message Log History</string>
- </property>
- <layout class="QHBoxLayout" name="_5">
<item>
- <widget class="QSpinBox" name="spnbxMaxCount">
+ <widget class="QPushButton" name="btnCancelSettings">
<property name="minimumSize">
<size>
- <width>50</width>
+ <width>90</width>
<height>0</height>
</size>
</property>
@@ -275,98 +239,261 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string>Number of messages to display in the message log window</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>99999</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblMessageCount">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
+ <string>Cancels changes made to settings</string>
</property>
<property name="text">
- <string>messages</string>
- </property>
- <property name="textFormat">
- <enum>Qt::AutoText</enum>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ <string>Cancel</string>
</property>
</widget>
</item>
</layout>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title">
- <string>Always Save New Log Messages </string>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" rowspan="2">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Message Filter</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QCheckBox" name="chkTorErr">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Error</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorWarn">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Warning</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorNote">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Notice</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorInfo">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Info</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorDebug">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Debug</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/applications-system.png</normaloff>:/images/16x16/applications-system.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="grou">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Message Log History</string>
+ </property>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QSpinBox" name="spnbxMaxCount">
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Number of messages to display in the message log window</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>99999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblMessageCount">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>messages</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Always Save New Log Messages </string>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>6</number>
</property>
- <layout class="QGridLayout" name="_6">
- <property name="margin">
- <number>6</number>
- </property>
- <item row="1" column="1">
- <widget class="QPushButton" name="btnBrowse">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLineEdit" name="lineFile">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QCheckBox" name="chkEnableLogFile">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Enable automatically saving all new log messages to a file</string>
- </property>
- <property name="text">
- <string>Automatically save new log messages to a file</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="btnBrowse">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="lineFile">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkEnableLogFile">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enable automatically saving all new log messages to a file</string>
+ </property>
+ <property name="text">
+ <string>Automatically save new log messages to a file</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
+ <widget class="QToolBar" name="toolBar">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="movable">
+ <bool>false</bool>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <attribute name="toolBarArea">
+ <enum>TopToolBarArea</enum>
+ </attribute>
+ <attribute name="toolBarBreak">
+ <bool>false</bool>
+ </attribute>
+ <addaction name="actionSave_All"/>
+ <addaction name="actionSave_Selected"/>
+ <addaction name="separator"/>
+ <addaction name="actionCopy"/>
+ <addaction name="actionSelect_All"/>
+ <addaction name="actionFind"/>
+ <addaction name="actionClear"/>
+ <addaction name="separator"/>
+ <addaction name="actionSettings"/>
+ <addaction name="actionHelp"/>
+ <addaction name="actionClose"/>
+ </widget>
<action name="actionMessage_Filters">
<property name="text">
<string>Message Filters...</string>
@@ -540,12 +667,33 @@
<extends>QTreeWidget</extends>
<header>log/LogTreeWidget.h</header>
</customwidget>
+ <customwidget>
+ <class>StatusEventWidget</class>
+ <extends>QTreeWidget</extends>
+ <header>StatusEventWidget.h</header>
+ </customwidget>
</customwidgets>
<resources>
<include location="../res/vidalia.qrc"/>
</resources>
<connections>
<connection>
+ <sender>actionClose</sender>
+ <signal>triggered()</signal>
+ <receiver>MessageLog</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>407</x>
+ <y>378</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
<sender>actionSettings</sender>
<signal>toggled(bool)</signal>
<receiver>frmSettings</receiver>
@@ -556,8 +704,8 @@
<y>-1</y>
</hint>
<hint type="destinationlabel">
- <x>264</x>
- <y>424</y>
+ <x>407</x>
+ <y>393</y>
</hint>
</hints>
</connection>
@@ -568,12 +716,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>283</x>
- <y>461</y>
+ <x>373</x>
+ <y>491</y>
</hint>
<hint type="destinationlabel">
- <x>283</x>
- <y>487</y>
+ <x>348</x>
+ <y>516</y>
</hint>
</hints>
</connection>
@@ -584,12 +732,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>283</x>
- <y>461</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>473</x>
- <y>487</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
index 405fd35..6a67d57 100644
--- a/src/vidalia/network/NetViewer.cpp
+++ b/src/vidalia/network/NetViewer.cpp
@@ -20,7 +20,6 @@
#include "VMessageBox.h"
#include <QMessageBox>
-#include <QToolBar>
#include <QHeaderView>
#include <QCoreApplication>
@@ -42,7 +41,7 @@
* \param parent The parent widget of this NetViewer object.\
*/
NetViewer::NetViewer(QWidget *parent)
- : VidaliaTab(tr("Network Map"), "", parent)
+ : VidaliaWindow("NetViewer", parent)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -52,8 +51,8 @@ NetViewer::NetViewer(QWidget *parent)
#endif
/* Pressing 'Esc' or 'Ctrl+W' will close the window */
-// ui.actionClose->setShortcut(QString("Esc"));
-// Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
+ ui.actionClose->setShortcut(QString("Esc"));
+ Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
/* Get the TorControl object */
_torControl = Vidalia::torControl();
@@ -100,6 +99,7 @@ NetViewer::NetViewer(QWidget *parent)
#endif
ui.gridLayout->addWidget(_map);
+
/* Connect zoom buttons to TorMapWidget zoom slots */
connect(ui.actionZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn()));
connect(ui.actionZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut()));
@@ -130,17 +130,6 @@ NetViewer::NetViewer(QWidget *parent)
_torControl, SLOT(closeStream(StreamId)));
setupGeoIpResolver();
-
- QToolBar *tb = new QToolBar();
- tb->addAction(ui.actionRefresh);
- tb->addAction(ui.actionHelp);
- tb->addAction(ui.actionZoomIn);
- tb->addAction(ui.actionZoomOut);
- tb->addAction(ui.actionZoomToFit);
- tb->addAction(ui.actionZoomFullScreen);
-
- tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- ui.horizontalLayout->addWidget(tb);
}
/** Called when the user changes the UI translation. */
@@ -148,7 +137,6 @@ void
NetViewer::retranslateUi()
{
ui.retranslateUi(this);
- setTitle(tr("Network Map"));
ui.treeRouterList->retranslateUi();
ui.treeCircuitList->retranslateUi();
diff --git a/src/vidalia/network/NetViewer.h b/src/vidalia/network/NetViewer.h
index 3c0a675..1d1f85f 100644
--- a/src/vidalia/network/NetViewer.h
+++ b/src/vidalia/network/NetViewer.h
@@ -18,7 +18,7 @@
#include "config.h"
#include "ui_NetViewer.h"
-#include "VidaliaTab.h"
+#include "VidaliaWindow.h"
#include "GeoIpResolver.h"
#if defined(USE_MARBLE)
@@ -38,7 +38,7 @@
class QDateTime;
-class NetViewer : public VidaliaTab
+class NetViewer : public VidaliaWindow
{
Q_OBJECT
diff --git a/src/vidalia/network/NetViewer.ui b/src/vidalia/network/NetViewer.ui
index 863907b..63c8d88 100644
--- a/src/vidalia/network/NetViewer.ui
+++ b/src/vidalia/network/NetViewer.ui
@@ -1,334 +1,353 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>NetViewer</class>
- <widget class="QWidget" name="NetViewer">
- <property name="geometry">
+ <widget class="QMainWindow" name="NetViewer" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>694</width>
- <height>552</height>
+ <width>844</width>
+ <height>596</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Network Map</string>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout"/>
- </item>
- <item>
- <widget class="QSplitter" name="splitter">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="childrenCollapsible">
- <bool>false</bool>
- </property>
- <widget class="RouterListWidget" name="treeRouterList">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>175</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="statusTip">
- <string/>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="indentation">
- <number>0</number>
- </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
- <property name="columnCount">
- <number>3</number>
- </property>
- <column>
- <property name="text">
- <string/>
- </property>
- </column>
- <column>
- <property name="text">
- <string/>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Relay</string>
- </property>
- </column>
- </widget>
- <widget class="QSplitter" name="splitter3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>100</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy">
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="windowTitle" >
+ <string>Tor Network Map</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/applications-internet.png</iconset>
+ </property>
+ <property name="toolButtonStyle" >
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <widget class="QWidget" name="centralwidget" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QSplitter" name="splitter" >
+ <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="childrenCollapsible">
+ <property name="childrenCollapsible" >
<bool>false</bool>
</property>
- <widget class="QFrame" name="frmMap">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>100</horstretch>
- <verstretch>100</verstretch>
+ <widget class="RouterListWidget" name="treeRouterList" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="minimumSize" >
<size>
- <width>400</width>
- <height>300</height>
+ <width>175</width>
+ <height>0</height>
</size>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::DefaultContextMenu</enum>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
+ <property name="statusTip" >
+ <string/>
</property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
+ <property name="indentation" >
+ <number>0</number>
+ </property>
+ <property name="sortingEnabled" >
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode" >
+ <enum>QAbstractItemView::ExtendedSelection</enum>
</property>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>9</number>
- </property>
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- </layout>
- </item>
- </layout>
</widget>
- <widget class="QSplitter" name="splitter2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <widget class="QSplitter" name="splitter3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
<horstretch>100</horstretch>
- <verstretch>1</verstretch>
+ <verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy">
+ <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
</property>
- <property name="childrenCollapsible">
+ <property name="childrenCollapsible" >
<bool>false</bool>
</property>
- <widget class="CircuitListWidget" name="treeCircuitList">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <widget class="QFrame" name="frmMap" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
<horstretch>100</horstretch>
<verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="minimumSize" >
<size>
- <width>300</width>
- <height>0</height>
+ <width>400</width>
+ <height>300</height>
</size>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::CustomContextMenu</enum>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
</property>
- <property name="statusTip">
- <string/>
+ <property name="frameShape" >
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="sortingEnabled">
- <bool>false</bool>
- </property>
- <property name="columnCount">
- <number>2</number>
+ <property name="frameShadow" >
+ <enum>QFrame::Raised</enum>
</property>
- <column>
- <property name="text">
- <string>Connection</string>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
</property>
- </column>
- <column>
- <property name="text">
- <string>Status</string>
+ <property name="spacing" >
+ <number>6</number>
</property>
- </column>
+ <item>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ </layout>
+ </item>
+ </layout>
</widget>
- <widget class="RouterDescriptorView" name="textRouterInfo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <widget class="QSplitter" name="splitter2" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>100</horstretch>
- <verstretch>100</verstretch>
+ <verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::DefaultContextMenu</enum>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
</property>
- <property name="readOnly">
- <bool>true</bool>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="childrenCollapsible" >
+ <bool>false</bool>
</property>
+ <widget class="CircuitListWidget" name="treeCircuitList" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>100</horstretch>
+ <verstretch>100</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>300</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="statusTip" >
+ <string/>
+ </property>
+ <property name="sortingEnabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="RouterDescriptorView" name="textRouterInfo" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>100</horstretch>
+ <verstretch>100</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::DefaultContextMenu</enum>
+ </property>
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
</widget>
</widget>
</widget>
- </widget>
- </item>
- </layout>
- <action name="actionRefresh">
- <property name="enabled">
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar" />
+ <widget class="QToolBar" name="toolBar" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="movable" >
+ <bool>false</bool>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <attribute name="toolBarArea" >
+ <number>4</number>
+ </attribute>
+ <addaction name="actionRefresh" />
+ <addaction name="separator" />
+ <addaction name="actionZoomIn" />
+ <addaction name="actionZoomOut" />
+ <addaction name="actionZoomToFit" />
+ <addaction name="actionZoomFullScreen" />
+ <addaction name="separator" />
+ <addaction name="actionHelp" />
+ <addaction name="actionClose" />
+ </widget>
+ <action name="actionRefresh" >
+ <property name="enabled" >
<bool>false</bool>
</property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/view-refresh.png</normaloff>:/images/32x32/view-refresh.png</iconset>
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Refresh</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>Refresh the list of Tor relays and connections</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>Refresh the list of Tor relays and connections</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>Ctrl+R</string>
</property>
</action>
- <action name="actionHelp">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/system-help.png</normaloff>:/images/32x32/system-help.png</iconset>
+ <action name="actionHelp" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/system-help.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Help</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>Show the network map help</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>Show network map help</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>F1</string>
</property>
</action>
- <action name="actionClose">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/window-close.png</normaloff>:/images/32x32/window-close.png</iconset>
+ <action name="actionClose" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/window-close.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Close</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>Close the network map</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>Close the network map</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>Esc</string>
</property>
</action>
- <action name="actionZoomIn">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/zoom-in.png</normaloff>:/images/32x32/zoom-in.png</iconset>
+ <action name="actionZoomIn" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-in.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Zoom In</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>Zoom in on the network map</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>Zoom in on the network map</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>+</string>
</property>
</action>
- <action name="actionZoomOut">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/zoom-out.png</normaloff>:/images/32x32/zoom-out.png</iconset>
+ <action name="actionZoomOut" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-out.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Zoom Out</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>Zoom out on the network map</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>Zoom out on the network map</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>-</string>
</property>
</action>
- <action name="actionZoomToFit">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/zoom-fit-best.png</normaloff>:/images/32x32/zoom-fit-best.png</iconset>
+ <action name="actionZoomToFit" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-fit-best.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Zoom To Fit</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>Zooms to fit all currently displayed circuits</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>Zooms to fit all currently displayed circuits</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>Ctrl+Z</string>
</property>
</action>
- <action name="actionZoomFullScreen">
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/view-fullscreen.png</normaloff>:/images/32x32/view-fullscreen.png</iconset>
+ <action name="actionZoomFullScreen" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-fullscreen.png</iconset>
</property>
- <property name="text">
+ <property name="text" >
<string>Full Screen</string>
</property>
- <property name="toolTip">
+ <property name="toolTip" >
<string>View the network map as a full screen window</string>
</property>
- <property name="statusTip">
+ <property name="statusTip" >
<string>View the network map as a full screen window</string>
</property>
- <property name="shortcut">
+ <property name="shortcut" >
<string>Ctrl+F</string>
</property>
</action>
@@ -351,7 +370,24 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../res/vidalia.qrc"/>
+ <include location="../res/vidalia.qrc" />
</resources>
- <connections/>
+ <connections>
+ <connection>
+ <sender>actionClose</sender>
+ <signal>triggered()</signal>
+ <receiver>NetViewer</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>403</x>
+ <y>322</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list