[Pkg-privacy-commits] [vidalia] 101/160: Imported Upstream version 0.3.1
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:42 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 125b3f34a02dde8391ce021353f6a21f23293cf4
Author: Dererk <dererk at debian.org>
Date: Wed Mar 7 11:08:39 2012 -0300
Imported Upstream version 0.3.1
---
CHANGELOG | 170 +-
CMakeLists.txt | 6 +-
cmake/VidaliaMacros.cmake | 38 +
debian/README.debs | 12 +-
doc/plugin-framework.txt | 153 +
pkg/osx/CMakeLists.txt | 108 +-
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 | 221 +-
src/vidalia/ControlPasswordInputDialog.cpp | 32 +-
src/vidalia/ControlPasswordInputDialog.h | 15 -
src/vidalia/ControlPasswordInputDialog.ui | 146 +-
src/vidalia/LanguageSupport.cpp | 43 +-
src/vidalia/MainWindow.cpp | 2624 +++++++-------
src/vidalia/MainWindow.h | 159 +-
src/vidalia/MainWindow.ui | 634 +---
src/vidalia/StatusTab.cpp | 93 +
src/vidalia/StatusTab.h | 65 +
src/vidalia/StatusTab.ui | 180 +
src/vidalia/VAttachButton.cpp | 58 +
src/vidalia/VAttachButton.h | 50 +
src/vidalia/VClickLabel.cpp | 95 -
src/vidalia/VClickLabel.h | 65 -
src/vidalia/VMessageBox.cpp | 55 +-
src/vidalia/VMessageBox.h | 11 +-
src/vidalia/VTabWidget.cpp | 58 +
src/vidalia/VTabWidget.h | 46 +
src/vidalia/VidaliaTab.cpp | 74 +
src/vidalia/{VidaliaWindow.h => VidaliaTab.h} | 61 +-
src/vidalia/bwgraph/BandwidthGraph.cpp | 27 +-
src/vidalia/bwgraph/BandwidthGraph.h | 12 +-
src/vidalia/bwgraph/BandwidthGraph.ui | 659 ++--
src/vidalia/config/AdvancedPage.cpp | 12 +-
src/vidalia/config/AdvancedPage.h | 3 +
src/vidalia/config/AdvancedPage.ui | 78 +-
src/vidalia/config/BridgeUsageDialog.ui | 63 +-
src/vidalia/config/ConfigDialog.h | 4 +-
src/vidalia/config/GeneralPage.ui | 109 +-
src/vidalia/config/ServerPage.cpp | 28 +-
src/vidalia/config/ServerPage.ui | 45 +-
src/vidalia/config/ServerSettings.cpp | 4 +-
src/vidalia/config/ServicePage.h | 1 -
src/vidalia/config/ServicePage.ui | 117 +-
src/vidalia/config/TorSettings.cpp | 2 +-
src/vidalia/config/TorrcDialog.cpp | 18 +
src/vidalia/config/TorrcDialog.h | 1 +
src/vidalia/config/TorrcDialog.ui | 353 +-
src/vidalia/config/VidaliaSettings.cpp | 30 +-
.../{VidaliaSettings.cpp => VidaliaSettings.cpp~} | 33 +-
src/vidalia/config/VidaliaSettings.h | 13 +
.../{VidaliaSettings.h => VidaliaSettings.h~} | 15 +
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/CMakeLists.txt | 44 +-
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/qt_ar.po | 7 +-
src/vidalia/i18n/po/ar/vidalia_ar.po | 690 ++--
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 | 1643 ++++-----
src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 300 +-
src/vidalia/i18n/po/ca/qt_ca.po | 93 +-
src/vidalia/i18n/po/ca/vidalia_ca.po | 1742 +++++----
src/vidalia/i18n/po/cs/qt_cs.po | 47 +-
src/vidalia/i18n/po/cs/vidalia_cs.po | 1267 +++----
src/vidalia/i18n/po/csb/vidalia_csb.po | 300 +-
src/vidalia/i18n/po/cy/vidalia_cy.po | 737 ++--
src/vidalia/i18n/po/da/qt_da.po | 6 +-
src/vidalia/i18n/po/da/vidalia_da.po | 2088 +++++------
src/vidalia/i18n/po/de/qt_de.po | 7 +-
src/vidalia/i18n/po/de/vidalia_de.po | 776 ++--
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/qt_el.po | 9 +-
src/vidalia/i18n/po/el/vidalia_el.po | 941 ++---
src/vidalia/i18n/po/eo/qt_eo.po | 6 +-
src/vidalia/i18n/po/eo/vidalia_eo.po | 341 +-
src/vidalia/i18n/po/es/qt_es.po | 8 +-
src/vidalia/i18n/po/es/vidalia_es.po | 865 ++---
src/vidalia/i18n/po/et/vidalia_et.po | 300 +-
src/vidalia/i18n/po/eu/qt_eu.po | 172 +-
src/vidalia/i18n/po/eu/vidalia_eu.po | 300 +-
src/vidalia/i18n/po/fa/qt_fa.po | 6 +-
src/vidalia/i18n/po/fa/vidalia_fa.po | 2032 +++++------
src/vidalia/i18n/po/fi/qt_fi.po | 6 +-
src/vidalia/i18n/po/fi/vidalia_fi.po | 872 +----
src/vidalia/i18n/po/fil/vidalia_fil.po | 300 +-
src/vidalia/i18n/po/fr/qt_fr.po | 9 +-
src/vidalia/i18n/po/fr/vidalia_fr.po | 1297 +++----
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/qt_he.po | 171 +-
src/vidalia/i18n/po/he/vidalia_he.po | 1316 ++++---
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/qt_hu.po | 25 +-
src/vidalia/i18n/po/hu/vidalia_hu.po | 719 ++--
src/vidalia/i18n/po/id/qt_id.po | 6 +-
src/vidalia/i18n/po/id/vidalia_id.po | 1770 ++++-----
src/vidalia/i18n/po/is/vidalia_is.po | 305 +-
src/vidalia/i18n/po/it/qt_it.po | 21 +-
src/vidalia/i18n/po/it/vidalia_it.po | 842 ++---
src/vidalia/i18n/po/kn/vidalia_kn.po | 300 +-
src/vidalia/i18n/po/ko/qt_ko.po | 170 +-
src/vidalia/i18n/po/ko/vidalia_ko.po | 3766 +++++++-------------
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/qt_my.po | 6 +-
src/vidalia/i18n/po/my/vidalia_my.po | 449 +--
src/vidalia/i18n/po/nah/vidalia_nah.po | 300 +-
src/vidalia/i18n/po/nap/vidalia_nap.po | 300 +-
src/vidalia/i18n/po/nb/qt_nb.po | 6 +-
src/vidalia/i18n/po/nb/vidalia_nb.po | 596 ++--
src/vidalia/i18n/po/ne/vidalia_ne.po | 300 +-
src/vidalia/i18n/po/nl/qt_nl.po | 29 +-
src/vidalia/i18n/po/nl/vidalia_nl.po | 1074 +++---
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/qt_pl.po | 6 +-
src/vidalia/i18n/po/pl/vidalia_pl.po | 570 ++-
src/vidalia/i18n/po/pms/vidalia_pms.po | 300 +-
src/vidalia/i18n/po/ps/vidalia_ps.po | 300 +-
src/vidalia/i18n/po/pt/qt_pt.po | 35 +-
src/vidalia/i18n/po/pt/vidalia_pt.po | 1143 +++---
src/vidalia/i18n/po/pt_BR/qt_pt_BR.po | 68 +-
src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 1064 +++---
src/vidalia/i18n/po/ro/qt_ro.po | 6 +-
src/vidalia/i18n/po/ro/vidalia_ro.po | 939 +----
src/vidalia/i18n/po/ru/qt_ru.po | 11 +-
src/vidalia/i18n/po/ru/vidalia_ru.po | 730 ++--
src/vidalia/i18n/po/sco/vidalia_sco.po | 300 +-
src/vidalia/i18n/po/sk/qt_sk.po | 172 +-
src/vidalia/i18n/po/son/vidalia_son.po | 300 +-
src/vidalia/i18n/po/sr/qt_sr.po | 6 +-
src/vidalia/i18n/po/su/vidalia_su.po | 300 +-
src/vidalia/i18n/po/sv/qt_sv.po | 19 +-
src/vidalia/i18n/po/sv/vidalia_sv.po | 1393 ++------
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/qt.pot | 195 +-
src/vidalia/i18n/po/templates/vidalia.pot | 2384 ++++++-------
src/vidalia/i18n/po/tg/vidalia_tg.po | 300 +-
src/vidalia/i18n/po/th/vidalia_th.po | 410 +--
src/vidalia/i18n/po/ti/vidalia_ti.po | 300 +-
src/vidalia/i18n/po/tk/vidalia_tk.po | 300 +-
src/vidalia/i18n/po/tr/qt_tr.po | 6 +-
src/vidalia/i18n/po/tr/vidalia_tr.po | 516 ++-
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 | 412 +--
src/vidalia/i18n/po/zh_CN/qt_zh_CN.po | 9 +-
src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 557 ++-
src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 300 +-
src/vidalia/i18n/po/zh_TW/qt_zh_TW.po | 20 +-
src/vidalia/i18n/po/zu/vidalia_zu.po | 300 +-
src/vidalia/i18n/vidalia_i18n.qrc | 44 +-
src/vidalia/log/MessageLog.cpp | 79 +-
src/vidalia/log/MessageLog.h | 8 +-
src/vidalia/log/MessageLog.ui | 814 ++---
src/vidalia/main.cpp | 4 +-
src/vidalia/network/NetViewer.cpp | 32 +-
src/vidalia/network/NetViewer.h | 7 +-
src/vidalia/network/NetViewer.ui | 481 +--
src/vidalia/network/RouterListWidget.cpp | 34 +
src/vidalia/network/RouterListWidget.h | 5 +
src/vidalia/plugin/DebugDialog.cpp | 69 +
src/vidalia/plugin/DebugDialog.h | 49 +
src/vidalia/plugin/DebugDialog.ui | 64 +
src/vidalia/plugin/PluginEngine.cpp | 221 ++
src/vidalia/plugin/PluginEngine.h | 62 +
src/vidalia/plugin/PluginWrapper.cpp | 244 ++
src/vidalia/plugin/PluginWrapper.h | 68 +
.../plugin/prototypes/HelperProcessPrototype.cpp | 100 +
.../plugin/prototypes/HelperProcessPrototype.h | 32 +
.../plugin/prototypes/TorControlPrototype.cpp | 428 +++
.../plugin/prototypes/TorControlPrototype.h} | 196 +-
.../plugin/prototypes/VidaliaTabPrototype.cpp | 75 +
.../plugin/prototypes/VidaliaTabPrototype.h | 42 +
src/vidalia/res/16x16/detach-arrow.png | Bin 0 -> 602 bytes
src/vidalia/res/credits.html | 1 +
src/vidalia/res/vidalia.qrc | 1 +
544 files changed, 29447 insertions(+), 45881 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6ac56c9..f3cb997 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,15 +1,53 @@
-0.2.17 11-Feb-2012
- o Improve the translation policy: do not remove translations that
- are not under 75% done. This re enables Polish and Catalan.
-
-0.2.16 11-Feb-2012
+0.3.1 27-Feb-2012
+ o Draw the bandwidth graph curves based on the local maximum, not
+ the global maximum. Fixes bug 2188.
o Make the default data directory in windows be located in the Local
AppData instead of the Roaming one. Fixes bug 2319.
- o Do not launch Firefox with every CIRCUIT_ESTABLISHED signal, do it
- only if Firefox isn't open yet. Fixes bug 2943.
+ o Displays a warning to notify users that the passphrase will be
+ stored as plaintext. Fixes bug 3064.
+ 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 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.
+ o Check tor version and that settings are sanitized before trying to
+ use the port autoconfiguration feature. Fixes bug 3843.
+ 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.
+ o Add an option in the Tor menu to exit the application. Fixes bug
+ 3146.
+ o Display the message "Connected to the Tor network!" centered in
+ the main window. Fixes bug 3147.
+ o Explicitly notifies the user that her clock is wrong and tor will
+ probably malfuntion because of it. Fixes bug 3156.
+ o Make the main window visible when opening a tab through the system
+ tray menu. Fixes bug 3165.
+ o Fixes wrong spelling in the method showBandwidthTab inside
+ MainWindow. Resolves ticket 3166.
+ o Fix wrong behavior when trying to connect to an already running
+ tor instance. Fixes bug 3168.
+ o Prevent restarting Tor when it hasn't been started yet. Fixes bug
+ 3171.
+ o Make Vidalia hide its main window when the tray icon is
+ doubleclicked. Resolves ticket 3194.
+ o Display time statistics for bridges in UTC time, rather than local
+ time. Fixes bug 3342.
o Uses TAKEOWNERSHIP and __OwningControllerProcess to avoid leaving
tor running in background if Vidalia exits unexpectedly. Fixes bug
3463.
+ o Change the parameter for ordering the entries in the Basic Log
+ list from currentTime to currentDateTime to avoid missplacing
+ entries from different days.
+ o Check tor version and that settings are sanitized before trying to
+ use the port autoconfiguration feature. Fixes bug 3843.
+ o Try Cookie authentication if available in tor based on
+ ProtocolInfo. If that fails, fall back to HashedPassword if
+ supported. Fixes bug 3898.
+ o Remember the previously used random socks/control ports so Firefox
+ keeps working after restarting tor. Fixes bug 4031.
o Attempt to remove port.conf file before using it to avoid a race
condition between tor and Vidalia. Fixes bug 4048.
o Do not allow users to check the "My ISP blocks..." checkbox
@@ -18,6 +56,11 @@
o Check that the authentication-cookie file length is exactly 32
bytes long. Fixes bug 4304.
o Explicitly disable ControlPort auto. Fixes bug 4379.
+ o Adds a checkbox to remember the answer of a VMessageBox::question
+ easily. It is used to remember how the user wants to terminate tor
+ when running a relay. Fixes bug 4577.
+ o Explicitly disable SocksPort auto by setting it to its default
+ (9050). Fixes bug 4598.
o Make the non exit relay option backward compatible with Vidalia <
0.2.14 so that it doesn't confuse users. Fixes bug 4642.
o Sets the preferred size for the GUI layout so it doesn't squeeze
@@ -34,81 +77,56 @@
bootstrap-phase when it connects to Tor, and updates the progress
to what is actually happening instead of hanging in
"Authenticating to Tor". Fixes bug 4827.
- o Fix size hints in the main window layout so that tilling window
- managers display the window properly. Thanks to Mike Warren for
- the fix. Fixes bug 4907.
+ o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means
+ the user can't write the torrc file. Fixes bug 4833.
+ o Improve search in the router list from the Network Map with a
+ search field. Resolves ticket 3144.
+ o Add a plugin framework based on QtScript. This gives the abbility
+ to create extensions for Vidalia with all Qt's functionality and
+ interfaces to interact with tor and with Vidalia itself. Resolves
+ ticket 3215
+ o Add a way to detach a tab from Vidalia's main window. This will
+ provide more flexibility with plugins that might be intended to be
+ displayed apart from Vidalia.
o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now
available, and there will be pluggable transport bridge lines. So
the validation is now delegated to Tor through SETCONF.
- o Explicitly disable SocksPort auto by setting it to its default
- (9050). Fixes bug 4598.
- o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means
- the user can't write the torrc file. Fixes bug 4833.
- o Enable new translations that are >90% done. The new languages are:
- Bulgarian, Czech, Hebrew, Greek, Indonesian, Korean,
- Dutch. Resolves ticket 5051.
- o Remove translations that aren't ready enough: Japanese, Thai,
- Albanian, Vietnamese, Chinese (Taiwan), Polish, Catalan and
- Burmese.
-
-0.2.15 07-Oct-2011
- o Draw the bandwidth graph curves based on the local maximum, not
- the global maximum. Fixes bug 2188.
- 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 Display time statistics for bridges in UTC time, rather than local
- time. Fixes bug 3342.
- o Change the parameter for ordering the entries in the Basic Log
- list from currentTime to currentDateTime to avoid missplacing
- entries from different days.
- o Check the tor version and that settings are sanitized before
- trying to use the port autoconfiguration feature. Fixes bug 3843.
- o Provide a way to hide Dock or System Tray icons in OSX. Resolves
- ticket 2163.
- o Make new processes appear at front when they are started (OSX
- specific).
-
-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 Improve dist-osx* targets to be able to distribute qtscript
+ extensions properly, and also handle deploying Qt with the
+ macdeployqt tool instead of a macro.
+
+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.
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 be764ce..3325b90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,8 @@
set(VER_MAJOR "0")
-set(VER_MINOR "2")
-set(VER_PATCH "17")
+set(VER_MINOR "3")
+set(VER_PATCH "1")
set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
message(STATUS "Configuring Vidalia ${VERSION}")
project(Vidalia)
@@ -37,10 +37,10 @@ include(FindQt4)
find_package(Qt4 REQUIRED)
set(QT_USE_QTNETWORK true)
set(QT_USE_QTXML true)
+set(QT_USE_QTSCRIPT true)
if (USE_MARBLE)
set(QT_USE_QTSVG true)
set(QT_USE_QTWEBKIT true)
- set(QT_USE_QTSCRIPT true)
set(QT_USE_QTDBUS true)
endif(USE_MARBLE)
include(${QT_USE_FILE})
diff --git a/cmake/VidaliaMacros.cmake b/cmake/VidaliaMacros.cmake
index 7e468b2..5d7897c 100644
--- a/cmake/VidaliaMacros.cmake
+++ b/cmake/VidaliaMacros.cmake
@@ -172,6 +172,44 @@ endmacro(VIDALIA_GET_TOR_VERSION)
if (APPLE)
include(${Vidalia_SOURCE_DIR}/cmake/ParseArgumentsMacro.cmake)
+ macro(VIDALIA_COPY_PLUGINS)
+ parse_arguments(COPY_PLUGINS "DIR;APP_BUNDLE;FRAMEWORKS;COMPONENTS;TARGET" "" ${ARGN})
+
+ set(outdir "${COPY_PLUGINS_APP_BUNDLE}/Contents/MacOS/script/")
+ foreach(component ${COPY_PLUGINS_COMPONENTS})
+ add_custom_command(TARGET ${COPY_PLUGINS_TARGET}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
+ COMMAND cp
+ ${COPY_PLUGINS_DIR}/libqtscript_${component}.dylib
+ ${outdir}/libqtscript_${component}.dylib
+ )
+ endforeach(component)
+ endmacro(VIDALIA_COPY_PLUGINS)
+
+ macro(VIDALIA_DO_PLUGINS)
+ parse_arguments(DO_PLUGINS "DIR;APP_BUNDLE;FRAMEWORKS;COMPONENTS;TARGET" "" ${ARGN})
+
+ set(outdir "${DO_PLUGINS_APP_BUNDLE}/Contents/MacOS/script/")
+
+ foreach(component ${DO_PLUGINS_COMPONENTS})
+ foreach(framework ${DO_PLUGINS_FRAMEWORKS})
+ add_custom_command(TARGET ${DO_PLUGINS_TARGET}
+ COMMAND install_name_tool -change
+ ${framework}.framework/Versions/4/${framework}
+ @executable_path/../Frameworks/${framework}.framework/Versions/4/${framework}
+ ${outdir}/libqtscript_${component}.dylib
+ )
+ endforeach(framework)
+ add_custom_command(TARGET ${DO_PLUGINS_TARGET}
+ COMMAND install_name_tool -id
+ @executable_path/script/libqtscript_${component}.dylib
+ ${outdir}/libqtscript_${component}.dylib
+ )
+ endforeach(component)
+
+
+ endmacro(VIDALIA_DO_PLUGINS)
+
## Calls the install_name_tool utility to change the dependent shared
## library or framework install name to the corresponding library or
## framework that was previously installed in the .app bundle using
diff --git a/debian/README.debs b/debian/README.debs
index bdf85d2..8dabfaf 100644
--- a/debian/README.debs
+++ b/debian/README.debs
@@ -12,15 +12,12 @@ 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 source by cloning the Git repository.
+debian/ directory by cloning the git repository:
-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.
+git clone http://git.debian.org/git/collab-maint/vidalia.git
-Else, just clone the repository "normally":
- git clone http://git.debian.org/git/collab-maint/vidalia.git
-then build packages as normal.
+Then move everything from the debian/0.2.x directory into the
+vidalia-x.x.x/debian/ directory and build packages as normal.
Instructions
--------------------------------
@@ -32,4 +29,3 @@ 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/doc/plugin-framework.txt b/doc/plugin-framework.txt
new file mode 100644
index 0000000..e00ab8c
--- /dev/null
+++ b/doc/plugin-framework.txt
@@ -0,0 +1,153 @@
+Plugin Framework specification
+
+1. Directory structure:
+
+ Each plugin will live inside its own directory, separated from all the
+ other plugins.
+ The directory will contain the following:
+ info.xml *
+ <file>.js **
+ <subdir>/ ***
+
+ * The plugin description will live inside an XML file named info.xml,
+ its specification will be specified later.
+
+ ** Each source code file that the plugin uses will have a "js"
+ extension. The plugin may contain any other kind of files, along with
+ other source code files.
+
+ *** The plugin may contain any sort of directory dispositions. The
+ developer can reference files within subdirectories freely. The main
+ file can live anywhere within the plugin directory, as long as its
+ relative path is specified correctly in the info.xml file.
+
+2. Definition file:
+
+ The definition file for a plugin will be a XML file with the following DTD:
+
+ <!DOCTYPE VidaliaPlugin [
+ <!ENTITY name (#CDATA)>
+ <!ENTITY date (#CDATA)>
+ <!ENTITY author (#CDATA)>
+ <!ENTITY type (EMPTY)>
+ <!ATTLIST type persistent CDATA "false">
+ <!ATTLIST type gui CDATA "false">
+ <!ENTITY files (file+)>
+ <!ENTITY file (#CDATA)>
+ <!ENTITY namespace (#CDATA)>
+ ]>
+
+ Short description:
+ - Name, date and author are self explanatory.
+ - Type:
+ - Persistent: A plugin is persistent if it starts when Vidalia starts,
+ and it doesn't matter if the GUI (if it has one) is visible or not, the
+ plugin code is in execution.
+ - GUI: True if the plugin has a GUI.
+ - Files: Plugins may contain several source code files. The different
+ functions that must be implemented for it to work may be divided into
+ several files, or just one. Whatever the case may be, the files that the
+ plugin engine has to load must be specified in here. The plugin may use
+ other files, which don't need to be listed.
+ - Namespace: Each plugin will have its own namespace to avoid function
+ name collisions (the main functions will be named the same)
+
+3. Plugin functions:
+
+ Each plugin must implement the following functions:
+ start() : void
+ stop() : void
+ buildGUI() : VidaliaTab *
+
+ If the plugin isn't a GUI one, a default implementation will be added
+ that returns QScriptValue::NullValue.
+ Plugins may use several different files to implement its functionality.
+ To include files within other files use:
+
+ include("path/to/file.js")
+
+ This will be implemented by Vidalia's engine, it's not a native include
+ call. Another possibility would be to just list the file in the info.xml
+ file, and the engine will load it automatically and in order.
+
+4. Building an interface for a class to be used in a plugin:
+
+ To provide any class to be used in a plugin, there are two main parts to
+ implement: the constructor, and the prototype:
+ - Constructor: each constructable object in a plugin need to have
+ a static constructor function implemented with the following
+ signature:
+
+ QScriptValue f(QScriptContext *, QScriptEngine *)
+
+ - Prototype: A prototype is a wrapper for a metatype's methods. This
+ methods are what will be visible inside the plugin for a given
+ object.
+
+ The prototype class must inherit from QObject and QScriptable.
+ All types used in the plugin must be handled this way, and must be
+ declared as a Qt Metatype. Each interface must handle the metatype
+ declaration.
+
+5. Settings:
+
+ For specifying where the plugins live, there will be a new item in
+ Vidalia's configuration file: PluginPath. Which will contain the absolute
+ path of the plugins.
+
+6. Plugin engine:
+
+ All plugins will leave in the same environment (QScriptEngine). When
+ Vidalia starts, it starts the plugin engine.
+ Here's a bit of pseudo-code to get an idea of the loading process.
+
+ 6.1. Startup:
+
+ foreach provided_class: (1)
+ load_prototype (2)
+ load_constructor (3)
+
+ scan_plugin_directory (4)
+ foreach directory:
+ info = load_info_file (5)
+ wrapper = plugin_wrapper(info) (6)
+ if info.persistent:
+ wrapper.start() (7)
+ if info.gui:
+ plugin_menu.addAction(wrapper.menu_action()) (8)
+
+ (1) This loop will be probably hardcoded, since there isn't any way to
+ iterate through every class that we want to provide for the plugins.
+ (2) First we need to load the prototype for the given metatype.
+ (3) Then we can add a constructor for the metatype as a function of the
+ global script engine interpreter.
+ (4) Scan the PluginPath for directories that contain the info.xml
+ file.
+ (5) Interpret the info file to see what kind of plugin we are dealing
+ with.
+ (6) A plugin wrapper is an object that abstracts the actual calls to
+ the methods we know the plugin must implement with its corresponding
+ namespace.
+ (7) If it's a persistent plugin, then start it.
+ (8) If it's a gui plugin, add the entry to the plugin menu. If the
+ plugin is also persistent, then the menu action will be linked to
+ a show() function instead of the start(), since the plugin will be
+ already loaded.
+
+ 6.2. Quit:
+
+ foreach plugin:
+ wrapper.stop()
+
+7. Things to consider:
+
+ - Will the fact that all the plugins live in the same environment affect
+ in terms of security? or at least the workflow of each individual
+ plugin?
+ Possible solution: One instance of QScriptEngine for each plugin (kind
+ of a sandbox). But what will be the performance drawbacks to this?
+ - Is there the need to connect signals emitted from the plugin to
+ Vidalia? If so, this seems to be a nice implementation:
+ http://gitorious.org/qtscriptsignalhandler
+ - Do we want to have all files listed in the info.xml file too? May be we
+ can use that to have some kind of sanity check.
diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt
index e757864..eca7049 100644
--- a/pkg/osx/CMakeLists.txt
+++ b/pkg/osx/CMakeLists.txt
@@ -1,12 +1,12 @@
##
## $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
+## 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
+## 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.
##
@@ -15,65 +15,20 @@ set(VIDALIA_APP_BUNDLE_ROOT ${Vidalia_BINARY_DIR}/src/vidalia/Vidalia.app)
get_target_property(VIDALIA_EXECUTABLE Vidalia LOCATION)
add_custom_target(dist-osx-libraries DEPENDS Vidalia)
if (QT_USE_FRAMEWORKS)
- vidalia_install_qt4_framework(QtCore
- TARGET dist-osx-libraries NAME QtCore
- LIBRARY ${QT_QTCORE_LIBRARY_RELEASE}/QtCore
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- )
- vidalia_install_qt4_framework(QtGui
- TARGET dist-osx-libraries NAME QtGui
- LIBRARY ${QT_QTGUI_LIBRARY_RELEASE}/QtGui
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore}
- )
- vidalia_install_qt4_framework(QtNetwork
- TARGET dist-osx-libraries NAME QtNetwork
- LIBRARY ${QT_QTNETWORK_LIBRARY_RELEASE}/QtNetwork
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore}
- )
- vidalia_install_qt4_framework(QtXml
- TARGET dist-osx-libraries NAME QtXml
- LIBRARY ${QT_QTXML_LIBRARY_RELEASE}/QtXml
+ vidalia_copy_plugins(
+ TARGET dist-osx-libraries
+ DIR ${SCRIPT_DIR}
APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore}
+ COMPONENTS core gui network uitools xml
)
- vidalia_install_name_tool(${VIDALIA_EXECUTABLE}
+ vidalia_do_plugins(
TARGET dist-osx-libraries
- FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml}
+ DIR ${SCRIPT_DIR}
+ APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
+ FRAMEWORKS QtGui QtCore QtScript QtNetwork QtXml
+ COMPONENTS core gui network uitools xml
)
if (USE_MARBLE)
- vidalia_install_qt4_framework(QtSvg
- TARGET dist-osx-libraries NAME QtSvg
- LIBRARY ${QT_QTSVG_LIBRARY_RELEASE}/QtSvg
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore} ${QtGui}
- )
- vidalia_install_qt4_framework(QtScript
- TARGET dist-osx-libraries NAME QtScript
- LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore}
- )
- vidalia_install_qt4_framework(QtDBus
- TARGET dist-osx-libraries NAME QtDBus
- LIBRARY ${QT_QTDBUS_LIBRARY_RELEASE}/QtDBus
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore} ${QtXml}
- )
- vidalia_install_qt4_framework(QtPhonon
- TARGET dist-osx-libraries NAME phonon
- LIBRARY ${QT_PHONON_LIBRARY_RELEASE}/phonon
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtXml} ${QtDBus}
- )
- vidalia_install_qt4_framework(QtWebKit
- TARGET dist-osx-libraries NAME QtWebKit
- LIBRARY ${QT_QTWEBKIT_LIBRARY_RELEASE}/QtWebKit
- APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
- DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} ${QtDBus}
- ${QtPhonon}
- )
vidalia_install_dylib(MarbleWidget
TARGET dist-osx-libraries
LIBRARY ${MARBLEWIDGET_LIBRARY}
@@ -83,7 +38,6 @@ if (QT_USE_FRAMEWORKS)
)
vidalia_install_name_tool(${VIDALIA_EXECUTABLE}
TARGET dist-osx-libraries
- FRAMEWORKS ${QtSvg} ${QtDBus} ${QtScript} ${QtWebKit}
LIBRARIES ${MARBLEWIDGET_LIBRARY}
)
endif(USE_MARBLE)
@@ -96,11 +50,12 @@ else(OSX_FAT_BINARY)
endif(OSX_FAT_BINARY)
add_custom_target(dist-osx
+ COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg
--source ${VIDALIA_APP_BUNDLE_ROOT}
--target ${Vidalia_BINARY_DIR}/vidalia-${VERSION}-${DMG_ARCH}.dmg
--sourcefile --volname "Vidalia ${VERSION}"
- --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns
+ --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/vidalia.icns
--symlink "/Applications:/Drag to here"
--mkdir /.background
--copy ${CMAKE_CURRENT_SOURCE_DIR}/background.png:/.background/
@@ -118,10 +73,8 @@ add_custom_target(dist-osx
)
add_dependencies(dist-osx dist-osx-libraries)
-if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
+if (TOR_SOURCE_DIR AND SCRIPT_DIR)
get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE)
- get_filename_component(POLIPO_SOURCE_DIR ${POLIPO_SOURCE_DIR} ABSOLUTE)
- get_filename_component(TORBUTTON_XPI ${TORBUTTON_XPI} ABSOLUTE)
## Determine Tor's version string used to build the .dmg filename
vidalia_get_tor_version(TOR_VERSION "${TOR_SOURCE_DIR}/src/or/tor")
@@ -131,26 +84,14 @@ if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
message(FATAL_ERROR "Unable to determine version of ${TOR_SOURCE_DIR}/src/or/tor")
endif(TOR_VERSION)
- ## Configure the Torbutton installation script file
- get_filename_component(TORBUTTON_XPI_FILENAME ${TORBUTTON_XPI} NAME)
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/InstallTorbutton.scpt.in
- ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt
- )
-
set(bundle_DMG "vidalia-bundle-${TOR_VERSION}-${VERSION}-${DMG_ARCH}.dmg")
add_custom_target(dist-osx-bundle
- COMMAND osacompile
- -o "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app"
- ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt
- COMMAND ${CMAKE_COMMAND} -E copy
- ${TORBUTTON_XPI}
- "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app/"
+ COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg
--source ${VIDALIA_APP_BUNDLE_ROOT}
--target ${Vidalia_BINARY_DIR}/${bundle_DMG}
--sourcefile --volname "Vidalia Bundle ${VERSION}"
- --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns
+ --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/vidalia.icns
--symlink "/Applications:/Drag to here"
--mkdir /.background
--copy ${CMAKE_CURRENT_SOURCE_DIR}/bundle-background.png:/.background/
@@ -169,36 +110,33 @@ if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
--copy ${TOR_SOURCE_DIR}/src/tools/tor-resolve:/Vidalia.app/Contents/MacOS/
--copy ${TOR_SOURCE_DIR}/src/config/geoip:/Vidalia.app/share/tor/
--copy ${TOR_SOURCE_DIR}/src/config/torrc.sample:/Vidalia.app/Contents/Resources/
- --copy ${POLIPO_SOURCE_DIR}/polipo:/Vidalia.app/Contents/MacOS/
- --copy ${CMAKE_CURRENT_SOURCE_DIR}/polipo.conf:/Vidalia.app/Contents/Resources/
- --copy "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app:/"
COMMENT "Creating ${bundle_DMG}"
VERBATIM
)
add_dependencies(dist-osx-bundle dist-osx-libraries)
add_custom_target(dist-osx-split-bundle
- COMMAND hdiutil segment -segmentSize 1.5m
+ COMMAND hdiutil segment -segmentSize 1.5m
-o "${Vidalia_BINARY_DIR}/split-${bundle_DMG}" "${Vidalia_BINARY_DIR}/${bundle_DMG}"
COMMENT "Creating split-${bundle_DMG}"
VERBATIM
)
add_dependencies(dist-osx-split-bundle dist-osx-bundle)
-else(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
+else(TOR_SOURCE_DIR AND SCRIPT_DIR)
message("-- Skipping dist-osx-bundle build target")
add_custom_target(dist-osx-bundle
COMMAND ${CMAKE_COMMAND} -E echo
"!! The dist-osx-bundle target is not configured."
COMMAND ${CMAKE_COMMAND} -E echo
- "!! You must set the -DTOR_SOURCE_DIR,-DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables."
+ "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables."
COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting."
)
add_custom_target(dist-osx-split-bundle
COMMAND ${CMAKE_COMMAND} -E echo
"!! The dist-osx-split-bundle target is not configured. Quitting."
COMMAND ${CMAKE_COMMAND} -E echo
- "!! You must set the -DTOR_SOURCE_DIR, -DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables."
+ "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables."
COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting."
)
-endif(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
+endif(TOR_SOURCE_DIR AND SCRIPT_DIR)
diff --git a/pkg/win32/po/af/vidalia_af.po b/pkg/win32/po/af/vidalia_af.po
index 96bdce1..d9e2027 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 b34dff3..707d4a5 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 a6a90a9..d5e1073 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 878c65c..f31d661 100644
--- a/pkg/win32/po/ar/vidalia_ar.po
+++ b/pkg/win32/po/ar/vidalia_ar.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -277,5 +276,3 @@ msgstr ""
"\n"
"أو إذا كنت تفضل تثبيت تور بدون فايرفوكس، ببساطة\n"
"إضغط \"التالي\" للاستمرار"
-
-
diff --git a/pkg/win32/po/arn/vidalia_arn.po b/pkg/win32/po/arn/vidalia_arn.po
index 2a0f43e..082ebce 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 3745a2d..87b1b47 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 504f330..6a28bb4 100755
--- a/pkg/win32/po/az/vidalia_az.po
+++ b/pkg/win32/po/az/vidalia_az.po
@@ -1,12 +1,10 @@
#
-# 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -277,5 +275,3 @@ 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 cc6c1eb..00f335d 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 2c43845..b018b91 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 cb45034..8393dcf 100755
--- a/pkg/win32/po/ca/vidalia_ca.po
+++ b/pkg/win32/po/ca/vidalia_ca.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -269,5 +268,3 @@ 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 4e39746..7cfb4e8 100644
--- a/pkg/win32/po/cs/vidalia_cs.po
+++ b/pkg/win32/po/cs/vidalia_cs.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -274,5 +273,3 @@ 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 7dfc0f6..d2afbb8 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 32869fa..36f8891 100755
--- a/pkg/win32/po/cy/vidalia_cy.po
+++ b/pkg/win32/po/cy/vidalia_cy.po
@@ -1,12 +1,11 @@
#
-# 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-15 14:48+0000\n"
-"Last-Translator: cymro <markives at hotmail.co.uk>\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
+"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +15,7 @@ msgstr ""
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
-msgstr "$ {BUNDLE_NAME} gosodiad"
+msgstr ""
msgctxt "BundleWelcomeText"
msgid ""
@@ -32,25 +31,14 @@ 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 "Croeso i ${BUNDLE_NAME} Dewin Gosod"
+msgstr ""
msgctxt "BundleLinkText"
msgid "${TOR_NAME} installation documentation"
-msgstr "${TOR_NAME} ddogfennaeth gosod"
+msgstr ""
msgctxt "BundleFinishText"
msgid ""
@@ -59,27 +47,22 @@ 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 "Rhedwch cydrannau sydd wedi cael ei oosod yn awr"
+msgstr ""
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 "Tynnu ${VIDALIA_DESC}."
+msgstr ""
msgctxt "VidaliaSetupCaption"
msgid "${VIDALIA_NAME} setup"
-msgstr "${VIDALIA_NAME} gosodiad"
+msgstr ""
msgctxt "VidaliaWelcomeText"
msgid ""
@@ -87,34 +70,30 @@ 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 "Croeso i'r ${VIDALIA_NAME} Dewin Gosod"
+msgstr ""
msgctxt "VidaliaLinkText"
msgid "${VIDALIA_NAME} homepage"
-msgstr "$ {VIDALIA_NAME} hafan"
+msgstr ""
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 "Rheded Ar Gosodiad"
+msgstr ""
msgctxt "VidaliaStartupDesc"
msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Rhedeg ${VIDALIA_NAME} yn awtamatig wrth gosod."
+msgstr ""
msgctxt "VidaliaShortcuts"
msgid "Add to Start Menu"
-msgstr "Ychwanegu at Ddewislen Cychwyn"
+msgstr ""
msgctxt "VidaliaShortcutsDesc"
msgid "Add ${VIDALIA_NAME} to your Start menu."
@@ -257,5 +236,3 @@ 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 9ece60b..badea4b 100644
--- a/pkg/win32/po/de/vidalia_de.po
+++ b/pkg/win32/po/de/vidalia_de.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -283,5 +282,3 @@ 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 3260e99..da198b5 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 ad6794b..f5cee71 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 40b0a25..a0a1311 100755
--- a/pkg/win32/po/el/vidalia_el.po
+++ b/pkg/win32/po/el/vidalia_el.po
@@ -1,6 +1,4 @@
#
-# Γιάννης <yannanth at gmail.com>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
@@ -282,5 +280,3 @@ 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 4143410..b6a4349 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 cac6431..02e5913 100644
--- a/pkg/win32/po/es/vidalia_es.po
+++ b/pkg/win32/po/es/vidalia_es.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
@@ -281,5 +280,3 @@ 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 531101f..9fc7f62 100644
--- a/pkg/win32/po/et/vidalia_et.po
+++ b/pkg/win32/po/et/vidalia_et.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -282,5 +281,3 @@ 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 bc36cf7..200446a 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 a56be46..265c869 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 1169170..c85ec51 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 963a95b..c5b5ac3 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 e56c358..f6840a3 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 7228db6..a4ebbfe 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 2dd9b8a..bb9ed37 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 b5a9e84..ea52bbf 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 0a036fe..9925c35 100644
--- a/pkg/win32/po/he/vidalia_he.po
+++ b/pkg/win32/po/he/vidalia_he.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -250,5 +249,3 @@ 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 b18a2f1..0ff1deb 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 1625b25..b4af1f0 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 464e8df..6346d36 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 8ba987c..062f087 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 0878848..75a3521 100755
--- a/pkg/win32/po/id/vidalia_id.po
+++ b/pkg/win32/po/id/vidalia_id.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -265,5 +264,3 @@ 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 9c7adc7..3615c7a 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 289ac77..f206616 100644
--- a/pkg/win32/po/it/vidalia_it.po
+++ b/pkg/win32/po/it/vidalia_it.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -282,5 +281,3 @@ 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 5f2684f..8956c98 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 2f9d267..ffdfa4d 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 5ee213a..d438efc 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 b8944d6..c65ea65 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 d4c2a5d..5922c84 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 8a6e82b..d8e70e4 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 dcad8a1..79451bb 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 0ffb72c..1394c29 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 9e950b9..2efa63d 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 030cc06..506e72a 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 a7e9b3e..e81f0ee 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 1e90ae8..7796ef5 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 c389176..aad06e3 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 a8af285..39e4244 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 8272d64..46befc5 100755
--- a/pkg/win32/po/my/vidalia_my.po
+++ b/pkg/win32/po/my/vidalia_my.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -270,5 +269,3 @@ 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 f90c4f6..54ab505 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 e87d448..5756df9 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 3de10a1..af95788 100755
--- a/pkg/win32/po/nb/vidalia_nb.po
+++ b/pkg/win32/po/nb/vidalia_nb.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -267,5 +266,3 @@ 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 7f4496a..0bf0b42 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 1489c73..dbe4361 100644
--- a/pkg/win32/po/nl/vidalia_nl.po
+++ b/pkg/win32/po/nl/vidalia_nl.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -280,5 +279,3 @@ 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 f476847..309cac4 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 5e68ab2..5cec10c 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 191334a..24d8fbc 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 b89f84b..0563f13 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 65c86ef..fcad213 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 1f3b038..0b537fc 100644
--- a/pkg/win32/po/pl/vidalia_pl.po
+++ b/pkg/win32/po/pl/vidalia_pl.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -281,5 +280,3 @@ 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 c8ec183..a7ef9a4 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 eef2b2d..e651a04 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 ff0b115..9490ef3 100644
--- a/pkg/win32/po/pt/vidalia_pt.po
+++ b/pkg/win32/po/pt/vidalia_pt.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -279,5 +278,3 @@ 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 f4961d9..f8def11 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 4136d40..4067e6b 100644
--- a/pkg/win32/po/ru/vidalia_ru.po
+++ b/pkg/win32/po/ru/vidalia_ru.po
@@ -1,7 +1,4 @@
#
-# 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"
@@ -282,5 +279,3 @@ msgstr ""
"⏎\n"
"Если вы не хотите устанавливать Firefox, просто⏎\n"
"нажмите \"Далее\"."
-
-
diff --git a/pkg/win32/po/sco/vidalia_sco.po b/pkg/win32/po/sco/vidalia_sco.po
index 014d688..98a1868 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-08-10 11:09+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 ebe32a1..dab2414 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 d6bc462..52232de 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 c7e5a0d..f3550cd 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 d74e088..a1e5aaa 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 c538c48..8ad0952 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 8a058c1..cecc03f 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 d61b74a..425d415 100755
--- a/pkg/win32/po/th/vidalia_th.po
+++ b/pkg/win32/po/th/vidalia_th.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -243,5 +242,3 @@ 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 a6c9892..a496ed9 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 d6b3bc9..ef1e357 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 3bd36d4..31bc57f 100644
--- a/pkg/win32/po/tr/vidalia_tr.po
+++ b/pkg/win32/po/tr/vidalia_tr.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -281,5 +280,3 @@ 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 24408b2..88ae6e0 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 1246fe5..acee9c9 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 2f6fa6f..bbfd5a6 100755
--- a/pkg/win32/po/vi/vidalia_vi.po
+++ b/pkg/win32/po/vi/vidalia_vi.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:09+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -266,5 +265,3 @@ 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 6afa01c..4792574 100644
--- a/pkg/win32/po/zh_CN/vidalia_zh_CN.po
+++ b/pkg/win32/po/zh_CN/vidalia_zh_CN.po
@@ -1,11 +1,10 @@
#
-# 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -265,5 +264,3 @@ 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 0da9632..d4694a8 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-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 f49c971..aa82f74 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-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,5 +236,3 @@ 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 59b22fa..2e06e16 100644
--- a/src/common/procutil.cpp
+++ b/src/common/procutil.cpp
@@ -21,6 +21,11 @@
#include <QFileInfo>
#include <QTextStream>
#include <QApplication>
+#include <QProcess>
+
+#if !defined(Q_OS_WIN)
+#include <signal.h>
+#endif
/** Returns the PID of the current process. */
@@ -104,13 +109,9 @@ read_pidfile(const QString &pidFileName, QString *errmsg)
}
QHash<qint64, QString>
-process_list()
+process_list(quint16 port)
{
-#if defined(Q_OS_WIN32)
- return win32_process_list();
-#else
- return QHash<qint64, QString>();
-#endif
+ return universal_process_list(port);
}
bool
@@ -127,7 +128,60 @@ 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 843174c..f82ec43 100644
--- a/src/common/procutil.h
+++ b/src/common/procutil.h
@@ -45,7 +45,8 @@ 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();
+QHash<qint64, QString> process_list(quint16 port = 0);
+QHash<qint64, QString> universal_process_list(quint16 port);
/** 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 3cf7467..e95f9c7 100644
--- a/src/torcontrol/TorControl.cpp
+++ b/src/torcontrol/TorControl.cpp
@@ -97,10 +97,6 @@ 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();
@@ -135,10 +131,18 @@ bool
TorControl::stop(QString *errmsg)
{
bool rc = false;
- if (_controlConn->isConnected())
- rc = signal(TorSignal::Halt, errmsg);
- if (!rc)
- rc = _torProcess->stop(errmsg);
+
+ 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);
+ }
+
return rc;
}
diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt
index 52ba510..4a28504 100644
--- a/src/vidalia/CMakeLists.txt
+++ b/src/vidalia/CMakeLists.txt
@@ -20,6 +20,8 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/help/browser
${CMAKE_CURRENT_SOURCE_DIR}/log
${CMAKE_CURRENT_SOURCE_DIR}/network
+ ${CMAKE_CURRENT_SOURCE_DIR}/plugin
+ ${CMAKE_CURRENT_SOURCE_DIR}/plugin/prototypes
${MARBLE_INCLUDE_DIR}
)
@@ -80,6 +82,23 @@ qt4_wrap_cpp(vidalia_SRCS
bwgraph/BandwidthGraph.h
bwgraph/GraphFrame.h
)
+## Plugin framework sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ plugin/PluginEngine.cpp
+ plugin/PluginWrapper.cpp
+ plugin/DebugDialog.cpp
+ plugin/prototypes/VidaliaTabPrototype.cpp
+ plugin/prototypes/HelperProcessPrototype.cpp
+ plugin/prototypes/TorControlPrototype.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ plugin/PluginEngine.h
+ plugin/PluginWrapper.h
+ plugin/DebugDialog.h
+ plugin/prototypes/VidaliaTabPrototype.h
+ plugin/prototypes/HelperProcessPrototype.h
+ plugin/prototypes/TorControlPrototype.h
+)
## Configuration dialog sources
set(vidalia_SRCS ${vidalia_SRCS}
@@ -151,35 +170,68 @@ if (USE_MINIUPNPC)
)
endif(USE_MINIUPNPC)
-## 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
+ VTabWidget.cpp
+ VAttachButton.cpp
+ MainWindow.cpp
+ VidaliaWindow.cpp
+ VMessageBox.cpp
+ ControlPasswordInputDialog.cpp
+ VidaliaTab.cpp
+ StatusTab.cpp
+ HelperProcess.cpp
)
qt4_wrap_cpp(vidalia_SRCS
- help/browser/HelpBrowser.h
- help/browser/HelpTextBrowser.h
+ Vidalia.h
+ VTabWidget.h
+ VAttachButton.h
+ MainWindow.h
+ VidaliaWindow.h
+ VMessageBox.h
+ ControlPasswordInputDialog.h
+ VidaliaTab.h
+ StatusTab.h
+ HelperProcess.h
)
-## 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
+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
+ plugin/DebugDialog.ui
)
-qt4_wrap_cpp(vidalia_SRCS
- log/LogFile.h
- log/LogHeaderView.h
- log/LogTreeWidget.h
- log/MessageLog.h
- log/StatusEventItemDelegate.h
- log/StatusEventWidget.h
+
+## 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
)
## Network map sources
@@ -235,112 +287,35 @@ if (USE_GEOIP)
)
endif(USE_GEOIP)
-## Main Vidalia sources
+## Help browser sources
set(vidalia_SRCS ${vidalia_SRCS}
- main.cpp
- Vidalia.cpp
- LanguageSupport.cpp
- MainWindow.cpp
- VClickLabel.cpp
- VidaliaWindow.cpp
- VMessageBox.cpp
- HelperProcess.cpp
- ControlPasswordInputDialog.cpp
+ help/browser/HelpBrowser.cpp
+ help/browser/HelpTextBrowser.cpp
)
qt4_wrap_cpp(vidalia_SRCS
- 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)
-
-## 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
+ help/browser/HelpBrowser.h
+ help/browser/HelpTextBrowser.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
+## 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 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
+qt4_wrap_cpp(vidalia_SRCS
+ log/LogFile.h
+ log/LogHeaderView.h
+ log/LogTreeWidget.h
+ log/MessageLog.h
+ log/StatusEventItemDelegate.h
+ log/StatusEventWidget.h
)
## Set the appropriate executable target for the current platform
diff --git a/src/vidalia/ControlPasswordInputDialog.cpp b/src/vidalia/ControlPasswordInputDialog.cpp
index 554b668..9fe3eee 100644
--- a/src/vidalia/ControlPasswordInputDialog.cpp
+++ b/src/vidalia/ControlPasswordInputDialog.cpp
@@ -27,17 +27,11 @@ 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
@@ -46,32 +40,16 @@ 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)
{
@@ -96,7 +74,7 @@ void
ControlPasswordInputDialog::setVisible(bool visible)
{
if (visible)
- resize(minimumSizeHint());
+ adjustSize();
QDialog::setVisible(visible);
}
diff --git a/src/vidalia/ControlPasswordInputDialog.h b/src/vidalia/ControlPasswordInputDialog.h
index 193027b..b7fa313 100644
--- a/src/vidalia/ControlPasswordInputDialog.h
+++ b/src/vidalia/ControlPasswordInputDialog.h
@@ -32,16 +32,6 @@ 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.
*/
@@ -60,11 +50,6 @@ 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 00b5002..07b761c 100644
--- a/src/vidalia/ControlPasswordInputDialog.ui
+++ b/src/vidalia/ControlPasswordInputDialog.ui
@@ -1,119 +1,133 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<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>350</width>
- <height>192</height>
+ <width>470</width>
+ <height>189</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <property name="windowTitle" >
- <string>Password Required</string>
+ <property name="windowTitle">
+ <string>Problem connecting to Tor</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="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" >
+ <item row="0" column="1">
+ <widget class="QLabel" name="lblPrompt">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="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>Vidalia has connected to a running Tor process that requires a password. Please enter your control password: </string>
+ <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>
- <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::AlignTop</set>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QCheckBox" name="chkSavePassword" >
- <property name="text" >
- <string>Remember my password</string>
+ <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>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <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="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+ <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>
+ </property>
+ <property name="openExternalLinks">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="linePassword" >
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <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>
</property>
</widget>
</item>
@@ -122,7 +136,7 @@
</layout>
</widget>
<resources>
- <include location="res/vidalia.qrc" />
+ <include location="res/vidalia.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/vidalia/LanguageSupport.cpp b/src/vidalia/LanguageSupport.cpp
index dd4b363..7433514 100644
--- a/src/vidalia/LanguageSupport.cpp
+++ b/src/vidalia/LanguageSupport.cpp
@@ -29,56 +29,49 @@ LanguageSupport::languages()
languages.insert("ar",
QString::fromUtf8("\330\247\331\204\330\271\330\261\330"
"\250\331\212\330\251"));
- languages.insert("bg",
- QString::fromUtf8("\320\221\321\212\320\273\320\263\320"
- "\260\321\200\321\201\320\272\320\270"));
- // languages.insert("my", "Burmese");
- languages.insert("cs",
- QString::fromUtf8("\304\215e\305\241tina"));
- languages.insert("ca", "Catalan");
+// languages.insert("bg",
+// QString::fromUtf8("\320\221\321\212\320\273\320\263\320"
+// "\260\321\200\321\201\320\272\320\270"));
+ languages.insert("my", "Burmese");
+// languages.insert("cs",
+// QString::fromUtf8("\304\215e\305\241tina"));
languages.insert("da", "dansk");
languages.insert("de", "Deutsch");
languages.insert("es",
QString::fromUtf8("espa\303\261ol"));
- languages.insert("el", "Greek");
- // languages.insert("eo", "Esperanto");
languages.insert("fa",
QString::fromUtf8("\331\201\330\247\330\261\330\263\333\214"));
languages.insert("fi", "suomi");
languages.insert("fr",
QString::fromUtf8("fran\303\247ais"));
- languages.insert("he",
- QString::fromUtf8("\327\242\327\221\327\250\327\231\327\252"));
+// languages.insert("he",
+// QString::fromUtf8("\327\242\327\221\327\250\327\231\327\252"));
languages.insert("hu", "magyar nyelv");
languages.insert("it", "Italiano");
- languages.insert("id", "Indonesian");
- // languages.insert("ja",
- // QString::fromUtf8("\346\227\245\346\234\254\350\252\236"));
- languages.insert("ko", "Korean");
+ languages.insert("ja",
+ QString::fromUtf8("\346\227\245\346\234\254\350\252\236"));
languages.insert("nb",
QString::fromUtf8("Bokm\303\245l"));
- languages.insert("nl", "Nederlands");
+// languages.insert("nl", "Nederlands");
languages.insert("pl", "Polski");
languages.insert("pt",
QString::fromUtf8("Portugu\303\252s"));
- languages.insert("pt_BR",
+ languages.insert("pt",
QString::fromUtf8("Portugu\303\252s brasileiro"));
languages.insert("ro",
QString::fromUtf8("rom\303\242n\304\203"));
languages.insert("ru",
QString::fromUtf8("\320\240\321\203\321\201\321\201\320\272\320\270\320\271"));
- // languages.insert("sq", "Shqip");
+// languages.insert("sq", "Shqip");
languages.insert("sv", "svenska");
- // languages.insert("sk", "Slovak");
- // languages.insert("sr", "Servian");
- // languages.insert("th", "Thai");
+ languages.insert("th", "Thai");
languages.insert("tr", QString::fromUtf8("T\303\274rk\303\247e"));
- // languages.insert("vi",
- // QString::fromUtf8("ti\341\272\277ng Vi\341\273\207t"));
+ languages.insert("vi",
+ QString::fromUtf8("ti\341\272\277ng Vi\341\273\207t"));
languages.insert("zh_CN",
QString::fromUtf8("\347\256\200\344\275\223\345\255\227"));
- // languages.insert("zh_TW",
- // QString::fromUtf8("\347\260\241\351\253\224\345\255\227"));
+ languages.insert("zh_TW",
+ QString::fromUtf8("\347\260\241\351\253\224\345\255\227"));
}
return languages;
}
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index d170d47..65e1e3c 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -19,10 +19,13 @@
#include "MainWindow.h"
#include "Vidalia.h"
-#include "VMessageBox.h"
#include "ControlPasswordInputDialog.h"
+#include "VMessageBox.h"
#include "TorSettings.h"
#include "ServerSettings.h"
+#include "AboutDialog.h"
+#include "HelpBrowser.h"
+#include "VAttachButton.h"
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
@@ -35,9 +38,10 @@
#include "stringutil.h"
#include "procutil.h"
-#include <QMenuBar>
-#include <QTimer>
-#include <QTextStream>
+#include "PluginWrapper.h"
+#include "DebugDialog.h"
+
+#include <QtGui>
#ifdef Q_WS_MAC
#include <Carbon/Carbon.h>
@@ -101,41 +105,299 @@ void qt_mac_set_dock_menu(QMenu *menu);
MainWindow::MainWindow()
: VidaliaWindow("MainWindow")
{
- VidaliaSettings settings;
+ _startedWithPrevious = false;
- ui.setupUi(this);
+ /* Create a new TorControl object, used to communicate with Tor */
+ _torControl = Vidalia::torControl();
- /* 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()));
+ _engine = new PluginEngine();
+
+ _dummy = new QAction(tr("No dettached tabs"), this);
+
+ createGUI();
+ createConnections();
- /* Create the actions that will go in the tray menu */
- createActions();
- /* 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);
- /* Create a new TorControl object, used to communicate with Tor */
- _torControl = Vidalia::torControl();
+#if defined(Q_WS_MAC)
+ VidaliaSettings settings;
+ /* Display OSX dock icon if icon preference is not set to "Tray Only" */
+ if (settings.getIconPref() != VidaliaSettings::Tray) {
+ ProcessSerialNumber psn = { 0, kCurrentProcess };
+ TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+ }
+ /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */
+ VidaliaWindow::setVisible(true);
+#endif
+}
+
+/** Destructor */
+MainWindow::~MainWindow()
+{
+ delete _engine;
+}
+
+/** Calls the different methods that will handle the GUI "creation".
+ * It's called once at the MainWindow creation. */
+void
+MainWindow::createGUI()
+{
+ ui.setupUi(this);
+ createActions();
+ createMenuBar();
+ createToolBar();
+ createTrayIcon();
+
+ // 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);
+ _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);
+ _actionDebugDialog = new QAction(tr("Debug output"), this);
+}
+
+/** Creates the menu bar */
+void
+MainWindow::createMenuBar()
+{
+ _reattachMenu.setTitle(tr("Reattach tabs"));
+
+ QMenuBar *menu = menuBar();
+ menu->clear();
+
+ QMenu *torMenu = menu->addMenu(tr("Tor"));
+ torMenu->addAction(_actionStartStopTor);
+ torMenu->addAction(_actionRestartTor);
+#if !defined(Q_WS_WIN)
+ torMenu->addAction(_actionReloadConfig);
+#endif
+ torMenu->addSeparator();
+ torMenu->addAction(_actionExit);
+
+ 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"));
+ foreach(QAction *action, _engine->getAllActions()) {
+ pluginsMenu->addAction(action);
+ }
+ pluginsMenu->addSeparator();
+ pluginsMenu->addAction(_actionDebugDialog);
+
+ menu->addMenu(&_reattachMenu);
+ _reattachMenu.addAction(_dummy);
+ _dummy->setEnabled(false);
+
+ 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);
+
+ menu->addMenu(&_reattachMenu);
+
+#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;
+}
+
+/** Called when tor detects a problem with the system clock */
+void
+MainWindow::clockSkewed(int skew, const QString &source)
+{
+ if (source.startsWith("OR:", Qt::CaseInsensitive)) {
+ // Tor versions 0.2.1.19 and earlier, and 0.2.2.1 and earlier, throw
+ // this message a little too liberally in this case.
+ quint32 torVersion = Vidalia::torControl()->getTorVersion();
+ if (torVersion <= 0x00020113)
+ return;
+ QString str = Vidalia::torControl()->getTorVersionString();
+ if (str.startsWith("0.2.2.") && torVersion <= 0x00020201)
+ return;
+ }
+
+ _trayIcon.showMessage(tr("Your clock is wrong"),
+ tr("Your computer's clock is wrong, tor may not work as "
+ "expected. Please check the Message Log for more information."));
+}
+
+
+/** 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(!isVisible());
+}
+
+void
+MainWindow::retranslateUi()
+{
+ updateTorStatus(_status);
+
+ _actionShowControlPanel->setText(tr("Control Panel"));
+ _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(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
+ connect(_actionRestartTor, SIGNAL(triggered()), this, SLOT(restart()));
+ connect(_actionReloadConfig, SIGNAL(triggered()), this, SLOT(sighup()));
+ 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(showBandwidthTab()));
+ 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()));
+
+ connect(_actionDebugDialog, SIGNAL(triggered()), this, SLOT(showDebugDialog()));
+
+ /* Catch signals when the application is running or shutting down */
+ connect(vApp, SIGNAL(running()), this, SLOT(running()));
+ connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+
connect(_torControl, SIGNAL(started()), this, SLOT(started()));
connect(_torControl, SIGNAL(startFailed(QString)),
this, SLOT(startFailed(QString)));
@@ -148,6 +410,8 @@ MainWindow::MainWindow()
connect(_torControl, SIGNAL(authenticated()), this, SLOT(authenticated()));
connect(_torControl, SIGNAL(authenticationFailed(QString)),
this, SLOT(authenticationFailed(QString)));
+ connect(_torControl, SIGNAL(clockSkewed(int, QString)),
+ this, SLOT(clockSkewed(int, QString)));
_torControl->setEvent(TorEvents::GeneralStatus);
connect(_torControl, SIGNAL(dangerousTorVersion(tc::TorVersionStatus,
@@ -163,28 +427,8 @@ MainWindow::MainWindow()
connect(_torControl, SIGNAL(dangerousPort(quint16, bool)),
this, SLOT(warnDangerousPort(quint16, bool)));
- /* 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()));
+ connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)),
+ this, SLOT(handleCloseTab(int)));
#if defined(USE_AUTOUPDATE)
/* Create a timer used to remind us to check for software updates */
@@ -211,84 +455,32 @@ MainWindow::MainWindow()
#if defined(USE_MINIUPNPC)
/* Catch UPnP-related signals */
connect(UPNPControl::instance(), SIGNAL(error(UPNPControl::UPNPError)),
- this, SLOT(upnpError(UPNPControl::UPNPError)));
-#endif
-
- ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
- if (ui.chkShowOnStartup->isChecked())
- show();
- /* Optimistically hope that the tray icon gets added. */
- _trayIcon.show();
-
-#if defined(Q_WS_MAC)
- /* Display OSX dock icon if icon preference is not set to "Tray Only" */
- if (settings.getIconPref() != VidaliaSettings::Tray) {
- ProcessSerialNumber psn = { 0, kCurrentProcess };
- TransformProcessType(&psn, kProcessTransformToForegroundApplication);
- }
- /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */
- VidaliaWindow::setVisible(true);
+ this, SLOT(upnpError(UPNPControl::UPNPError)));
#endif
-}
-/** Destructor. */
-MainWindow::~MainWindow()
-{
- _trayIcon.hide();
- delete _messageLog;
- delete _bandwidthGraph;
- delete _netViewer;
- delete _configDialog;
+ connect(_engine, SIGNAL(pluginTab(VidaliaTab *)),
+ this, SLOT(addTab(VidaliaTab *)));
}
+/** 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::setVisible(bool visible)
+MainWindow::close()
{
- 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());
+ 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;
}
}
- 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
+ vApp->quit();
}
/** Called when the application has started and the main event loop is
@@ -316,10 +508,6 @@ MainWindow::running()
start();
}
- /* Start the proxy server, if configured */
- if (settings.runProxyAtStart())
- startProxy();
-
#if defined(USE_AUTOUPDATE)
if (settings.isAutoUpdateEnabled()) {
QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
@@ -365,649 +553,10 @@ MainWindow::aboutToQuit()
ServerSettings settings(_torControl);
settings.cleanupPortForwarding();
- if (_proxyProcess->state() != QProcess::NotRunning) {
- /* Close the proxy server (Polipo ignores the WM_CLOSE event sent by
- * terminate() so we have to kill() it) */
- _proxyProcess->kill();
- }
-
- /* Kill the browser and IM client if using the new launcher */
- VidaliaSettings vidalia_settings;
-
- if (! vidalia_settings.getBrowserDirectory().isEmpty()) {
- /* Disconnect the finished signals so that we won't try to exit Vidalia again */
- QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
- QObject::disconnect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
+ /* Disconnect all of the TorControl object's signals */
+ QObject::disconnect(_torControl, 0, 0, 0);
+}
- /* Use QProcess terminate function */
- if (_browserProcess->state() == QProcess::Running)
- _browserProcess->terminate();
-
-#if defined(Q_OS_WIN)
- /* Kill any processes which might have been forked off */
- win32_end_process_by_filename(vidalia_settings.getBrowserExecutable());
-#endif
-
- if (_imProcess->state() == QProcess::Running)
- _imProcess->terminate();
- }
-
- /* Disconnect all of the TorControl object's signals */
- QObject::disconnect(_torControl, 0, 0, 0);
-}
-
-/** 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()
-{
- 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();
-}
-
-/** 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()));
-
- _actionExit = new QAction(tr("Exit"), this);
- connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
-
- _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()));
-
- _actionShowConfig = new QAction(tr("Settings"), this);
- connect(_actionShowConfig, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
-
- _actionShowAbout = new QAction(tr("About"), this);
- connect(_actionShowAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
-
- _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
-}
-
-/** 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)
- createMenuBar();
- qt_mac_set_dock_menu(menu);
-#endif
-}
-
-/** 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(_actionShowBandwidth);
- menu->addAction(_actionShowMessageLog);
- menu->addAction(_actionShowNetworkMap);
- 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(_actionShowConfig);
- menu->addAction(_actionShowHelp);
- menu->addAction(_actionShowAbout);
- menu->addSeparator();
- menu->addAction(_actionExit);
-#endif
- return menu;
-}
-
-/** 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()
-{
-#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
-}
-
-/** Sets the current tray or dock icon image to <b>iconFile</b>. */
-void
-MainWindow::setTrayIcon(const QString &iconFile)
-{
-#if defined(Q_WS_MAC)
- VidaliaSettings settings;
- QApplication::setWindowIcon(QPixmap(iconFile));
- /* only display tray icon if icon preference is not set to "Dock Only" */
- if (settings.getIconPref() != VidaliaSettings::Dock)
- _trayIcon.setIcon(QIcon(iconFile));
-#else
- /* always display tray icon for other platforms */
- _trayIcon.setIcon(QIcon(iconFile));
-#endif
-}
-
-/** 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);
-}
-
-/** 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();
-
- _browserProcess->setEnvironment(updateBrowserEnv());
-
- /* 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");
- }
-
- /* Build the command line arguments */
- QStringList commandLine;
- // Is this better or worse than MOZ_NO_REMOTE?
- commandLine << "-no-remote";
- commandLine << "-profile";
- commandLine << profileDir;
-
- /* Launch the browser */
- if(!_browserProcess->state() != QProcess::NotRunning)
- _browserProcess->start(browserExecutable, commandLine);
- _browserProcess->toForeground();
-}
-
-/** Starts the web browser and IM client, if appropriately configured */
-void
-MainWindow::startSubprocesses()
-{
- VidaliaSettings settings;
- QString subprocess;
-
- /* 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());
- if(!_browserProcess->state() != QProcess::NotRunning)
- _browserProcess->start(subprocess, QStringList());
- _browserProcess->toForeground();
- }
-
- /* Launch the IM client */
- subprocess = settings.getIMExecutable();
-
- if (!subprocess.isEmpty())
- _imProcess->start(subprocess, QStringList());
-}
-
-/** 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);
-}
-
-/** 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:
- case BootstrapStatus::CreatingOneHopCircuit:
- description = tr("Establishing an encrypted directory connection");
- break;
- case BootstrapStatus::RequestingNetworkStatus:
- description = tr("Retrieving network status");
- break;
- case BootstrapStatus::LoadingNetworkStatus:
- description = tr("Loading network status");
- break;
- case BootstrapStatus::LoadingAuthorityCertificates:
- description = tr("Loading authority certificates");
- break;
- case BootstrapStatus::RequestingDescriptors:
- description = tr("Requesting relay information");
- break;
- case BootstrapStatus::LoadingDescriptors:
- description = tr("Loading relay information");
- break;
- case BootstrapStatus::ConnectingToEntryGuard:
- description = tr("Connecting to the Tor network");
- break;
- case BootstrapStatus::HandshakingWithEntryGuard:
- case BootstrapStatus::EstablishingCircuit:
- description = tr("Establishing a Tor circuit");
- break;
- case BootstrapStatus::BootstrappingDone:
- description = tr("Connected to the Tor network!");
- warn = false; /* probably false anyway */
- break;
- default:
- description = tr("Unrecognized startup status");
- }
- if (warn) {
- QString reason;
- /* Is it really a good idea to translate these? */
- switch (bs.reason()) {
- case tc::MiscellaneousReason:
- reason = tr("miscellaneous");
- break;
- case tc::IdentityMismatch:
- reason = tr("identity mismatch");
- break;
- case tc::ConnectionDone:
- reason = tr("done");
- break;
- case tc::ConnectionRefused:
- reason = tr("connection refused");
- break;
- case tc::ConnectionTimeout:
- reason = tr("connection timeout");
- break;
- case tc::ConnectionIoError:
- reason = tr("read/write error");
- break;
- case tc::NoRouteToHost:
- reason = tr("no route to host");
- break;
- case tc::ResourceLimitReached:
- reason = tr("insufficient resources");
- break;
- default:
- reason = tr("unknown");
- }
- description += tr(" failed (%1)").arg(reason);
- }
- setStartupProgress(percentComplete, description);
-}
-
-/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
- * previously set TorStatus value.*/
-MainWindow::TorStatus
-MainWindow::updateTorStatus(TorStatus status)
-{
- 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 (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;
- 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);
- }
-}
-
-/** Sets the progress bar completion value to <b>progressValue</b> and sets
- * the status text to <b>description</b>. */
-void
-MainWindow::setStartupProgress(int progressValue,
- const QString &description)
-{
- ui.progressBar->setValue(progressValue);
- ui.lblStartupProgress->setText(description);
- _trayIcon.setToolTip(description);
-}
/** Attempts to start Tor. If Tor fails to start, then startFailed() will be
* called with an error message containing the reason. */
@@ -1027,6 +576,7 @@ MainWindow::start()
}
}
+
/* Check if Tor is already running separately */
if(settings.getControlMethod() == ControlMethod::Port) {
if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(),
@@ -1071,11 +621,23 @@ MainWindow::start()
if(settings.autoControlPort()) {
QString portconf = QString("%1/port.conf").arg(expDataDirectory);
if(!QFile::remove(portconf))
- vWarn(QString("Unable to remove %s, may be it didn't existed.").arg(portconf));
+ vWarn(QString("Unable to remove %1, may be it didn't existed.").arg(portconf));
+
+ QString control_str = "auto";
+ QString socks_str = "auto";
+
+ if(!_previousControlPort.isEmpty()) {
+ control_str = _previousControlPort;
+ _startedWithPrevious = true;
+ }
+ if(!_previousSocksPort.isEmpty()) {
+ socks_str = _previousSocksPort;
+ _startedWithPrevious = true;
+ }
- args << "ControlPort" << "auto";
- args << "SocksPort" << "auto";
- args << "ControlPortWriteToFile" << portconf;
+ args << "ControlPort" << control_str;
+ args << "SocksPort" << socks_str;
+ args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory);
} else {
/* Add the intended control port value */
quint16 controlPort = settings.getControlPort();
@@ -1103,6 +665,7 @@ MainWindow::start()
}
args << "HashedControlPassword"
<< TorSettings::hashPassword(_controlPassword);
+
break;
case TorSettings::CookieAuth:
args << "CookieAuthentication" << "1";
@@ -1120,46 +683,6 @@ MainWindow::start()
_torControl->start(settings.getExecutable(), args);
}
-/** Called when the user changes a setting that needs Tor restarting */
-void
-MainWindow::restart()
-{
- if(_torControl->stop()) {
- start();
- }
-}
-
-/** 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);
-
- /* 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
@@ -1176,13 +699,13 @@ MainWindow::started()
_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)) {
+ (tries++ < maxtries)) {
vWarn(QString("This is try number: %1.").arg(tries));
#if defined(Q_WS_WIN)
Sleep(1000);
@@ -1194,43 +717,209 @@ MainWindow::started()
if(tries >= maxtries) {
vWarn("Couldn't read port.conf file");
if(_torControl->isRunning()) {
- connectFailed(tr("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")
+ connectFailed(tr("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()));
} else {
vWarn("Tor isn't running!");
connectFailed(tr("It seems Tor has stopped running since Vidalia started it.\n\nSee the Advanced Message Log for more information."));
}
+ 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));
+ quint16 port = addrPort.at(1).toInt();
+ _torControl->connect(addr, port);
+ }
+
+ file.close();
+ } else {
+ /* 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"));
+}
+
+/** Disconnects the control socket and stops the Tor process. */
+bool
+MainWindow::stop()
+{
+ ServerSettings server(_torControl);
+ QString errmsg;
+ TorStatus prevStatus;
+ bool rc;
+ VidaliaSettings settings;
+
+ /* 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::Yes;
+ if(!settings.rememberShutdown()) {
+ 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,
+ "Remember this answer", &settings, SETTING_REMEMBER_SHUTDOWN);
+ }
+ 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)
+ showMessageLogTab();
+ else if (ret == VMessageBox::Help)
+ showHelpDialog("troubleshooting.torexited");
+ }
+ }
+}
+
+/** 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);
+
+ if(_startedWithPrevious) {
+ _startedWithPrevious = false;
+ _previousControlPort = "";
+ _previousSocksPort = "";
+ vWarn("Retrying with new ports");
+ start();
+ return;
+ }
+
+ updateTorStatus(Stopped);
- return;
- }
+ /* 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);
- 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;
+ 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");
+ }
+}
- QStringList addrPort = parts[1].split(":");
- if(addrPort.size() != 2) return;
+/** Called when the control socket has successfully connected to Tor. */
+void
+MainWindow::connected()
+{
+ authenticate();
+ if(_torControl->isVidaliaRunningTor()) {
+ QString err;
+ if(!_torControl->takeOwnership(&err))
+ vWarn(err);
+ }
- QHostAddress addr(addrPort.at(0));
- _autoControlPort = addrPort.at(1).toInt();
- _torControl->connect(addr, _autoControlPort);
+ TorSettings settings;
+ if(settings.autoControlPort()) {
+ // We want to remember the ports if it's on auto
+ QString control_str = "", socks_str = "";
+ if(_torControl->getInfo("net/listeners/control", control_str)) {
+ QStringList control_parts = control_str.split(":");
+ if(control_parts.size() > 1)
+ control_str = control_parts[1];
}
-
- file.close();
+ if(_torControl->getInfo("net/listeners/socks", socks_str)) {
+ QStringList socks_parts = socks_str.split(":");
+ if(socks_parts.size() > 1)
+ socks_str = socks_parts[1];
+ }
+
+ _previousControlPort = control_str;
+ _previousSocksPort = socks_str;
} 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());
+ // Otherwise we want to clear the remembered ports
+ _previousControlPort = "";
+ _previousSocksPort = "";
}
- setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
}
/** Called when the connection to the control socket fails. The reason will be
@@ -1259,127 +948,350 @@ MainWindow::connectFailed(QString errmsg)
}
}
-/** Disconnects the control socket and stops the Tor process. */
-bool
-MainWindow::stop()
+/** Called when Vidalia has successfully authenticated to Tor. */
+void
+MainWindow::authenticated()
{
- ServerSettings server(_torControl);
+ ServerSettings serverSettings(_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;
+ 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"));
}
- prevStatus = updateTorStatus(Stopping);
- if (_delayedShutdownStarted) {
- /* Start a delayed shutdown */
- rc = _torControl->signal(TorSignal::Shutdown, &errmsg);
+ /* 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 {
- /* We want Tor to stop now, regardless of whether we're a server. */
- _isIntentionalExit = true;
- rc = _torControl->stop(&errmsg);
+ /* Stop reading from Tor's stdout immediately, since we successfully
+ * registered for Tor events, including any desired log events. */
+ _torControl->closeTorStdout();
+ }
+
+ /* 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);
+ }
+}
+
+/** Called when Vidalia fails to authenticate to Tor. The failure reason is
+ * specified in <b>errmsg</b>. */
+void
+MainWindow::authenticationFailed(QString errmsg)
+{
+ 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)));
+
+ qint64 torPid = 0;
+
+ 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);
+
+ 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();
+}
+
+/** Called when Tor thinks its version is old or unrecommended, and displays
+ * a message notifying the user. */
+void
+MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString ¤t,
+ const QStringList &recommended)
+{
+ Q_UNUSED(current);
+ Q_UNUSED(recommended);
+
+ if (reason == tc::ObsoleteTorVersion
+ || reason == tc::UnrecommendedTorVersion)
+ displayTorVersionWarning();
+}
+
+/** Called when Tor thinks its version is old or unrecommended, and displays a
+ * message notifying the user. */
+void
+MainWindow::displayTorVersionWarning()
+{
+ static bool alreadyWarned = false;
+
+ 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;
+ }
+}
+
+/** 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:
+ case BootstrapStatus::CreatingOneHopCircuit:
+ description = tr("Establishing an encrypted directory connection");
+ break;
+ case BootstrapStatus::RequestingNetworkStatus:
+ description = tr("Retrieving network status");
+ break;
+ case BootstrapStatus::LoadingNetworkStatus:
+ description = tr("Loading network status");
+ break;
+ case BootstrapStatus::LoadingAuthorityCertificates:
+ description = tr("Loading authority certificates");
+ break;
+ case BootstrapStatus::RequestingDescriptors:
+ description = tr("Requesting relay information");
+ break;
+ case BootstrapStatus::LoadingDescriptors:
+ description = tr("Loading relay information");
+ break;
+ case BootstrapStatus::ConnectingToEntryGuard:
+ description = tr("Connecting to the Tor network");
+ break;
+ case BootstrapStatus::HandshakingWithEntryGuard:
+ case BootstrapStatus::EstablishingCircuit:
+ description = tr("Establishing a Tor circuit");
+ break;
+ case BootstrapStatus::BootstrappingDone:
+ description = tr("Connected to the Tor network!");
+ warn = false; /* probably false anyway */
+ break;
+ default:
+ description = tr("Unrecognized startup status");
}
-
- 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");
+ if (warn) {
+ QString reason;
+ /* Is it really a good idea to translate these? */
+ switch (bs.reason()) {
+ case tc::MiscellaneousReason:
+ reason = tr("miscellaneous");
+ break;
+ case tc::IdentityMismatch:
+ reason = tr("identity mismatch");
+ break;
+ case tc::ConnectionDone:
+ reason = tr("done");
+ break;
+ case tc::ConnectionRefused:
+ reason = tr("connection refused");
+ break;
+ case tc::ConnectionTimeout:
+ reason = tr("connection timeout");
+ break;
+ case tc::ConnectionIoError:
+ reason = tr("read/write error");
+ break;
+ case tc::NoRouteToHost:
+ reason = tr("no route to host");
+ break;
+ case tc::ResourceLimitReached:
+ reason = tr("insufficient resources");
+ break;
+ default:
+ reason = tr("unknown");
}
- /* Tor is still running since stopping failed */
- _isIntentionalExit = false;
- _delayedShutdownStarted = false;
- updateTorStatus(prevStatus);
+ description += tr(" failed (%1)").arg(reason);
}
- return rc;
+ setStartupProgress(percentComplete, description);
}
-/** 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)
+/** Called when Tor has successfully established a circuit. */
+void
+MainWindow::circuitEstablished()
{
- updateTorStatus(Stopped);
+ updateTorStatus(CircuitEstablished);
+ // TODO: fix hardcoded total length
+ setStartupProgress(130,
+ tr("Connected to the Tor network!"));
- /* 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");
+#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
}
-/** Called when the control socket has successfully connected to Tor. */
+/** 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::connected()
+MainWindow::warnDangerousPort(quint16 port, bool rejected)
{
- authenticate();
- if(_torControl->isVidaliaRunningTor()) {
- QString err;
- if(!_torControl->takeOwnership(&err))
- vWarn(err);
+ 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 = "";
}
-}
-/** Called when Vidalia wants to disconnect from a Tor it did not start. */
-void
-MainWindow::disconnect()
-{
- _torControl->disconnect();
-}
+ 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);
-/** 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);
+ 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.")));
}
-
- /*XXX We should warn here if we get disconnected when we didn't intend to */
- _actionNewIdentity->setEnabled(false);
- ui.lblNewIdentity->setEnabled(false);
- _isVidaliaRunningTor = false;
+
+ 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;
}
/** Attempts to authenticate to Tor's control port, depending on the
@@ -1398,8 +1310,9 @@ MainWindow::authenticate()
authMethod = settings.getAuthenticationMethod();
pi = _torControl->protocolInfo();
+ QStringList authMethods;
if (!pi.isEmpty()) {
- QStringList authMethods = pi.authMethods();
+ authMethods = pi.authMethods();
if (authMethods.contains("COOKIE"))
authMethod = TorSettings::CookieAuth;
else if (authMethods.contains("HASHEDPASSWORD"))
@@ -1407,188 +1320,103 @@ MainWindow::authenticate()
else if (authMethods.contains("NULL"))
authMethod = TorSettings::NullAuth;
}
-
+
if (authMethod == TorSettings::CookieAuth) {
- /* Try to load an auth cookie and send it to Tor */
- QByteArray cookie = loadControlCookie(pi.cookieAuthFile());
- while (cookie.isEmpty()) {
- /* Prompt the user to find their control_auth_cookie */
- int ret = VMessageBox::question(this,
- tr("Cookie Authentication Required"),
- p(tr("The Tor software requires Vidalia to send the "
- "contents of an authentication cookie, but Vidalia "
- "was unable to find one."))
- + p(tr("Would you like to browse for the file "
- "'control_auth_cookie' yourself?")),
- VMessageBox::Browse|VMessageBox::Default,
- VMessageBox::Cancel|VMessageBox::Escape);
-
- if (ret == VMessageBox::Cancel)
- goto cancel;
- QString cookieDir = QFileDialog::getOpenFileName(this,
- tr("Data Directory"),
- settings.getDataDirectory(),
- tr("Control Cookie (control_auth_cookie)"));
- if (cookieDir.isEmpty())
+ if(!tryCookie(pi)) {
+ if(authMethods.contains("HASHEDPASSWORD") and !tryHashed()) {
goto cancel;
- cookieDir = QFileInfo(cookieDir).absolutePath();
- cookie = loadControlCookie(cookieDir);
- }
- if(cookie.size() != 32) {
- vWarn(QString("Cookie length has to be exactly 32 bytes long. Found %s bytes")
- .arg(cookie.size()));
- goto cancel;
- }
- vNotice("Authenticating using 'cookie' authentication.");
- return _torControl->authenticate(cookie);
- } else if (authMethod == TorSettings::PasswordAuth) {
- /* Get the control password and send it to Tor */
- vNotice("Authenticating using 'hashed password' authentication.");
- if (_useSavedPassword) {
- TorSettings settings;
- _controlPassword = settings.getControlPassword();
+ } else {
+ return true;
+ }
+ } else {
+ return true;
}
- return _torControl->authenticate(_controlPassword);
- }
- /* No authentication. Send an empty password. */
- vNotice("Authenticating using 'null' authentication.");
- return _torControl->authenticate(QString(""));
-
-cancel:
- vWarn("Cancelling control authentication attempt.");
- if (_isVidaliaRunningTor)
- stop();
- else
- disconnect();
- return false;
-}
-
-/** Called when Vidalia has successfully authenticated to Tor. */
-void
-MainWindow::authenticated()
-{
- ServerSettings serverSettings(_torControl);
- QString errmsg;
-
- 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);
-
- /* 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();
+ } else if (authMethod == TorSettings::PasswordAuth) {
+ return tryHashed();
}
+ /* No authentication. Send an empty password. */
+ vNotice("Authenticating using 'null' authentication.");
+ return _torControl->authenticate(QString(""));
- /* Configure UPnP port forwarding if needed */
- serverSettings.configurePortForwarding();
+cancel:
+ vWarn("Cancelling control authentication attempt.");
+ if (_isVidaliaRunningTor)
+ stop();
+ else
+ disconnect();
+ return false;
+}
- /* 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);
+bool
+MainWindow::tryCookie(const ProtocolInfo &pi)
+{
+ TorSettings settings;
+ /* Try to load an auth cookie and send it to Tor */
+ QByteArray cookie = loadControlCookie(pi.cookieAuthFile());
+ while (cookie.isEmpty()) {
+ /* Prompt the user to find their control_auth_cookie */
+ int ret = VMessageBox::question(this,
+ tr("Cookie Authentication Required"),
+ p(tr("The Tor software requires Vidalia to send the "
+ "contents of an authentication cookie, but Vidalia "
+ "was unable to find one."))
+ + p(tr("Would you like to browse for the file "
+ "'control_auth_cookie' yourself?")),
+ VMessageBox::Browse|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape);
+
+ if (ret == VMessageBox::Cancel)
+ return false;
+ QString cookieDir = QFileDialog::getOpenFileName(this,
+ tr("Data Directory"),
+ settings.getDataDirectory(),
+ tr("Control Cookie (control_auth_cookie)"));
+ if (cookieDir.isEmpty())
+ return false;
+ cookieDir = QFileInfo(cookieDir).absolutePath();
+ cookie = loadControlCookie(cookieDir);
+ }
+ if(cookie.size() != 32) {
+ vWarn(QString("Cookie length has to be exactly 32 bytes long. Found %1 bytes")
+ .arg(cookie.size()));
+ return false;
}
+ vNotice("Authenticating using 'cookie' authentication.");
+ return _torControl->authenticate(cookie);
}
-/** Called when Vidalia fails to authenticate to Tor. The failure reason is
- * specified in <b>errmsg</b>. */
-void
-MainWindow::authenticationFailed(QString errmsg)
+bool
+MainWindow::tryHashed()
{
- 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)));
+ /* Get the control password and send it to Tor */
+ vNotice("Authenticating using 'hashed password' authentication.");
+ if (_useSavedPassword) {
+ TorSettings settings;
+ _controlPassword = settings.getControlPassword();
+ }
- qint64 torPid = 0;
+ qputenv("TOR_CONTROL_PASSWD",
+ _controlPassword.toAscii().toHex());
-#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
+ return _torControl->authenticate(_controlPassword);
+}
- 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 {
- _controlPassword = dlg.password();
- _useSavedPassword = 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;
- }
+/** Checks the status of the current version of Tor to see if it's old,
+ * unrecommended, or obsolete. */
+void
+MainWindow::checkTorVersion()
+{
+ VidaliaSettings settings;
+ if(settings.skipVersionCheck())
+ return;
+ 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();
}
- } 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();
}
/** Searches for and attempts to load the control authentication cookie. This
@@ -1639,225 +1467,200 @@ MainWindow::loadControlCookie(QString cookiePath)
return QByteArray();
}
-/** 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);
- setStartupProgress(ui.progressBar->maximum(),
- 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)
- VidaliaSettings settings;
- if (settings.isAutoUpdateEnabled()) {
- QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
- if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
- /* Initiate a background check for updates now */
- _updateTimer.stop();
- checkForUpdates();
- }
+ if (status == Stopped) {
+ statusText = tr("Tor is not running");
+ actionText = tr("Start Tor");
+ trayIconFile = IMG_TOR_STOPPED;
+ statusIconFile = IMG_TOR_STOPPED_48;
+ _actionRestartTor->setEnabled(false);
+ _actionReloadConfig->setEnabled(false);
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setIcon(QIcon(IMG_START_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(start()));
+ setStartupProgressVisible(false);
+ } else if (status == Stopping) {
+ _actionRestartTor->setEnabled(false);
+ _actionReloadConfig->setEnabled(false);
+ 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;
+
+ } else if (status == Started) {
+ actionText = tr("Stop Tor");
+ _actionRestartTor->setEnabled(true);
+ _actionReloadConfig->setEnabled(true);
+ _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);
+ _actionRestartTor->setEnabled(false);
+ _actionReloadConfig->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);
}
-#endif
-}
-/** Checks the status of the current version of Tor to see if it's old,
- * unrecommended, or obsolete. */
-void
-MainWindow::checkTorVersion()
-{
- VidaliaSettings settings;
- if(settings.skipVersionCheck())
- return;
- 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();
- }
+ /* Update the tray icon */
+ if (!trayIconFile.isEmpty()) {
+ setTrayIcon(trayIconFile);
+ }
+ /* Update the status banner on the control panel */
+ if (!statusIconFile.isEmpty())
+ _statusTab.setTorStatus(QPixmap(statusIconFile));
+ if (!statusText.isEmpty()) {
+ _trayIcon.setToolTip(statusText);
+ _statusTab.setTorStatus(statusText);
}
+ return prevStatus;
}
-/** Called when Tor thinks its version is old or unrecommended, and displays
- * a message notifying the user. */
+/** Sets the current tray or dock icon image to <b>iconFile</b>. */
void
-MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
- const QString ¤t,
- const QStringList &recommended)
+MainWindow::setTrayIcon(const QString &iconFile)
{
- Q_UNUSED(current);
- Q_UNUSED(recommended);
+#if defined(Q_WS_MAC)
+ VidaliaSettings settings;
+ QApplication::setWindowIcon(QPixmap(iconFile));
- if (reason == tc::ObsoleteTorVersion
- || reason == tc::UnrecommendedTorVersion)
- displayTorVersionWarning();
+ /* only display tray icon if icon preference is not set to "Dock Only" */
+ if (settings.getIconPref() != VidaliaSettings::Dock)
+ _trayIcon.setIcon(QIcon(iconFile));
+#else
+ /* always display tray icon for other platforms */
+ _trayIcon.setIcon(QIcon(iconFile));
+#endif
}
-/** Called when Tor thinks its version is old or unrecommended, and displays a
- * message notifying the user. */
-void
-MainWindow::displayTorVersionWarning()
+/** Converts a TorStatus enum value to a string for debug logging purposes. */
+QString
+MainWindow::toString(TorStatus status)
{
- static bool alreadyWarned = false;
-
- 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;
+ 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;
}
+ return "Unknown";
}
-/** 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. */
+/** Called when the user changes a setting that needs Tor restarting */
void
-MainWindow::warnDangerousPort(quint16 port, bool rejected)
+MainWindow::restart()
{
- 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.")));
+ if(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);
-
- 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);
+/** Sends a sighup signal to Tor on platforms other than Windows */
+void
+MainWindow::sighup()
+{
+ bool rc;
+ QString errmsg;
+ rc = _torControl->signal(TorSignal::Reload, &errmsg);
- foreach (quint16 port, ports) {
- portList << QString::number(port);
- }
- tc->setConf("RejectPlaintextPorts", portList.join(","));
- }
+ 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);
}
- delete dlg;
- dlg = 0;
}
-/** Creates and displays Vidalia's About dialog. */
+/** Sets the visibility of the startup status description and progress bar to
+ * <b>visible</b>. */
void
-MainWindow::showAboutDialog()
+MainWindow::setStartupProgressVisible(bool visible)
{
- AboutDialog dlg(this);
- dlg.exec();
+ _statusTab.setTorStatusVisible(!visible);
+ _statusTab.setProgressVisible(visible);
}
-/** Displays the help browser and displays the most recently viewed help
- * topic. */
+/** Sets the progress bar completion value to <b>progressValue</b> and sets
+ * the status text to <b>description</b>. */
void
-MainWindow::showHelpDialog()
+MainWindow::setStartupProgress(int progressValue,
+ const QString &description)
{
- showHelpDialog(QString());
+ _statusTab.setProgress(progressValue, description);
+ _trayIcon.setToolTip(description);
}
-/**< Shows the help browser and displays the given help <b>topic</b>. */
+/** Called when Vidalia wants to disconnect from a Tor it did not start. */
void
-MainWindow::showHelpDialog(const QString &topic)
+MainWindow::disconnect()
{
- static HelpBrowser *helpBrowser = 0;
- if (!helpBrowser)
- helpBrowser = new HelpBrowser(this);
- helpBrowser->showWindow(topic);
+ _torControl->disconnect();
}
-/** Creates and displays the Configuration dialog with the current page set to
- * <b>page</b>. */
+/** Called when the control socket has been disconnected. */
void
-MainWindow::showConfigDialog(ConfigDialog::Page page)
+MainWindow::disconnected()
{
- _configDialog->showWindow(page);
+ 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;
}
-/** Displays the Configuration dialog, set to the Server page. */
void
-MainWindow::showServerConfigDialog()
+MainWindow::showConfigDialog(ConfigDialog::Page page)
{
- showConfigDialog(ConfigDialog::Server);
+ ConfigDialog *configDialog = new ConfigDialog();
+ connect(configDialog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ configDialog->showWindow(page);
}
/** Called when the user selects the "New Identity" action from the menu. */
@@ -1878,7 +1681,6 @@ MainWindow::newIdentity()
/* Disable the New Identity button for MIN_NEWIDENTITY_INTERVAL */
_actionNewIdentity->setEnabled(false);
- ui.lblNewIdentity->setEnabled(false);
QTimer::singleShot(MIN_NEWIDENTITY_INTERVAL,
this, SLOT(enableNewIdentity()));
@@ -1900,28 +1702,212 @@ MainWindow::enableNewIdentity()
{
if (_torControl->isConnected()) {
_actionNewIdentity->setEnabled(true);
- ui.lblNewIdentity->setEnabled(true);
}
}
-/** Converts a TorStatus enum value to a string for debug logging purposes. */
-QString
-MainWindow::toString(TorStatus status)
+void
+MainWindow::handleCloseTab(int index)
{
- 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;
+ /* 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::attachTab()
+{
+ QAction *act = qobject_cast<QAction *>(sender());
+ VidaliaTab *tab = qobject_cast<VidaliaTab *>(act->parent());
+ _detachedTabMap.removeAll(tab->getTitle());
+ tab->setParent(ui.tabWidget);
+ addTab(tab);
+ _reattachMenu.removeAction(act);
+ if(_reattachMenu.actions().size() < 1) {
+ _reattachMenu.addAction(_dummy);
+ _dummy->setEnabled(false);
}
- return "Unknown";
+}
+
+void
+MainWindow::detachTab()
+{
+ VAttachButton *but = qobject_cast<VAttachButton *>(sender());
+ VidaliaTab *tab = but->getTab();
+ int index = ui.tabWidget->indexOf(tab);
+
+ ui.tabWidget->removeTab(index);
+ tab->setParent(0);
+ tab->show();
+
+ QString key = _tabMap.at(index);
+ _tabMap.removeAll(key);
+ _detachedTabMap << key;
+
+ QAction *act = new QAction(tab->getTitle(), tab);
+ connect(act, SIGNAL(triggered()), this, SLOT(attachTab()));
+ _reattachMenu.addAction(act);
+ _reattachMenu.removeAction(_dummy);
+}
+
+void
+MainWindow::handleAttachedClose()
+{
+ VidaliaTab *tab = qobject_cast<VidaliaTab *>(sender());
+ int index = ui.tabWidget->indexOf(tab);
+ if(index < 0) {
+ QAction *act = 0;
+ foreach(QAction *tmpAct, _reattachMenu.actions()) {
+ if(tmpAct->parent() == tab) {
+ act = tmpAct;
+ break;
+ }
+ }
+
+ if(act != 0)
+ _reattachMenu.removeAction(act);
+
+ _detachedTabMap.removeAll(tab->getTitle());
+
+ tab->setParent(ui.tabWidget);
+ addTab(tab);
+
+ if(_reattachMenu.actions().size() < 1) {
+ _reattachMenu.addAction(_dummy);
+ _dummy->setEnabled(false);
+ }
+
+ delTab(ui.tabWidget->currentIndex());
+ }
+}
+
+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()));
+
+ /** If we are trying to open the exact same tab twice
+ * don't do anything */
+ if(tab == ui.tabWidget->widget(_tabMap.indexOf(tab->getTitle())))
+ return;
+
+ /** Exception for tabs that need to be always created */
+ if (tab != _messageLog &&
+ tab != &_statusTab &&
+ tab != &_netViewer &&
+ tab != _graph)
+ tab->deleteLater();
+ return;
+ }
+
+ VAttachButton *atb = new VAttachButton();
+
+ ui.tabWidget->addTab(tab, tab->getTitle());
+ int pos = ui.tabWidget->count() - 1;
+ ui.tabWidget->setCurrentIndex(pos);
+
+ atb->setTab(tab);
+#if defined(Q_WS_MAC)
+ ui.tabWidget->setTabButton(pos, QTabBar::RightSide, atb);
+#else
+ ui.tabWidget->setTabButton(pos, QTabBar::LeftSide, atb);
+#endif
+
+ connect(tab, SIGNAL(closeTab()),
+ this, SLOT(handleAttachedClose()));
+
+ connect(atb, SIGNAL(attachTab()),
+ this, SLOT(attachTab()));
+ connect(atb, SIGNAL(detachTab()),
+ this, SLOT(detachTab()));
+ /** The new tab is added to the last position */
+ _tabMap << tab->getTitle();
+ connect(tab, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ if(!isVisible())
+ setVisible(true);
+}
+
+void
+MainWindow::delTab(int index)
+{
+ 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();
+ }
+ ui.tabWidget->removeTab(index);
+ QString key = _tabMap.at(index);
+ _tabMap.removeAll(key);
+}
+
+void
+MainWindow::showStatusTab()
+{
+ addTab(&_statusTab);
+}
+
+void
+MainWindow::showMessageLogTab()
+{
+ addTab(_messageLog);
+}
+
+void
+MainWindow::showBandwidthTab()
+{
+ 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);
+}
+
+void
+MainWindow::showDebugDialog()
+{
+ DebugDialog dlg;
+ dlg.exec();
}
#if defined(USE_MINIUPNPC)
@@ -2084,41 +2070,3 @@ MainWindow::installUpdatesFailed(const QString &errmsg)
#endif
-QStringList
-MainWindow::updateBrowserEnv() {
- TorSettings settings;
- QStringList env = QProcess::systemEnvironment();
- env << "TZ=UTC";
- env << "MOZ_NO_REMOTE=1";
-
- if(settings.autoControlPort()) {
- QString errmsg, socks;
- if(!(_torControl->getInfo("net/listeners/socks", socks, &errmsg))) {
- vInfo(errmsg);
- return env;
- }
-
- QStringList addrPort = socks.split(":");
- if(addrPort.size() != 2) return env;
-
- QHostAddress addr(addrPort.at(0));
- quint16 port = addrPort.at(1).toInt();
-
- env << QString("TOR_SOCKS_HOST=%1").arg(addr.toString());
- env << QString("TOR_SOCKS_PORT=%1").arg(port);
-
- 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()))));
- }
-
- if(settings.getAuthenticationMethod() == TorSettings::PasswordAuth) {
- env << QString("TOR_CONTROL_PASSWD=%1").arg(QString(_controlPassword.toAscii().toHex()));
- env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort);
- }
-
- return env;
-}
diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
index dc251e1..7cd86d7 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
@@ -20,16 +20,12 @@
#include "ui_MainWindow.h"
#include "VidaliaWindow.h"
-#include "HelperProcess.h"
-#include "AboutDialog.h"
-#include "MessageLog.h"
-#include "BandwidthGraph.h"
+#include "StatusTab.h"
#include "ConfigDialog.h"
-#include "HelpBrowser.h"
+#include "MessageLog.h"
#include "NetViewer.h"
-
-#include "TorControl.h"
-
+#include "BandwidthGraph.h"
+#include "HelperProcess.h"
#if defined(USE_AUTOUPDATE)
#include "UpdateProcess.h"
#include "UpdateProgressDialog.h"
@@ -38,6 +34,10 @@
#include "UPNPControl.h"
#endif
+#include "TorControl.h"
+
+#include "PluginEngine.h"
+
#include <QMainWindow>
#include <QTimer>
#include <QSystemTrayIcon>
@@ -64,15 +64,12 @@ 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. */
@@ -91,6 +88,10 @@ private slots:
void disconnected();
/** Called when Vidalia has successfully authenticated to Tor. */
void authenticated();
+ /** Called when authenticated() detects that you can do auth with a cookie */
+ bool tryCookie(const ProtocolInfo &pi);
+ /** Called when cookie auth fails or when it's the only method configured */
+ bool tryHashed();
/** Called when Vidalia fails to authenticate to Tor. The failure reason is
* specified in <b>errmsg</b>. */
void authenticationFailed(QString errmsg);
@@ -107,26 +108,6 @@ 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();
@@ -142,6 +123,44 @@ 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 showBandwidthTab();
+ /** 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);
+
+ /** Displays the debug output dialog for plugins */
+ void showDebugDialog();
+
+ /** 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);
+
+ /** Attaches a tab to the tabwidget */
+ void attachTab();
+ /** Detaches a tab from the tabwidget */
+ void detachTab();
+
+ /** Called when trying to close a tab that has been detached */
+ void handleAttachedClose();
+
+ /** Called when tor detects a problem with the system clock */
+ void clockSkewed(int skew, const QString &source);
#if defined(USE_AUTOUPDATE)
/** Called when the user clicks the 'Check Now' button in the General
@@ -166,6 +185,7 @@ private slots:
void installUpdatesFailed(const QString &errmsg);
#endif
+
#if defined(USE_MINIUPNPC)
/** Called when a UPnP error occurs. */
void upnpError(UPNPControl::UPNPError error);
@@ -182,6 +202,9 @@ 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
@@ -189,19 +212,15 @@ private:
void createTrayIcon();
/** Create the tray popup menu and it's submenus */
QMenu* createTrayMenu();
- /** Creates a default menubar on Mac */
+ /** Creates a menubar */
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. */
@@ -225,9 +244,6 @@ 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;
@@ -237,22 +253,8 @@ 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;
@@ -273,26 +275,41 @@ 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* _actionShowConfig;
- QAction* _actionShowAbout;
- QAction* _actionExit;
- QAction* _actionShowBandwidth;
- QAction* _actionShowMessageLog;
- QAction* _actionShowHelp;
- QAction* _actionShowNetworkMap;
- QAction* _actionNewIdentity;
+ QAction *_actionShowControlPanel;
+ QAction *_actionStartStopTor;
+ QAction *_actionRestartTor;
+ QAction *_actionReloadConfig;
+ QAction *_actionNewIdentity;
+ QAction *_actionStatus;
+ QAction *_actionNetworkMap;
+ QAction *_actionMessageLog;
+ QAction *_actionBandwidthGraph;
+ QAction *_actionConfigure;
+ QAction *_actionVidaliaHelp;
+ QAction *_actionAbout;
+ QAction *_actionExit;
+ QAction *_actionDebugDialog;
- quint16 _autoControlPort;
+ QMenu _reattachMenu; /**< Menu used to handle tab re-attaching */
+ QAction *_dummy; /**< Dummy action to display when there are no more tabs */
Ui::MainWindow ui; /**< Qt Designer generated object. */
+
+ 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 */
+ BandwidthGraph *_graph; /**< Graph that draws bandwidth usage */
+
+ PluginEngine *_engine;
+ QStringList _tabMap; /**< Map to handle opened tabs */
+ QStringList _detachedTabMap; /**< Map to handle detached tabs */
+
+ bool _startedWithPrevious; /**< True if Vidalia tried to start Tor with the previous ports */
+ QString _previousControlPort; /**< Holds the previous controlport used */
+ QString _previousSocksPort; /**< Holds the previous socksport used */
};
#endif
-
diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui
index 586af36..d8bb5ce 100644
--- a/src/vidalia/MainWindow.ui
+++ b/src/vidalia/MainWindow.ui
@@ -1,603 +1,73 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QMainWindow" name="MainWindow">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>600</height>
+ </rect>
</property>
- <property name="maximumSize" >
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Vidalia Control Panel</string>
</property>
- <property name="windowIcon" >
- <iconset resource="res/vidalia.qrc" >:/images/32x32/tor-logo.png</iconset>
+ <property name="windowIcon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/128x128/tor-logo.png</normaloff>:/images/128x128/tor-logo.png</iconset>
</property>
- <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>
+ <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>
</property>
- <property name="statusTip" >
- <string>Hide this window</string>
+ <property name="tabsClosable">
+ <bool>true</bool>
</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="QStatusBar" name="statusbar" />
+ <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>
<customwidgets>
<customwidget>
- <class>VClickLabel</class>
- <extends>QWidget</extends>
- <header>VClickLabel.h</header>
+ <class>VTabWidget</class>
+ <extends>QTabWidget</extends>
+ <header>VTabWidget.h</header>
+ <container>1</container>
</customwidget>
</customwidgets>
<resources>
- <include location="res/vidalia.qrc" />
+ <include location="res/vidalia.qrc"/>
</resources>
- <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>
+ <connections/>
</ui>
diff --git a/src/vidalia/StatusTab.cpp b/src/vidalia/StatusTab.cpp
new file mode 100644
index 0000000..f32924b
--- /dev/null
+++ b/src/vidalia/StatusTab.cpp
@@ -0,0 +1,93 @@
+#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
new file mode 100644
index 0000000..440c2b7
--- /dev/null
+++ b/src/vidalia/StatusTab.h
@@ -0,0 +1,65 @@
+/*
+** 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
new file mode 100644
index 0000000..746a54f
--- /dev/null
+++ b/src/vidalia/StatusTab.ui
@@ -0,0 +1,180 @@
+<?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="1">
+ <widget class="QLabel" name="lblTorStatusImg">
+ <property name="text">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="lblTorStatus">
+ <property name="text">
+ <string notr="true">Tor is not running</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="3">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </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/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp
new file mode 100644
index 0000000..e8496f2
--- /dev/null
+++ b/src/vidalia/VAttachButton.cpp
@@ -0,0 +1,58 @@
+/*
+** 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 VAttachButton.cpp
+** \brief Button that handles detaching of tabs
+*/
+
+#include "VAttachButton.h"
+
+#define IMG_DETACH ":/images/16x16/detach-arrow.png"
+
+VAttachButton::VAttachButton(QWidget *parent) :
+ QPushButton(parent)
+{
+ _tab = 0;
+ _attached = true;
+ setIcon(QIcon(IMG_DETACH));
+ setFlat(true);
+ resize(24,24);
+}
+
+VAttachButton::~VAttachButton()
+{
+ disconnect(this,0,0,0);
+}
+
+void
+VAttachButton::setTab(VidaliaTab *tab)
+{
+ _tab = tab;
+ connect(this, SIGNAL(clicked()), this, SLOT(toggleAttach()));
+}
+
+VidaliaTab *
+VAttachButton::getTab()
+{
+ return _tab;
+}
+
+void
+VAttachButton::toggleAttach()
+{
+ if(_attached) {
+ emit detachTab();
+ } else {
+ emit attachTab();
+ }
+ _attached = !_attached;
+}
+
diff --git a/src/vidalia/VAttachButton.h b/src/vidalia/VAttachButton.h
new file mode 100644
index 0000000..038eef9
--- /dev/null
+++ b/src/vidalia/VAttachButton.h
@@ -0,0 +1,50 @@
+/*
+** 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 VAttachButton.cpp
+** \brief Button that handles detaching of tabs
+*/
+
+#ifndef VATTACHBUTTON_H
+#define VATTACHBUTTON_H
+
+#include <QtGui>
+
+#include "VidaliaTab.h"
+
+class VAttachButton : public QPushButton {
+ Q_OBJECT
+
+ public:
+ VAttachButton(QWidget *parent = 0);
+ ~VAttachButton();
+
+ /** Sets the parent tab for this button */
+ void setTab(VidaliaTab *tab);
+ /** Returns the parent tab for this button */
+ VidaliaTab *getTab();
+
+ signals:
+ /** Emitted when the button is pressed and the tab is detached */
+ void attachTab();
+ /** Emitted when the button is pressed and the tab is attached */
+ void detachTab();
+
+ public slots:
+ /** Handles the onClicked signal */
+ void toggleAttach();
+
+ private:
+ VidaliaTab *_tab;
+ bool _attached;
+};
+
+#endif
diff --git a/src/vidalia/VClickLabel.cpp b/src/vidalia/VClickLabel.cpp
deleted file mode 100644
index 9691a52..0000000
--- a/src/vidalia/VClickLabel.cpp
+++ /dev/null
@@ -1,95 +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.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
deleted file mode 100644
index 2f3e677..0000000
--- a/src/vidalia/VClickLabel.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.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);
-
- const QString& text() const { return _text; }
- const QPixmap& pixmap() const { return _pixmap; }
-
- Q_PROPERTY(QString text READ text WRITE setText USER true);
- Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap USER true);
-
-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/VMessageBox.cpp b/src/vidalia/VMessageBox.cpp
index 0dbf927..1600bc3 100644
--- a/src/vidalia/VMessageBox.cpp
+++ b/src/vidalia/VMessageBox.cpp
@@ -17,11 +17,19 @@
#include "html.h"
+#include <QGridLayout>
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QPushButton>
/** Default constructor. */
VMessageBox::VMessageBox(QWidget *parent)
: QMessageBox(parent)
{
+ _chkRemember = new QCheckBox("");
+ QGridLayout *gl = qobject_cast<QGridLayout *>(layout());
+ gl->addWidget(_chkRemember, gl->rowCount() - 2, 1);
+ _chkRemember->setVisible(false);
}
/** Returns the button (0, 1, or 2) that is OR-ed with QMessageBox::Default,
@@ -113,15 +121,45 @@ VMessageBox::critical(QWidget *parent, QString caption, QString text,
* QMessageBox::Escape, respectively. */
int
VMessageBox::question(QWidget *parent, QString caption, QString text,
- int button0, int button1, int button2)
+ int button0, int button1, int button2,
+ QString remember, VSettings *settings, QString key)
{
- int ret = QMessageBox::question(parent, caption, p(text),
- VMessageBox::buttonText(button0),
- VMessageBox::buttonText(button1),
- VMessageBox::buttonText(button2),
- VMessageBox::defaultButton(button0, button1, button2),
- VMessageBox::escapeButton(button0, button1, button2));
- return VMessageBox::selected(ret, button0, button1, button2);
+ VMessageBox messageBox(parent);
+
+ messageBox.setIcon(QMessageBox::Question);
+ messageBox.setWindowTitle(caption);
+ messageBox.setText(text);
+ messageBox.setStandardButtons(QMessageBox::NoButton);
+
+ if(settings) {
+ messageBox._chkRemember->setVisible(true);
+ messageBox._chkRemember->setText(remember);
+ }
+
+ QString myButton0Text = VMessageBox::buttonText(button0);
+ if (myButton0Text.isEmpty())
+ myButton0Text = QDialogButtonBox::tr("OK");
+ messageBox.addButton(myButton0Text, QMessageBox::ActionRole);
+
+ if (!VMessageBox::buttonText(button1).isEmpty())
+ messageBox.addButton(VMessageBox::buttonText(button1), QMessageBox::ActionRole);
+
+ if (!VMessageBox::buttonText(button2).isEmpty())
+ messageBox.addButton(VMessageBox::buttonText(button2), QMessageBox::ActionRole);
+
+ const QList<QAbstractButton *> &buttonList = messageBox.buttons();
+ messageBox.setDefaultButton(qobject_cast<QPushButton *>(buttonList
+ .value(VMessageBox::defaultButton(button0,
+ button1,
+ button2))));
+ messageBox.setEscapeButton(buttonList.value(VMessageBox::escapeButton(button0, button1, button2)));
+ int ret = messageBox.exec();
+
+ if(!settings)
+ return ret;
+ settings->setValue(key, messageBox._chkRemember->checkState() == Qt::Checked);
+
+ return ret;
}
/** Displays an information message box with the given caption, message text, and
@@ -157,4 +195,3 @@ VMessageBox::warning(QWidget *parent, QString caption, QString text,
VMessageBox::escapeButton(button0, button1, button2));
return VMessageBox::selected(ret, button0, button1, button2);
}
-
diff --git a/src/vidalia/VMessageBox.h b/src/vidalia/VMessageBox.h
index fc96405..0dd3fe5 100644
--- a/src/vidalia/VMessageBox.h
+++ b/src/vidalia/VMessageBox.h
@@ -19,6 +19,9 @@
#include <QMessageBox>
#include <QString>
+#include "VSettings.h"
+
+class QCheckBox;
class VMessageBox : public QMessageBox
{
@@ -72,8 +75,10 @@ public:
* button, OR the Button enum value with QMessageBox::Default or
* QMessageBox::Escape, respectively. */
static int question(QWidget *parent, QString caption, QString text,
- int button0, int button1 = NoButton,
- int button2 = NoButton);
+ int button0, int button1 = NoButton,
+ int button2 = NoButton,
+ QString remember = QString(), VSettings *settings = 0,
+ QString key = QString());
/** Converts a Button enum value to a translated string. */
static QString buttonText(int button);
@@ -87,6 +92,8 @@ private:
static int escapeButton(int button0, int button1, int button2);
/** Returns the Button enum value from the given return value. */
static int selected(int ret, int button0, int button1, int button2);
+
+ QCheckBox *_chkRemember;
};
#endif
diff --git a/src/vidalia/VTabWidget.cpp b/src/vidalia/VTabWidget.cpp
new file mode 100644
index 0000000..1510549
--- /dev/null
+++ b/src/vidalia/VTabWidget.cpp
@@ -0,0 +1,58 @@
+#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);
+ tabBar()->setTabButton(position, QTabBar::LeftSide, 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());
+ }
+}
+
+void
+VTabWidget::setTabButton(int pos, QTabBar::ButtonPosition butpos, QWidget *w)
+{
+ tabBar()->setTabButton(pos, butpos, w);
+}
+
diff --git a/src/vidalia/VTabWidget.h b/src/vidalia/VTabWidget.h
new file mode 100644
index 0000000..45028e8
--- /dev/null
+++ b/src/vidalia/VTabWidget.h
@@ -0,0 +1,46 @@
+/*
+** 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>
+#include <QTabBar>
+
+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);
+
+ void setTabButton(int pos, QTabBar::ButtonPosition butpos, QWidget *w);
+
+protected:
+ void changeEvent(QEvent *e);
+ void retranslateUi();
+
+private slots:
+ void updateTop(int index);
+};
+
+#endif
+
diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp
new file mode 100644
index 0000000..ee2da03
--- /dev/null
+++ b/src/vidalia/VidaliaTab.cpp
@@ -0,0 +1,74 @@
+#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;
+}
+
+void
+VidaliaTab::closeEvent(QCloseEvent *event)
+{
+ event->ignore();
+ emit closeTab();
+}
+
diff --git a/src/vidalia/VidaliaWindow.h b/src/vidalia/VidaliaTab.h
similarity index 57%
copy from src/vidalia/VidaliaWindow.h
copy to src/vidalia/VidaliaTab.h
index b844afc..8a053dc 100644
--- a/src/vidalia/VidaliaWindow.h
+++ b/src/vidalia/VidaliaTab.h
@@ -3,50 +3,55 @@
** 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.
+** 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 VidaliaWindow.h
-** \brief Common superclass for all Vidalia windows
+** \file VidaliaTab.h
+** \brief Main tab that shows the current Tor status
*/
-#ifndef _VIDALIAWINDOW_H
-#define _VIDALIAWINDOW_H
+#ifndef _VIDALIATAB_H
+#define _VIDALIATAB_H
#include "VSettings.h"
-#include <QString>
-#include <QWidget>
-#include <QVariant>
-#include <QMainWindow>
+#include <QtGui>
-
-class VidaliaWindow : public QMainWindow
+class VidaliaTab : public QWidget
{
Q_OBJECT
public:
/** Default constructor. */
- VidaliaWindow(const QString &name, QWidget *parent = 0,
- Qt::WFlags flags = 0);
+ VidaliaTab(const QString &title, const QString &name = "", QWidget *parent = 0);
/** Destructor. */
- ~VidaliaWindow();
-
+ ~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);
- /** Saves the size and location of the window. */
- void saveWindowState();
- /** Restores the last size and location of the window. */
- void restoreWindowState();
/** 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);
+
+ void closeTab();
protected:
/** Reimplement the windows' changeEvent() method to check if the event
@@ -56,20 +61,12 @@ protected:
/** Called when the user wants to change the currently visible language. */
virtual void retranslateUi();
-public slots:
- /** Shows or hides this window. */
- virtual void setVisible(bool visible);
- /** Show this window. This method really just exists for subclasses to
- * override, since QMainWindow::show() is non-virtual. */
- virtual void showWindow() { QMainWindow::show(); }
+ virtual void closeEvent(QCloseEvent *event);
-signals:
- /** Emitted when a VidaliaWindow requests help information on the specified
- * <b>topic</b>. */
- void helpRequested(const QString &topic);
+ bool _onTop; /**< True if the current tab is the one being displayed */
private:
- QString _name; /**< Name associated with this window. */
+ QString _title; /**< Title displayed in the tab */
VSettings* _settings; /**< Object used to store window properties */
};
diff --git a/src/vidalia/bwgraph/BandwidthGraph.cpp b/src/vidalia/bwgraph/BandwidthGraph.cpp
index c6c896a..7ea82de 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.cpp
+++ b/src/vidalia/bwgraph/BandwidthGraph.cpp
@@ -38,8 +38,9 @@
/** Default constructor */
-BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
- : VidaliaWindow("BandwidthGraph", parent, flags)
+BandwidthGraph::BandwidthGraph(QStatusBar *st, QWidget *parent)
+ : VidaliaTab(tr("Bandwidth Graph"), "BandwidthGraph", parent),
+ _statusBar(st)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -50,8 +51,8 @@ BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
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();
@@ -81,6 +82,7 @@ void
BandwidthGraph::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Bandwidth Graph"));
}
/** Binds events to actions. */
@@ -151,9 +153,10 @@ void
BandwidthGraph::reset()
{
/* Set to current time */
- ui.statusbar->showMessage(tr("Since:") + " " +
- QDateTime::currentDateTime()
- .toString(DATETIME_FMT));
+ if(_statusBar && _onTop)
+ _statusBar->showMessage(tr("Since:") + " " +
+ QDateTime::currentDateTime()
+ .toString(DATETIME_FMT));
/* Reset the graph */
ui.frmGraph->resetGraph();
}
@@ -255,13 +258,3 @@ 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 35989fb..a1beda2 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 "VidaliaWindow.h"
+#include "VidaliaTab.h"
#include "VidaliaSettings.h"
#include "TorControl.h"
@@ -28,17 +28,13 @@
#define REFRESH_RATE 1000
-class BandwidthGraph : public VidaliaWindow
+class BandwidthGraph : public VidaliaTab
{
Q_OBJECT
public:
/** Default constructor */
- BandwidthGraph(QWidget *parent = 0, Qt::WFlags flags = 0);
-
-public slots:
- /** Overloaded QWidget.show */
- void showWindow();
+ BandwidthGraph(QStatusBar *st = 0, QWidget *parent = 0);
protected:
/** Called when the user changes the UI translation. */
@@ -68,6 +64,8 @@ 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 fb7fc94..f05e7b9 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.ui
+++ b/src/vidalia/bwgraph/BandwidthGraph.ui
@@ -1,364 +1,363 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BandwidthGraph</class>
- <widget class="QMainWindow" name="BandwidthGraph">
+ <widget class="QWidget" name="BandwidthGraph">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>553</width>
- <height>381</height>
+ <width>593</width>
+ <height>487</height>
</rect>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
<property name="windowTitle">
- <string>Tor Bandwidth Usage</string>
- </property>
- <property name="windowIcon">
- <iconset>
- <normaloff>:/images/32x32/utilities-system-monitor.png</normaloff>:/images/32x32/utilities-system-monitor.png</iconset>
+ <string notr="true"/>
</property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QGridLayout">
- <item row="1" column="0">
- <layout class="QHBoxLayout">
- <item>
- <widget class="QPushButton" name="btnToggleSettings">
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="rightMargin">
+ <number>12</number>
+ </property>
+ <property name="bottomMargin">
+ <number>12</number>
+ </property>
+ <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="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>40</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="horizontalSpacing">
+ <number>10</number>
+ </property>
+ <property name="verticalSpacing">
+ <number>0</number>
+ </property>
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <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>Show Settings</string>
+ <string>Receive Rate</string>
</property>
- <property name="checkable">
- <bool>true</bool>
+ <property name="checked">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="chkSendRate">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>21</width>
- <height>20</height>
- </size>
+ <property name="toolTip">
+ <string/>
</property>
- </spacer>
+ <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>
- <widget class="QPushButton" name="btnReset">
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="chkAlwaysOnTop">
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
<property name="text">
- <string>Reset</string>
+ <string>Always on Top</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="horizontalSpacing">
- <number>10</number>
- </property>
- <property name="verticalSpacing">
- <number>0</number>
- </property>
- <property name="margin">
- <number>5</number>
- </property>
- <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>
+ <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>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 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>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>
+ <string/>
</property>
- <property name="text">
- <string>Always on Top</string>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/graph-area.png</normaloff>:/images/16x16/graph-area.png</iconset>
</property>
- </widget>
- </item>
- <item row="0" column="1" colspan="3">
- <widget class="QLabel" name="lblGraphStyle">
- <property name="text">
- <string>Style</string>
+ </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>0</number>
</property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <property name="spacing">
+ <number>-1</number>
</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 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>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>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>:/images/16x16/graph-area.png</normaloff>:/images/16x16/graph-area.png</iconset>
- </property>
+ <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="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>100</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
</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>0</number>
- </property>
- <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>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 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="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string>100</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <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>% Opaque</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <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 row="1" column="0">
- <spacer name="horizontalSpacer_2">
- <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>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
+ <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>% Opaque</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <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 row="1" column="0">
+ <spacer name="horizontalSpacer_2">
+ <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>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <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>
+ </layout>
</widget>
<customwidgets>
<customwidget>
@@ -368,12 +367,8 @@
<container>1</container>
</customwidget>
</customwidgets>
- <tabstops>
- <tabstop>btnToggleSettings</tabstop>
- <tabstop>btnReset</tabstop>
- </tabstops>
<resources>
- <include location="../res/vidalia_common.qrc"/>
+ <include location="../res/vidalia.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp
index 3b62af1..ebee44f 100644
--- a/src/vidalia/config/AdvancedPage.cpp
+++ b/src/vidalia/config/AdvancedPage.cpp
@@ -60,6 +60,8 @@ AdvancedPage::AdvancedPage(QWidget *parent)
this, SLOT(authMethodChanged(int)));
connect(ui.chkRandomPassword, SIGNAL(toggled(bool)),
ui.linePassword, SLOT(setDisabled(bool)));
+ connect(ui.chkRandomPassword, SIGNAL(toggled(bool)),
+ this, SLOT(displayWarning(bool)));
connect(ui.btnEditTorConfig, SIGNAL(clicked()),
this, SLOT(displayTorrcDialog()));
connect(ui.rdoControlPort, SIGNAL(toggled(bool)), this, SLOT(toggleControl(bool)));
@@ -243,7 +245,6 @@ AdvancedPage::load()
ui.chkUseService->setChecked(s.isInstalled());
#endif
#endif
-
if(Vidalia::torControl()->getTorVersion() < 0x2021a) { // 0x2021a == 0.2.2.26
ui.chkAuto->setChecked(false);
ui.chkAuto->setVisible(false);
@@ -258,6 +259,7 @@ AdvancedPage::authMethodChanged(int index)
bool usePassword = (indexToAuthMethod(index) == TorSettings::PasswordAuth);
ui.linePassword->setEnabled(usePassword && !ui.chkRandomPassword->isChecked());
ui.chkRandomPassword->setEnabled(usePassword);
+ ui.lblWarn->setVisible((ui.chkRandomPassword->checkState() == Qt::Unchecked) and usePassword);
}
/** Returns the authentication method for the given <b>index</b>. */
@@ -433,3 +435,11 @@ AdvancedPage::toggleAuto(bool)
ui.label->setVisible(!ui.chkAuto->isChecked());
ui.lineControlPort->setVisible(!ui.chkAuto->isChecked());
}
+
+void
+AdvancedPage::displayWarning(bool checked)
+{
+ ui.lblWarn->setVisible(!checked and
+ indexToAuthMethod(ui.cmbAuthMethod->currentIndex()) ==
+ TorSettings::PasswordAuth);
+}
diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h
index 4510310..df2587f 100644
--- a/src/vidalia/config/AdvancedPage.h
+++ b/src/vidalia/config/AdvancedPage.h
@@ -78,6 +78,9 @@ private slots:
/** Called when the user checks "Configure ControlPort automatically" */
void toggleAuto(bool);
+ /** Called when the user checks "Randomly Generate" checkbox */
+ void displayWarning(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 fbaac49..1799e24 100644
--- a/src/vidalia/config/AdvancedPage.ui
+++ b/src/vidalia/config/AdvancedPage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>573</width>
- <height>543</height>
+ <width>586</width>
+ <height>522</height>
</rect>
</property>
<property name="contextMenuPolicy">
@@ -16,6 +16,12 @@
<layout class="QVBoxLayout">
<item>
<widget class="QGroupBox" name="grpControlPort">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@@ -26,10 +32,10 @@
<item>
<layout class="QGridLayout">
<property name="horizontalSpacing">
- <number>2</number>
+ <number>0</number>
</property>
<property name="verticalSpacing">
- <number>6</number>
+ <number>5</number>
</property>
<item row="6" column="0">
<widget class="QLabel" name="lblAuth">
@@ -41,7 +47,7 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="lblAddress">
<property name="text">
<string>Address:</string>
@@ -113,7 +119,7 @@
</item>
</layout>
</item>
- <item row="1" column="2">
+ <item row="2" column="2">
<layout class="QHBoxLayout">
<item>
<widget class="QLineEdit" name="lineControlAddress">
@@ -177,6 +183,12 @@
</item>
<item row="0" column="2">
<widget class="QRadioButton" name="rdoControlPort">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Use TCP connection (ControlPort)</string>
</property>
@@ -205,8 +217,14 @@
</property>
</widget>
</item>
- <item row="3" column="2">
+ <item row="4" column="2">
<widget class="QRadioButton" name="rdoControlSocket">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Use Unix domain socket (ControlSocket)</string>
</property>
@@ -222,7 +240,7 @@
</property>
</widget>
</item>
- <item row="2" column="2">
+ <item row="3" column="2">
<widget class="QCheckBox" name="chkAuto">
<property name="text">
<string>Configure ControlPort automatically</string>
@@ -231,11 +249,27 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="QLabel" name="lblWarn">
+ <property name="text">
+ <string>WARNING: If you hand pick the password it will be saved as plain text in Vidalia's configuration file. Using a random password is safer.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="grpTorConfigFile">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@@ -289,13 +323,6 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QPushButton" name="btnEditTorConfig">
- <property name="text">
- <string>Edit current torrc</string>
- </property>
- </widget>
- </item>
<item row="2" column="1" colspan="2">
<widget class="QLabel" name="lblNotice">
<property name="text">
@@ -314,11 +341,18 @@
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
+ <item row="2" column="0">
+ <widget class="QPushButton" name="btnEditTorConfig">
+ <property name="text">
+ <string>Edit current torrc</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
@@ -326,6 +360,12 @@
</item>
<item>
<widget class="QGroupBox" name="grpTorDataDirectory">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
@@ -375,14 +415,14 @@
</widget>
</item>
<item>
- <spacer>
+ <spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>489</width>
- <height>141</height>
+ <width>20</width>
+ <height>40</height>
</size>
</property>
</spacer>
diff --git a/src/vidalia/config/BridgeUsageDialog.ui b/src/vidalia/config/BridgeUsageDialog.ui
index 66ef1df..e3c0056 100644
--- a/src/vidalia/config/BridgeUsageDialog.ui
+++ b/src/vidalia/config/BridgeUsageDialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
@@ -9,49 +10,53 @@
<height>408</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Bridge Usage Summary</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <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">
<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></string>
+ <widget class="QLabel" name="lblClientSummary">
+ <property name="text">
+ <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></string>
+ <property name="text">
+ <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>
@@ -61,18 +66,20 @@
</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/>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
@@ -80,11 +87,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>
@@ -96,11 +103,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 499a9ae..fe63954 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. */
- Service /** Service Configuration page */
+ Advanced /** Advanced configuration page. */
};
/** Default Constructor */
diff --git a/src/vidalia/config/GeneralPage.ui b/src/vidalia/config/GeneralPage.ui
index 80cc819..8aa494b 100644
--- a/src/vidalia/config/GeneralPage.ui
+++ b/src/vidalia/config/GeneralPage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
@@ -9,63 +10,63 @@
<height>402</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="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>Start the Tor software when Vidalia starts</string>
+ <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup">
+ <property name="text">
+ <string>Connect to Tor automatically</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>
@@ -76,48 +77,48 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpProxyExecutable" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <widget class="QGroupBox" name="grpProxyExecutable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="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>
@@ -125,13 +126,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>
@@ -139,8 +140,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>
@@ -149,21 +150,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" >
@@ -188,8 +189,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 5fa20a9..51514ca 100644
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@ -90,7 +90,7 @@ ServerPage::ServerPage(QWidget *parent)
connect(ui.rdoClientMode, SIGNAL(toggled(bool)),
this, SLOT(serverModeChanged(bool)));
connect(ui.rdoNonExitMode, SIGNAL(toggled(bool)),
- this, SLOT(serverModeChanged(bool)));
+ this, SLOT(serverModeChanged(bool)));
connect(ui.rdoServerMode, SIGNAL(toggled(bool)),
this, SLOT(serverModeChanged(bool)));
connect(ui.rdoBridgeMode, SIGNAL(toggled(bool)),
@@ -229,9 +229,6 @@ ServerPage::serverModeChanged(bool enabled)
* relay. */
ui.tabsMenu->setVisible(relayEnabled || 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. */
ui.lblYourBridgeRelayIs->setVisible(bridgeEnabled);
@@ -253,15 +250,19 @@ ServerPage::serverModeChanged(bool enabled)
ui.chkMirrorDirectory->setChecked(_tmpMirror);
}
+ ui.lineDirPort->setEnabled(!bridgeEnabled);
+ ui.lblDirPort->setEnabled(!bridgeEnabled);
+
ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
- if(ui.chkMirrorDirectory->isChecked()) {
- ui.lblDirPort->setEnabled(!bridgeEnabled);
- ui.lineDirPort->setEnabled(!bridgeEnabled);
- }
/* Disable the Exit Policies tab when bridge or non-exit relay mode is
* selected */
ui.tabsMenu->setTabEnabled(2, !bridgeEnabled and !ui.rdoNonExitMode->isChecked());
+
+ if(ui.chkMirrorDirectory->isChecked()) {
+ ui.lblDirPort->setEnabled(!bridgeEnabled);
+ ui.lineDirPort->setEnabled(!bridgeEnabled);
+ }
}
/** Returns true if the user has changed their server settings since the
@@ -295,7 +296,7 @@ ServerPage::save(QString &errmsg)
{
/* Force the bandwidth rate limits to validate */
customRateChanged();
-
+
if (ui.rdoServerMode->isChecked() ||
ui.rdoNonExitMode->isChecked() ||
ui.rdoBridgeMode->isChecked()) {
@@ -317,8 +318,8 @@ 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());
+ || ui.rdoNonExitMode->isChecked()
+ || ui.rdoBridgeMode->isChecked());
_settings->setNonExitEnabled(ui.rdoNonExitMode->isChecked());
_settings->setBridgeEnabled(ui.rdoBridgeMode->isChecked());
if (ui.rdoBridgeMode->isChecked())
@@ -506,8 +507,8 @@ ServerPage::saveExitPolicies()
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. */
+ * 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) {
@@ -537,7 +538,6 @@ ServerPage::saveExitPolicies()
exitPolicy->addPolicy(Policy(Policy::RejectAll));
}
}
-
_settings->setExitPolicy(*exitPolicy);
}
diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui
index 0f98560..ec277f7 100644
--- a/src/vidalia/config/ServerPage.ui
+++ b/src/vidalia/config/ServerPage.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>548</width>
+ <width>658</width>
<height>578</height>
</rect>
</property>
@@ -16,48 +16,35 @@
<layout class="QVBoxLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="3">
+ <item row="1" column="0">
<widget class="QRadioButton" name="rdoClientMode">
<property name="text">
<string>Run as a client only</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="3" column="0">
<widget class="QRadioButton" name="rdoServerMode">
<property name="text">
<string>Relay traffic for the Tor network (exit relay)</string>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="4" column="0">
<widget class="QRadioButton" name="rdoBridgeMode">
<property name="text">
<string>Help censored users reach the Tor network</string>
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="4" column="1">
<widget class="QLabel" name="lblWhatsThis">
<property name="text">
<string><a href="#bridgeHelp">What's this?</a></string>
</property>
</widget>
</item>
- <item row="3" column="2" colspan="2">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="3">
+ <item row="2" column="0" colspan="2">
<widget class="QRadioButton" name="rdoNonExitMode">
<property name="text">
<string>Relay traffic inside the Tor network (non-exit relay)</string>
@@ -549,6 +536,16 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
</property>
</spacer>
</item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0">
<layout class="QHBoxLayout">
<item>
@@ -681,16 +678,6 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
</item>
</layout>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp
index 1c1e687..309d712 100644
--- a/src/vidalia/config/ServerSettings.cpp
+++ b/src/vidalia/config/ServerSettings.cpp
@@ -72,7 +72,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::Middleman).toString());
setDefault(SETTING_ENABLE_UPNP, false);
setDefault(SETTING_BRIDGE_RELAY, false);
setDefault(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
@@ -258,7 +258,7 @@ 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
diff --git a/src/vidalia/config/ServicePage.h b/src/vidalia/config/ServicePage.h
index 70c53cf..622673f 100644
--- a/src/vidalia/config/ServicePage.h
+++ b/src/vidalia/config/ServicePage.h
@@ -16,7 +16,6 @@
#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 8be3a59..8fc6c57 100644
--- a/src/vidalia/config/ServicePage.ui
+++ b/src/vidalia/config/ServicePage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
@@ -9,133 +10,137 @@
<height>400</height>
</rect>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>600</width>
<height>400</height>
</size>
</property>
- <property name="windowTitle" >
- <string>Form</string>
+ <property name="windowTitle">
+ <string notr="true"/>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Provided Hidden Services</string>
</property>
- <layout class="QGridLayout" >
- <item rowspan="5" row="0" column="0" >
- <widget class="QTableWidget" name="serviceWidget" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" rowspan="5">
+ <widget class="QTableWidget" name="serviceWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="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" >:/images/22x22/list-add.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/list-add.png</normaloff>:/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" >:/images/22x22/list-remove.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/list-remove.png</normaloff>:/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" >:/images/22x22/edit-copy.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit-copy.png</normaloff>:/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" >:/images/22x22/folder.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/folder.png</normaloff>:/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" >
+ <property name="sizeHint" stdset="0">
<size>
<width>21</width>
<height>46</height>
@@ -148,10 +153,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>141</height>
@@ -161,6 +166,8 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
<connections/>
</ui>
diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
index 3070c09..57e2440 100644
--- a/src/vidalia/config/TorSettings.cpp
+++ b/src/vidalia/config/TorSettings.cpp
@@ -94,7 +94,7 @@ TorSettings::TorSettings(TorControl *torControl)
setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>());
setDefault(SETTING_BOOTSTRAP, false);
setDefault(SETTING_BOOTSTRAP_FROM, "");
- setDefault(SETTING_AUTOCONTROL, false);
+ setDefault(SETTING_AUTOCONTROL, true);
}
/** Applies any changes to Tor's control port or authentication settings. */
diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp
index 08dd6a0..a1ad569 100644
--- a/src/vidalia/config/TorrcDialog.cpp
+++ b/src/vidalia/config/TorrcDialog.cpp
@@ -19,6 +19,7 @@
#include "Vidalia.h"
#include <QMessageBox>
+#include <QToolBar>
void
TorHighlighter::highlightBlock(const QString &text)
@@ -43,6 +44,8 @@ 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 */
@@ -61,6 +64,21 @@ 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 0d60804..fb11574 100644
--- a/src/vidalia/config/TorrcDialog.h
+++ b/src/vidalia/config/TorrcDialog.h
@@ -49,6 +49,7 @@ 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 c72a255..46ac151 100644
--- a/src/vidalia/config/TorrcDialog.ui
+++ b/src/vidalia/config/TorrcDialog.ui
@@ -10,6 +10,12 @@
<height>582</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="windowTitle">
<string>Editing torrc</string>
</property>
@@ -17,183 +23,76 @@
<iconset resource="../res/vidalia.qrc">
<normaloff>:/images/16x16/system-run.png</normaloff>:/images/16x16/system-run.png</iconset>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
- <widget class="QTextEdit" name="teditTorrc"/>
- </item>
- <item row="5" column="0">
- <widget class="QCheckBox" name="chkSave">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>12</number>
+ </property>
+ <item>
+ <widget class="QTextEdit" name="teditTorrc">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="hLayout">
+ <item>
+ <widget class="QRadioButton" name="rdoAll">
<property name="text">
- <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
+ <string>Apply all</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">
- <property name="text">
- <string>Apply all</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="rdoSelection">
- <property name="text">
- <string>Apply selection only</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item>
+ <widget class="QRadioButton" name="rdoSelection">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Apply selection only</string>
+ </property>
+ </widget>
</item>
</layout>
</item>
- <item row="1" column="0">
+ <item>
+ <widget class="QCheckBox" name="chkSave">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <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>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -204,6 +103,78 @@
</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"/>
@@ -226,14 +197,14 @@
</hints>
</connection>
<connection>
- <sender>btnUndo</sender>
- <signal>clicked()</signal>
+ <sender>actionUndo</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>undo()</slot>
<hints>
<hint type="sourcelabel">
- <x>35</x>
- <y>17</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
@@ -242,14 +213,14 @@
</hints>
</connection>
<connection>
- <sender>btnRedo</sender>
- <signal>clicked()</signal>
+ <sender>actionRedo</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>redo()</slot>
<hints>
<hint type="sourcelabel">
- <x>97</x>
- <y>17</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
@@ -258,14 +229,14 @@
</hints>
</connection>
<connection>
- <sender>btnSelectAll</sender>
- <signal>clicked()</signal>
+ <sender>actionSelect_All</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>selectAll()</slot>
<hints>
<hint type="sourcelabel">
- <x>171</x>
- <y>17</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
@@ -274,14 +245,14 @@
</hints>
</connection>
<connection>
- <sender>btnCopy</sender>
- <signal>clicked()</signal>
+ <sender>actionCopy</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>copy()</slot>
<hints>
<hint type="sourcelabel">
- <x>85</x>
- <y>17</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
@@ -290,14 +261,14 @@
</hints>
</connection>
<connection>
- <sender>btnPaste</sender>
- <signal>clicked()</signal>
+ <sender>actionPaste</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>paste()</slot>
<hints>
<hint type="sourcelabel">
- <x>149</x>
- <y>17</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
@@ -306,14 +277,14 @@
</hints>
</connection>
<connection>
- <sender>btnCut</sender>
- <signal>clicked()</signal>
+ <sender>actionCut</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>cut()</slot>
<hints>
<hint type="sourcelabel">
- <x>29</x>
- <y>17</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>300</x>
diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp
index 7273f10..b13f98f 100644
--- a/src/vidalia/config/VidaliaSettings.cpp
+++ b/src/vidalia/config/VidaliaSettings.cpp
@@ -39,6 +39,7 @@
#define SETTING_LAST_UPDATE_CHECK "LastUpdateCheck"
#define SETTING_USE_LOCAL_GEOIP_DATABASE "UseLocalGeoIpDatabase"
#define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase"
+#define SETTING_PLUGIN_PATH "PluginPath"
#define SETTING_SKIP_VERSION_CHECK "SkipVersionCheck"
#if defined(Q_OS_WIN32)
@@ -46,7 +47,7 @@
#define VIDALIA_REG_KEY "Vidalia"
#endif
-#define SETTING_ICON_PREF "IconDisplayPreference"
+#define SETTING_ICON_PREF "IconPref"
/** Default Constructor */
VidaliaSettings::VidaliaSettings()
@@ -84,8 +85,11 @@ VidaliaSettings::VidaliaSettings()
setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime());
setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false);
setDefault(SETTING_LOCAL_GEOIP_DATABASE, "");
+
+ setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory());
setDefault(SETTING_ICON_PREF, Both);
setDefault(SETTING_SKIP_VERSION_CHECK, false);
+ setDefault(SETTING_REMEMBER_SHUTDOWN, false);
}
/** Gets the currently preferred language code for Vidalia. */
@@ -325,6 +329,18 @@ VidaliaSettings::setLocalGeoIpDatabase(const QString &databaseFile)
setValue(SETTING_LOCAL_GEOIP_DATABASE, databaseFile);
}
+QString
+VidaliaSettings::pluginPath() const
+{
+ return QDir::convertSeparators(value(SETTING_PLUGIN_PATH).toString());
+}
+
+void
+VidaliaSettings::setPluginPath(const QString &path)
+{
+ setValue(SETTING_PLUGIN_PATH, path);
+}
+
/** Get the icon preference */
VidaliaSettings::IconPosition
VidaliaSettings::getIconPref()
@@ -363,3 +379,15 @@ VidaliaSettings::skipVersionCheck() const
{
return value(SETTING_SKIP_VERSION_CHECK).toBool();
}
+
+bool
+VidaliaSettings::rememberShutdown()
+{
+ return value(SETTING_REMEMBER_SHUTDOWN).toBool();
+}
+
+void
+VidaliaSettings::setRememberShutdown(bool val)
+{
+ setValue(SETTING_REMEMBER_SHUTDOWN, val);
+}
diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp~
similarity index 93%
copy from src/vidalia/config/VidaliaSettings.cpp
copy to src/vidalia/config/VidaliaSettings.cpp~
index 7273f10..6e468fa 100644
--- a/src/vidalia/config/VidaliaSettings.cpp
+++ b/src/vidalia/config/VidaliaSettings.cpp~
@@ -39,6 +39,7 @@
#define SETTING_LAST_UPDATE_CHECK "LastUpdateCheck"
#define SETTING_USE_LOCAL_GEOIP_DATABASE "UseLocalGeoIpDatabase"
#define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase"
+#define SETTING_PLUGIN_PATH "PluginPath"
#define SETTING_SKIP_VERSION_CHECK "SkipVersionCheck"
#if defined(Q_OS_WIN32)
@@ -46,7 +47,7 @@
#define VIDALIA_REG_KEY "Vidalia"
#endif
-#define SETTING_ICON_PREF "IconDisplayPreference"
+#define SETTING_ICON_PREF "IconPref"
/** Default Constructor */
VidaliaSettings::VidaliaSettings()
@@ -84,8 +85,14 @@ VidaliaSettings::VidaliaSettings()
setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime());
setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false);
setDefault(SETTING_LOCAL_GEOIP_DATABASE, "");
+
+ setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory());
setDefault(SETTING_ICON_PREF, Both);
+<<<<<<< HEAD
setDefault(SETTING_SKIP_VERSION_CHECK, false);
+=======
+ setDefault(SETTING_REMEMBER_SHUTDOWN, false);
+>>>>>>> bug4577_remember
}
/** Gets the currently preferred language code for Vidalia. */
@@ -325,6 +332,18 @@ VidaliaSettings::setLocalGeoIpDatabase(const QString &databaseFile)
setValue(SETTING_LOCAL_GEOIP_DATABASE, databaseFile);
}
+QString
+VidaliaSettings::pluginPath() const
+{
+ return QDir::convertSeparators(value(SETTING_PLUGIN_PATH).toString());
+}
+
+void
+VidaliaSettings::setPluginPath(const QString &path)
+{
+ setValue(SETTING_PLUGIN_PATH, path);
+}
+
/** Get the icon preference */
VidaliaSettings::IconPosition
VidaliaSettings::getIconPref()
@@ -359,7 +378,19 @@ VidaliaSettings::fromString(QString iconPref)
}
bool
+<<<<<<< HEAD
VidaliaSettings::skipVersionCheck() const
{
return value(SETTING_SKIP_VERSION_CHECK).toBool();
+=======
+VidaliaSettings::rememberShutdown()
+{
+ return value(SETTING_REMEMBER_SHUTDOWN).toBool();
+}
+
+void
+VidaliaSettings::setRememberShutdown(bool val)
+{
+ setValue(SETTING_REMEMBER_SHUTDOWN, val);
+>>>>>>> bug4577_remember
}
diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h
index b378d9b..09360ab 100644
--- a/src/vidalia/config/VidaliaSettings.h
+++ b/src/vidalia/config/VidaliaSettings.h
@@ -20,6 +20,8 @@
#include <QDateTime>
+/** Public setting keys */
+#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown"
/** Handles saving and restoring Vidalia's settings, such as the
* location of Tor, the control port, etc.
@@ -132,6 +134,11 @@ public:
/** Sets the file to use as a local GeoIP database. */
void setLocalGeoIpDatabase(const QString &databaseFile);
+ /** Returns the path where the plugins live */
+ QString pluginPath() const;
+ /** Sets the path where the plugins live */
+ void setPluginPath(const QString &path);
+
/** Get the icon preference */
IconPosition getIconPref();
@@ -142,6 +149,12 @@ public:
/** Returns true if Vidalia should skip the version check for tor */
bool skipVersionCheck() const;
+
+ /** Returns true if Vidalia should not ask if the user wants to shutdown
+ * tor gracefully */
+ bool rememberShutdown();
+ /** Sets RememberShutdown to val */
+ void setRememberShutdown(bool val);
};
#endif
diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h~
similarity index 91%
copy from src/vidalia/config/VidaliaSettings.h
copy to src/vidalia/config/VidaliaSettings.h~
index b378d9b..75c0b7a 100644
--- a/src/vidalia/config/VidaliaSettings.h
+++ b/src/vidalia/config/VidaliaSettings.h~
@@ -20,6 +20,8 @@
#include <QDateTime>
+/** Public setting keys */
+#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown"
/** Handles saving and restoring Vidalia's settings, such as the
* location of Tor, the control port, etc.
@@ -132,6 +134,11 @@ public:
/** Sets the file to use as a local GeoIP database. */
void setLocalGeoIpDatabase(const QString &databaseFile);
+ /** Returns the path where the plugins live */
+ QString pluginPath() const;
+ /** Sets the path where the plugins live */
+ void setPluginPath(const QString &path);
+
/** Get the icon preference */
IconPosition getIconPref();
@@ -140,8 +147,16 @@ public:
QString toString(const IconPosition iconPref);
IconPosition fromString(QString iconPref);
+<<<<<<< HEAD
/** Returns true if Vidalia should skip the version check for tor */
bool skipVersionCheck() const;
+=======
+ /** Returns true if Vidalia should not ask if the user wants to shutdown
+ * tor gracefully */
+ bool rememberShutdown();
+ /** Sets RememberShutdown to val */
+ void setRememberShutdown(bool val);
+>>>>>>> bug4577_remember
};
#endif
diff --git a/src/vidalia/help/content/cs/bridges.html b/src/vidalia/help/content/cs/bridges.html
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/cs/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 35fc842..0000000
--- a/src/vidalia/help/content/cs/config.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 378a4cd..0000000
--- a/src/vidalia/help/content/cs/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index d2f441a..0000000
--- a/src/vidalia/help/content/cs/links.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/cs/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/cs/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/cs/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index f7baa0f..0000000
--- a/src/vidalia/help/content/cs/server.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/cs/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/cs/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/eo/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 35fc842..0000000
--- a/src/vidalia/help/content/eo/config.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 378a4cd..0000000
--- a/src/vidalia/help/content/eo/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index d2f441a..0000000
--- a/src/vidalia/help/content/eo/links.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/eo/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/eo/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/eo/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index f7baa0f..0000000
--- a/src/vidalia/help/content/eo/server.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/eo/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/eo/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/eu/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 35fc842..0000000
--- a/src/vidalia/help/content/eu/config.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 378a4cd..0000000
--- a/src/vidalia/help/content/eu/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index d2f441a..0000000
--- a/src/vidalia/help/content/eu/links.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/eu/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/eu/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/eu/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index f7baa0f..0000000
--- a/src/vidalia/help/content/eu/server.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/eu/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/eu/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/fo/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/fo/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/fo/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/fo/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/fo/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/fo/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/he/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 35fc842..0000000
--- a/src/vidalia/help/content/he/config.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 378a4cd..0000000
--- a/src/vidalia/help/content/he/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index d2f441a..0000000
--- a/src/vidalia/help/content/he/links.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/he/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/he/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/he/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index f7baa0f..0000000
--- a/src/vidalia/help/content/he/server.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/he/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/he/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/ka/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 35fc842..0000000
--- a/src/vidalia/help/content/ka/config.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 378a4cd..0000000
--- a/src/vidalia/help/content/ka/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index d2f441a..0000000
--- a/src/vidalia/help/content/ka/links.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/ka/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/ka/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/ka/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index f7baa0f..0000000
--- a/src/vidalia/help/content/ka/server.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/ka/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/ka/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 77439b5..0000000
--- a/src/vidalia/help/content/nap/bridges.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 35fc842..0000000
--- a/src/vidalia/help/content/nap/config.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 378a4cd..0000000
--- a/src/vidalia/help/content/nap/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index d2f441a..0000000
--- a/src/vidalia/help/content/nap/links.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index b0ef886..0000000
--- a/src/vidalia/help/content/nap/log.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index bdb2f50..0000000
--- a/src/vidalia/help/content/nap/netview.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 2e84804..0000000
--- a/src/vidalia/help/content/nap/running.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index f7baa0f..0000000
--- a/src/vidalia/help/content/nap/server.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 9d30a80..0000000
--- a/src/vidalia/help/content/nap/services.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-<!--
-** $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
deleted file mode 100644
index 69b8367..0000000
--- a/src/vidalia/help/content/nap/troubleshooting.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-<!--
-** $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 5f49d8b..1a9ffda 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 e99126d..41a9038 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ba585d2..257d8ac 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 5242225..c3d32d8 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 b9d92c0..354628e 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 897a666..7ae44b2 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 74d57e0..14f0e24 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 d3d4e06..7ff8e18 100644
--- a/src/vidalia/help/content/po/ar/netview.po
+++ b/src/vidalia/help/content/po/ar/netview.po
@@ -1,18 +1,30 @@
#
-# runasand <runa.sandvik at gmail.com>, 2011.
+# $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.
+#
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2010-09-02 18:34+0200\n"
+"Last-Translator: shadi <shadi at 35point5.com>\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"
-"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"
+"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"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -67,13 +79,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
@@ -102,22 +114,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
@@ -136,8 +148,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
@@ -199,8 +211,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 ""
"تظهر لوحة تفاصيل المرحّل على الجانب الايمن من الشاشة تعطيك تفاصيل حول "
@@ -215,8 +227,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
@@ -237,8 +249,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
@@ -277,8 +289,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
@@ -289,5 +301,3 @@ 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 0c679c3..90757e1 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 cab82a6..5ceca62 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 4d223e9..68c08ff 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 7b55d7f..d8b3403 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 c06e26e..c1a7e1a 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 972180a..094d880 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 8577241..113b905 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 d61f118..8289556 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 8d388b7..02b3929 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 f8081bf..62bfd23 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 a47c354..b3da2bb 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 e0ca4d3..45b9b57 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 162f6aa..6901113 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 1f1aa2d..b5b86d6 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9eafa61..060c759 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 6f5191d..549c146 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 bebe57e..8a804a7 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 0649133..5222225 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 b2f2749..b40bd36 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9ffa6a7..f3cbb53 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 fe61943..d1cdb64 100644
--- a/src/vidalia/help/content/po/cy/netview.po
+++ b/src/vidalia/help/content/po/cy/netview.po
@@ -1,12 +1,11 @@
#
-# 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-05-15 11:47+0000\n"
-"Last-Translator: cymro <markives at hotmail.co.uk>\n"
+"PO-Revision-Date: 2011-04-12 15:28+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"
@@ -29,7 +28,7 @@ msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:25
msgid "<a name=\"overview\"/>"
-msgstr "<a name=\"overview\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:26
@@ -49,12 +48,12 @@ msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:35
msgid "<a name=\"netmap\"/>"
-msgstr "<a name=\"netmap\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:36
msgid "Network Map"
-msgstr "Map Rhwydwaith"
+msgstr ""
#. type: Content of: <html><body><p>
#: en/netview.html:38
@@ -98,7 +97,7 @@ msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:66
msgid "<a name=\"relaylist\"/>"
-msgstr "<a name=\"relaylist\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:67
@@ -245,5 +244,3 @@ 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 b925b40..a5803d5 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 1972f2c..2894859 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 1930b1d..93a1118 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 d2ed171..188d4fd 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 c7f618d..1ca7993 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 87c077c..ff4d8e6 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 08ed998..05eef92 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 40c5745..2b863bf 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 c7ad239..c035e44 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 e6fd9bb..30df021 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 066e946..3f8e9d6 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 64efda1..5cbbd9d 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 4632b01..5042798 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 05f0b60..469ba59 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 0398bed..6035d73 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 671abe3..056acbb 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 52774cb..4c12c4e 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 ab341fe..133164f 100644
--- a/src/vidalia/help/content/po/es/netview.po
+++ b/src/vidalia/help/content/po/es/netview.po
@@ -1,17 +1,28 @@
#
+# $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: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\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"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Translate Toolkit 1.5.3\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -59,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 ""
@@ -85,12 +96,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 ""
@@ -167,8 +178,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 ""
@@ -244,5 +255,3 @@ 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 4681b25..f21e484 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 a92e219..27aba36 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 dfc8155..c6900ed 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 e0cd895..0a395c8 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 644f0f6..6758ec5 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 4b963d6..217b3f2 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 788c8c4..07734bb 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 e699176..0020086 100644
--- a/src/vidalia/help/content/po/fr/netview.po
+++ b/src/vidalia/help/content/po/fr/netview.po
@@ -1,18 +1,28 @@
#
-# runasand <runa.sandvik at gmail.com>, 2011.
+# $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: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Translate Toolkit 1.5.3\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -68,8 +78,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 "
@@ -105,20 +115,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."
@@ -155,9 +165,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
@@ -187,8 +197,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
@@ -205,15 +215,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
@@ -255,8 +265,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
@@ -295,5 +305,3 @@ 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 9d61c1a..7b0d32a 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 97d91c6..c4937ac 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 631297f..2d05449 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 32c871f..f951aa0 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 27d48e1..0254b64 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 d5da78b..5d0cf41 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 41f4e7f..5abff46 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 e7e60f5..818c042 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 138150d..a4b75eb 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 8322948..2428ec9 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 20ab0ae..8a6d946 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 eb9d4b9..e192f33 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 cb7ed2a..7f76646 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 e0e965d..6500e46 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 94db9a9..58ffb8a 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 67ce337..d80af46 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 fd8b0ad..530bc47 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 ab1ab1b..67ab0ce 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 b378912..5d09a09 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 333a3f7..895ffb1 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 006a530..9498bed 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 1318bc2..1d8621a 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 4f9f9db..ee4436d 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 c0fbb87..08f1eac 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ad58084..b32f989 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 fddd1fa..02af0a6 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 3f70289..288186e 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 6e62a78..133164f 100644
--- a/src/vidalia/help/content/po/it/netview.po
+++ b/src/vidalia/help/content/po/it/netview.po
@@ -1,17 +1,28 @@
#
+# $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: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\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"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Translate Toolkit 1.5.3\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -59,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 ""
@@ -85,12 +96,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 ""
@@ -167,8 +178,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 ""
@@ -244,5 +255,3 @@ 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 1753f49..23498b8 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 bea7a23..9fb7dd1 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 be99e48..71cd9ae 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 a674118..3253e05 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 588f340..91ab85a 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 aa1cf58..5b4167f 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 efac0f5..52f2fef 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 d58cf2f..44255cb 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 7ff5390..27e6464 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 f0258a4..dec50df 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 f01ee79..c429e3e 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 b7bb753..ca0b4ac 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 1edaced..cbf6448 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 4ca4412..4aab18d 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 bb86bb1..2824d9e 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 249ee4e..849cdf1 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 23ae435..1964adf 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 7ea1291..77d5231 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 18f63a5..279072a 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 8b17f86..6dbd9ee 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ae69182..12fd75e 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 3263383..ef9ffa6 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 bb5fbd7..bac14dd 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 42bec80..450c1ed 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 839c61c..bbba452 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 e7b3a22..f450fe0 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ce3eb06..f32003d 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 1322346..e65713a 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9c23000..2953719 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 700b34b..fc20730 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 0158a30..31d2218 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 cb126fe..a412447 100644
--- a/src/vidalia/help/content/po/my/netview.po
+++ b/src/vidalia/help/content/po/my/netview.po
@@ -1,18 +1,28 @@
#
-# runasand <runa.sandvik at gmail.com>, 2011.
+# $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: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: my\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Translate Toolkit 1.5.3\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +80,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 "
@@ -100,27 +110,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 မွာပဲ ဖမ္းယူေပးထားမွာ ျဖစ္ပါတယ္။"
@@ -144,8 +154,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
@@ -210,8 +220,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 အေၾကာင္း "
@@ -302,5 +312,3 @@ 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 60ee878..7890133 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 f0cb9b3..3130bf3 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 1a66e48..fceb3ae 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 0dfac52..267c31f 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 56f031e..76efb24 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 5326785..1203d67 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 337b57b..e793d8e 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 e67037c..a66393d 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 96f9eea..ce7e347 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 ba232c5..6dec764 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 14e406e..c6e9224 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 88179c3..30d29e9 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 3b71c5e..4ddb723 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 dd2d147..611816a 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9b0a1e4..558a035 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 6b83d68..a4cda00 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ee83271..628cdb1 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 8a52252..32e0745 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 049bf3a..1c624da 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 05900ed..5c43864 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 3216ff0..22d109d 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 bc52b3c..0fd0845 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 e4512d9..e470919 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 69eece5..9b4ee0f 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 54c8dd1..8b8818f 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 4db7bf2..3e5919f 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 c9ccede..b3ce1d1 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 c5d07fb..8ab192c 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 f75d7ab..77a5a70 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 87d598e..a9d79de 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 6c80e49..fe5c186 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 f9db63f..ee15e7f 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 406ba81..81470cb 100644
--- a/src/vidalia/help/content/po/ru/netview.po
+++ b/src/vidalia/help/content/po/ru/netview.po
@@ -1,18 +1,30 @@
#
-# runasand <runa.sandvik at gmail.com>, 2011.
+# $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.
+#
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-26 17:00+0200\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"
+"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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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"
+"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"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -25,8 +37,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
@@ -66,8 +78,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 ""
"Карта сети содержит карту мира, красным отмечено географическое место "
@@ -102,22 +114,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
@@ -138,8 +150,8 @@ msgid ""
msgstr ""
"В левой части просмотрщика сети ,вы увидите список ретрансляторов в сети "
"Tor.Следующая за каждым ретранслятором иконка указывает на статус "
-"ретранслятора.ниже таблица кратко описывает возможные статусы ретрансляторов"
-" на иконках."
+"ретранслятора.ниже таблица кратко описывает возможные статусы ретрансляторов "
+"на иконках."
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:78
@@ -207,15 +219,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>
@@ -224,8 +236,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
@@ -272,8 +284,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
@@ -298,5 +310,3 @@ 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 ea796c4..67d180f 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 8c51092..8c98164 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 1427b4f..1cdfa93 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 bf48885..a9fd80d 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 db118d2..7e491d0 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 c7bfdd5..5263b4f 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 5c23a24..30eda45 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 390bae9..e3748e6 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 2621f70..a293f32 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 d83916d..48786fb 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 c246d24..4f28afc 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 b6d8750..9b16a10 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 b74052e..39a9a54 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 8cea836..333df5d 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 dd761af..d30ce09 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 2389315..6f90155 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ce522c9..b830658 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 d5e4b59..7719a04 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9edce2b..3253f25 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 d26fa09..1cd01b8 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 6c1a5ef..f37982e 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 4e33465..79e248b 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-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 ec4555e..617f50e 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 0aa4250..6a03b77 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 d44a783..98fd7eb 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 f33fcb8..95e3b63 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 478ec09..a0157f5 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 36708a4..8b0aa3d 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 0815ee7..253c7b9 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 10ae0aa..74ff807 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 2b0c41b..01014a2 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 3acb714..503a27d 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-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9bfd6c9..859b4a5 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 26e8ab4..8e4e7d5 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 cc606ac..077a112 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 9aa5dc4..835d3e1 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 9ac6f24..4ae668f 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:12+0000\n"
+"PO-Revision-Date: 2011-05-06 19:33+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 3b07eb1..6332f41 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 eff4270..a998a77 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:13+0000\n"
+"PO-Revision-Date: 2011-05-06 19:34+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 b7517cb..607e743 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-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
@@ -244,5 +244,3 @@ 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 3adb742..b94ee77 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/vidalia/src/vidalia/help/content/validate.log"
+ validate_log="/home/runa/tor/validate/vidaliahelp-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 dfafef5..17aec54 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/CMakeLists.txt b/src/vidalia/i18n/CMakeLists.txt
index a4d1738..7ec3bda 100644
--- a/src/vidalia/i18n/CMakeLists.txt
+++ b/src/vidalia/i18n/CMakeLists.txt
@@ -15,30 +15,32 @@
set(vidalia_PO
po/ar/vidalia_ar.po
po/bg/vidalia_bg.po
+ po/my/vidalia_my.po
po/cs/vidalia_cs.po
po/da/vidalia_da.po
po/de/vidalia_de.po
- po/el/vidalia_el.po
po/es/vidalia_es.po
po/fa/vidalia_fa.po
+ po/fi/vidalia_fi.po
po/fr/vidalia_fr.po
+ po/he/vidalia_he.po
po/hu/vidalia_hu.po
po/it/vidalia_it.po
- po/ko/vidalia_ko.po
+ po/ja/vidalia_ja.po
+ po/nb/vidalia_nb.po
po/nl/vidalia_nl.po
+ po/pl/vidalia_pl.po
po/pt/vidalia_pt.po
po/pt_BR/vidalia_pt_BR.po
+ po/ro/vidalia_ro.po
po/ru/vidalia_ru.po
- po/id/vidalia_id.po
+ po/sq/vidalia_sq.po
+ po/sv/vidalia_sv.po
+ po/th/vidalia_th.po
po/tr/vidalia_tr.po
+ po/vi/vidalia_vi.po
po/zh_CN/vidalia_zh_CN.po
- po/ro/vidalia_ro.po
- po/fi/vidalia_fi.po
- po/he/vidalia_he.po
- po/sv/vidalia_sv.po
- po/nb/vidalia_nb.po
- po/pl/vidalia_pl.po
- po/ca/vidalia_ca.po
+ po/zh_TW/vidalia_zh_TW.po
)
vidalia_add_po(vidalia_QMS ${vidalia_PO})
@@ -46,30 +48,32 @@ vidalia_add_po(vidalia_QMS ${vidalia_PO})
set(qt_PO
po/ar/qt_ar.po
po/bg/qt_bg.po
+ po/my/qt_my.po
po/cs/qt_cs.po
po/da/qt_da.po
po/de/qt_de.po
- po/el/qt_el.po
po/es/qt_es.po
po/fa/qt_fa.po
+ po/fi/qt_fi.po
po/fr/qt_fr.po
+ po/he/qt_he.po
po/hu/qt_hu.po
po/it/qt_it.po
- po/ko/qt_ko.po
+ po/ja/qt_ja.po
+ po/nb/qt_nb.po
po/nl/qt_nl.po
+ po/pl/qt_pl.po
po/pt/qt_pt.po
po/pt_BR/qt_pt_BR.po
+ po/ro/qt_ro.po
po/ru/qt_ru.po
- po/id/qt_id.po
+ po/sq/qt_sq.po
+ po/sv/qt_sv.po
+ po/th/qt_th.po
po/tr/qt_tr.po
+ po/vi/qt_vi.po
po/zh_CN/qt_zh_CN.po
- po/ro/qt_ro.po
- po/fi/qt_fi.po
- po/he/qt_he.po
- po/sv/qt_sv.po
- po/nb/qt_nb.po
- po/pl/qt_pl.po
- po/ca/qt_ca.po
+ po/zh_TW/qt_zh_TW.po
)
vidalia_add_po(qt_QMS ${qt_PO})
diff --git a/src/vidalia/i18n/po/.tx/config b/src/vidalia/i18n/po/.tx/config
index 2586ea7..d129db7 100644
--- a/src/vidalia/i18n/po/.tx/config
+++ b/src/vidalia/i18n/po/.tx/config
@@ -1,4 +1,4 @@
-[torproject.1-vidalia-vidalia-pot]
+[torproject.3-vidalia-alpha-vidalia-pot]
source_file = templates/vidalia.pot
source_lang = en
trans.af = af/vidalia_af.po
@@ -124,126 +124,3 @@ 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 df5ee68..6b31647 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 d84aacd..020ac5e 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 845e243..2f64a87 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ar/qt_ar.po b/src/vidalia/i18n/po/ar/qt_ar.po
index 4cef292..e64aa33 100644
--- a/src/vidalia/i18n/po/ar/qt_ar.po
+++ b/src/vidalia/i18n/po/ar/qt_ar.po
@@ -1,13 +1,10 @@
#
-# Translators:
-# OsamaK <osamak at gnu.org>, 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-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-22 16:13+0000\n"
+"PO-Revision-Date: 2011-03-13 19:49+0000\n"
"Last-Translator: OsamaK <osamak at gnu.org>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -445,5 +442,3 @@ msgstr "%1 كيلو بايت"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 بايت"
-
-
diff --git a/src/vidalia/i18n/po/ar/vidalia_ar.po b/src/vidalia/i18n/po/ar/vidalia_ar.po
index 47abd9f..acad6c9 100644
--- a/src/vidalia/i18n/po/ar/vidalia_ar.po
+++ b/src/vidalia/i18n/po/ar/vidalia_ar.po
@@ -1,19 +1,16 @@
#
# Translators:
-# Ahmad LuvSy <donotplay at hotmail.ca>, 2012.
-# IBRAHIM <mradonadiego at hotmail.fr>, 2011.
-# <manmacdeath at gmail.com>, 2011.
-# <moazbaghdadi at gmail.com>, 2011.
-# mohammad Alhargan <malham1 at gmail.com>, 2011.
+# <amjad.dabi at gmail.com>, 2011.
+# Fadi Mansour <fadi.redeemer.mansour at gmail.com>, 2011.
# Mohammed Al-Doub <voulnet at gmail.com>, 2012.
-# OsamaK <osamak at gnu.org>, 2011.
+# Mohammed Babiker <sudanhacker at hotmail.com>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-08 20:27+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: Mohammed Al-Doub <voulnet at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -158,15 +155,15 @@ msgstr "المسار:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "استعمل مقبس نطاق يونِكس (ControlSocket)"
+msgstr "استخدام المجال مأخذ يونكس (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "حرر ملف التوررك الحالي"
+msgstr "تحرير torrc الحالي"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "ملحوظة: فعل هذا سيغير ملف التوررك المحمّل حاليا"
+msgstr "ملاحظة : هذا سوف تحرير torrc حاليا تحميل"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
@@ -176,17 +173,13 @@ msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"ملف الإعدادات المحدد يحتوي على أحرف لا يستطيع نظامك إظهارها لاعتماده على "
-"نظام ترقيم 8-بت "
+msgstr "مسار ملف إعدادات تور المحدد يحتوي على محارف لا يمكن تمثيلها بالترميز ذو البتات الثمانية المستخدم في نظامك"
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"مجلد المعلومات المحدد يحتوي على أحرف لا يستطيع نظامك إظهارها لاعتماده على "
-"نظام ترقيم 8-بت"
+msgstr "الدليل المحدد تور بيانات الموقع يحتوي على الأحرف التي لا يمكن تمثيلها في نظامك الحالي ترميز حرف 8 بت."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -198,25 +191,18 @@ msgstr "غيرت مسار torrc، أتريد إعادة تشغيل تور؟"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "ملف إعدادات Tor (torrc) ;; كل الملفات (*)"
+msgstr "ملف اعداد تور (torrc) ؛ جميع الملفات (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "حدد ملف ليتم استخدامه لمسار مأخذ توصيل تور"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "جهز محطة التحكم آليًّا"
+msgstr "حدد ملف لاستخدامه في مسار مقبس تور"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"لم يتمكن ڤيداليا من إزالة خدمة تور.\n"
-"\n"
-"قد تضطر لإزالتها يدوياً."
+msgstr "لم يتمكن ڤيداليا من إزالة خدمة تور.\n\nقد تضطر لإزالتها يدوياً."
msgctxt "AppearancePage"
msgid "Language"
@@ -251,10 +237,6 @@ msgid "Show Settings"
msgstr "أظهر الإعدادات"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "استخدام تور لعرض النطاق"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "أعد الضبط"
@@ -294,6 +276,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ألغِ"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "رسم بياني للباندويدث"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "بدء طلب جسر HTTPS..."
@@ -447,19 +433,27 @@ msgid "Control socket is not connected."
msgstr "مقبس التحكم غير متصل."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "كلمة السر مطلوبة"
+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 "إن تور يعمل مسبقاً, ولكن فيداليا لا يستطيع الاتصال به.\nيمكن أن يحدث هذا عندما يكون شيء آخر (كعملية أخرى فعالة من فيداليا, او عملية فيداليا كانت قد واجهت عطلاً فنياً أدى لإغلاقها) قد أقلع تور."
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "تذكر كلمة السر"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "عليك أن تغلق عملية تور قبل أن يستطيع فيداليا فتح واحدة أخرى."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"اتصل ڤيداليا بعملية تور جارية تتطلب كلمة سر. يرجى أن تدخل كلمة سر التحكم:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "يمكن ان يحاول فيداليا بأن يغلق تور من أجلك. إن عمل ذلك سيؤدي إلى إغلاق كل الاتصالات الفعالة حالياً خلال عملية تور الحالية."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1282,6 +1276,24 @@ msgid "Vidalia encountered an error and needed to close"
msgstr "واجه فيداليا خطأ ويحتاج إلى الإغلاق"
msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "تم إعداد تقرير بالعطل، يمكنك إرساله بشكل آلي لمطوري فيداليا للمساعدة في تحديد الخطأ وإصلاحه. التقرير المُرسل لا يحوي أي معلومات تكشف الهوية، ولكن اتصالك بمخدم تقارير الأعطال لن يكون مجهول المصدر"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "ويرجى أيضا وصف ما كنت تفعل قبل إنهيار التطبيق (إجتياري):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "إرسال تقريري إنهيار إلى المطورين فيداليا"
+
+msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
msgstr "إعادة تشغيل فيداليا"
@@ -1299,33 +1311,17 @@ msgid ""
"manually."
msgstr "لم نتمكن من إعادة تشغيل فيداليا تلقائيا. الرجاء إعادة تشغيله يدويا."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "يرجى ملء تذكرة :"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "يتصل..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "يرسل تقرير الانهيار..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"تم كتابة إخطار فشل تستطيع إرساله إلى مبرمجي فيداليا لكي يساعدهم على إيجاد "
-"وحل المشكلة. لا يحتوي على أي معلومات شخصية."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"بوصف لما كنت تفعل قبل فشل البرنامج، مع الملفات الآتية التي تتصل بالإخطار:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "يتلقى الجواب..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1352,10 +1348,6 @@ msgid "Browse"
msgstr "تصفّح"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "ابدأ عمل برمجية تور مع بدء تشغيل ڤيداليا"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "تور"
@@ -1383,6 +1375,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "التمس الآن"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "الاتصال بتور تلقائيا"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 ك.ب/ثا"
@@ -1544,9 +1540,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"يمكن لڤيداليا فتح الرابط الذي حددته في متصفحك المبدئي للإنترنت. إذا لم يكن "
-"متصفحك حاليا مضبوطاً لاستخدام تور فإن هذا الطلب لن يكون سريًا."
+msgstr "يمكن لڤيداليا فتح الرابط الذي حددته في متصفحك المبدئي للإنترنت. إذا لم يكن متصفحك حاليا مضبوطاً لاستخدام تور فإن هذا الطلب لن يكون سريًا."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1560,9 +1554,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"لم يتمكن ڤيداليا من فتح الوصلة المحددة في متصفحك للوب. لا يزال بإمكانك نسخ "
-"المسار ولصقه في متصفحك."
+msgstr "لم يتمكن ڤيداليا من فتح الوصلة المحددة في متصفحك للوب. لا يزال بإمكانك نسخ المسار ولصقه في متصفحك."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1669,34 +1661,6 @@ 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 "تور"
@@ -1705,10 +1669,6 @@ msgid "View"
msgstr "اعرض"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "مساعدة ڤيداليا"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "خطأ في إطلاق متصفح الإنترنت"
@@ -1821,10 +1781,6 @@ msgid "Tor is shutting down"
msgstr "جارٍ إغلاق تور"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "أوقف تور الآن"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "أوقف تور"
@@ -1844,9 +1800,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"تعذَّر على ڤيداليا تشغيل تور. تفحص إعداداتك للتأكد من صحة اسم وموضع ملف تور "
-"التنفيذي."
+msgstr "تعذَّر على ڤيداليا تشغيل تور. تفحص إعداداتك للتأكد من صحة اسم وموضع ملف تور التنفيذي."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1884,9 +1838,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"تطلب برمجية تور من ڤيداليا إرسال محتويات كعكة التصديق ولكن ڤيداليا لم يتمكن "
-"من إيجادها."
+msgstr "تطلب برمجية تور من ڤيداليا إرسال محتويات كعكة التصديق ولكن ڤيداليا لم يتمكن من إيجادها."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1908,21 +1860,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-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 "يرجى التحقق من إعدادات مصادقة مدخل التحكم الخاص بك."
+msgstr "فيداليا لم يتمكن من التسجيل لبعض الأحداث. قد تكون العديد من مزايا فيداليا غير متوفرة."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1932,9 +1870,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"إصدار تور المنصب حالياً قديم أو لاينصح به بعد الآن. يرجى زيارة موقع تور "
-"لتنزيل آخر إصدار."
+msgstr "إصدار تور المنصب حالياً قديم أو لاينصح به بعد الآن. يرجى زيارة موقع تور لتنزيل آخر إصدار."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1967,85 +1903,11 @@ 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 "النسخة المنصبة حالياً من تور قديمة أو لا يوصى بها بعد الآن."
@@ -2093,62 +1955,90 @@ msgstr "حصل الخطأ التالي:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "يبدو أن أحد تطبيقاتك%1a يقوم باتصال قد يكون غير معمى وغير أمين للبوابة %2."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"كل شيء يتم إرساله عن طريق هذا الاتصال تمكن مراقبته، الرجاء التحقق من إعدادات"
-" التطبيق واستخدام بروتوكولات مشفرة فقط، مثل SSL، إن كان هذا ممكناً"
+msgstr "كل ما يتم إرساله عبر هذه الوصلة يمكن مراقبته. يرجى أن تراجع إعدادات تطبيقك واستخدم فقط البروتوكولات المشفرة، مثل SSL إن كان بالإمكان."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "فشل (%1)"
+msgid "toolBar"
+msgstr "شريط الأدوات"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"جار إيقاف تحويلتك.\n"
-"يرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
+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 "الإجراءات"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "يتم تشغيل torrc من %1 إلى %2"
+msgstr "إنشاء torrc من %1 إلى %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"أنت حالياً تشغل تحويلة. إيقاف هذه التحويلة سيقاطع أي اتصالات مفتوحة من العملاء.\n"
-"\n"
-"هل تود إيقاف التحويلة ببطء لإعطاء العملاء وقتاً كافياُ للبحث عن تحويلة جديدة؟"
+msgstr "أنت حالياً تشغل تحويلة. إيقاف هذه التحويلة سيقاطع أي اتصالات مفتوحة من العملاء.\n\nهل تود إيقاف التحويلة ببطء لإعطاء العملاء وقتاً كافياُ للبحث عن تحويلة جديدة؟"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"وجد ڤيداليا أن برمجية تور توقفت عن العمل بشكل مفاجئ.\n"
-"\n"
-"يرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة."
+msgstr "وجد ڤيداليا أن برمجية تور توقفت عن العمل بشكل مفاجئ.\n\nيرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(عميل تلنت على ما يبدو)"
+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 an email client)"
-msgstr "(عميل بريد إلكتروني على ما يبدو)"
+msgid ", probably Telnet,"
+msgstr "، غالباً Telnet، "
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr "، غالباً عميل بريد إلكتروني، "
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "يبدو أن أحد برامجك %1 يتصل بطريقة غير مشفرة ولا آمنة بالمحطة %2."
+"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"
@@ -2403,36 +2293,24 @@ msgid "Automatically save new log messages to a file"
msgstr "احفظ رسائل السجِّل الجديدة في ملف تلقائيًا"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "الأساسية"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "حالة تور"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "متقدم"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "احفظ رسائل السِّجل الجديدة دائما"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr "شريط الأدوات"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"الرسائل التي تظهر عندما يحصل \n"
-"شيء ما بشكل خاطئ جداً ولا يستطيع تور المتابعة."
+msgstr "الرسائل التي تظهر عندما يحصل \nشيء ما بشكل خاطئ جداً ولا يستطيع تور المتابعة."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"الرسائل التي تظهر فقد عندما \n"
-"يحصل شيء خطأ في تور."
+msgstr "الرسائل التي تظهر فقد عندما \nيحصل شيء خطأ في تور."
msgctxt "MessageLog"
msgid ""
@@ -2440,41 +2318,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"الرسائل التي تظهر بشكل قليل \n"
-"أثناء تشغيل تور بشكل طبيعي ولا \n"
-"يعتبرن أخطاء، ولكن يمكن \n"
-"أن يهموك."
+msgstr "الرسائل التي تظهر بشكل قليل \nأثناء تشغيل تور بشكل طبيعي ولا \nيعتبرن أخطاء، ولكن يمكن \nأن يهموك."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"الرسائل التي تظهر بشكر متكرر \n"
-"أثناء تشغيل تور بشكل طبيعي."
+msgstr "الرسائل التي تظهر بشكر متكرر \nأثناء تشغيل تور بشكل طبيعي."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"رسائل مطولة جداً تهم مطوري \n"
-"تور بشكل رئيسي."
+msgstr "رسائل مطولة جداً تهم مطوري \nتور بشكل رئيسي."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"لا يمكن كتابة الملف %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "خريطة شبكة تور"
+msgstr "لا يمكن كتابة الملف %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2576,6 +2439,22 @@ 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 "جسر عاطل"
@@ -2592,9 +2471,7 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"يجب أن تحدد إما عنوان IP أو اسم المضيف ورقم المنفذ لضبط تور لاستخدام وسيط "
-"للوصول إلى الإنترنت."
+msgstr "يجب أن تحدد إما عنوان IP أو اسم المضيف ورقم المنفذ لضبط تور لاستخدام وسيط للوصول إلى الإنترنت."
msgctxt "NetworkPage"
msgid ""
@@ -2654,9 +2531,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"اختر لتشفر طلبات الدليل و -اختيارياً- تستخدم تحويلات الجسور للوصول إلى شبكة "
-"تور"
+msgstr "اختر لتشفر طلبات الدليل و -اختيارياً- تستخدم تحويلات الجسور للوصول إلى شبكة تور"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2694,9 +2569,7 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"لا توجد جسور جديدة حالياً. يمكنك أن تنتظر قليلاً وتحاول مرة أخرى، أو أن تجرب"
-" أسلوباً آخر لإيجاد جسور جديدة."
+msgstr "لا توجد جسور جديدة حالياً. يمكنك أن تنتظر قليلاً وتحاول مرة أخرى، أو أن تجرب أسلوباً آخر لإيجاد جسور جديدة."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2886,9 +2759,7 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"يجب أن تضبط إعدادات تور ليتصرف على أنه تحويلة جسر للمستخدمين المحجوبين، ولكن"
-" نسخة تور الخاصة بك لا تدعم الجسور."
+msgstr "يجب أن تضبط إعدادات تور ليتصرف على أنه تحويلة جسر للمستخدمين المحجوبين، ولكن نسخة تور الخاصة بك لا تدعم الجسور."
msgctxt "ServerPage"
msgid ""
@@ -2909,10 +2780,6 @@ msgid "Run as a client only"
msgstr "تشغيل كعميل فقط."
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "تمرير تدفقات شبكة تور"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "مدخل التحويلة:"
@@ -2964,9 +2831,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"لوصلات الإنترنت ذات سرعة التنزيل الكبيرة وسرعة رفع صغيرة، يرجى ذكر سرعة "
-"الرفع المتاحة هنا."
+msgstr "لوصلات الإنترنت ذات سرعة التنزيل الكبيرة وسرعة رفع صغيرة، يرجى ذكر سرعة الرفع المتاحة هنا."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3024,9 +2889,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"يجب أن يكون أكبر معدل عرض حزمة مساوياً أو أكبر من المعدل الوسطي لعرض الحزمة؛"
-" و كلا القيمتين يجب أن تكونا 20 ك.بايت/ثا على الأقل."
+msgstr "يجب أن يكون أكبر معدل عرض حزمة مساوياً أو أكبر من المعدل الوسطي لعرض الحزمة؛ و كلا القيمتين يجب أن تكونا 20 ك.بايت/ثا على الأقل."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3087,17 +2950,13 @@ msgstr "عرض موضوع المساعدة حول سياسات المخرج"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"ما هي موارد الإنترنت التي يجب أن يتمكن المستخدمون من الوصول إليها من "
-"تحويلتك؟"
+msgstr "ما هي موارد الإنترنت التي يجب أن يتمكن المستخدمون من الوصول إليها من تحويلتك؟"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"تور سيستمر بحجب بعض تطبيقات البريد الصادر وتشارك الملفات بشكل تلقائي للتخفيف"
-" من السخام (spam) وإساءات الاستخدام الأخرى."
+msgstr "تور سيستمر بحجب بعض تطبيقات البريد الصادر وتشارك الملفات بشكل تلقائي للتخفيف من السخام (spam) وإساءات الاستخدام الأخرى."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3128,8 +2987,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"اترك تحويلتك فاعلة كي يكون لدى العملاء فرصة أكبر في العثور عليها واستخدامها."
+msgstr "اترك تحويلتك فاعلة كي يكون لدى العملاء فرصة أكبر في العثور عليها واستخدامها."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3143,8 +3001,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"أعاد تور استجابة منسقة بشكل غير مناسب عندما طلب ڤيداليا تاريخ استخدام جسرك."
+msgstr "أعاد تور استجابة منسقة بشكل غير مناسب عندما طلب ڤيداليا تاريخ استخدام جسرك."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3167,6 +3024,14 @@ 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) دليل التحويلات"
@@ -3174,9 +3039,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"عنوان البريد الذي يمكن الاتصال بك عبره في حال وجدت\n"
-"مشكلة في تحويلتك. يمكنك أيضاً تضمين بصمة PGP أو GPG الخاصة بك."
+msgstr "عنوان البريد الذي يمكن الاتصال بك عبره في حال وجدت\nمشكلة في تحويلتك. يمكنك أيضاً تضمين بصمة PGP أو GPG الخاصة بك."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3186,9 +3049,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"يرجى ضبط خدمة الدليل ومدخل افتراضي على الأقل لكل خدمة تريد حفظها. احذف "
-"الآخرين."
+msgstr "يرجى ضبط خدمة الدليل ومدخل افتراضي على الأقل لكل خدمة تريد حفظها. احذف الآخرين."
msgctxt "ServicePage"
msgid "Error"
@@ -3215,10 +3076,6 @@ msgid "Directory already in use by another service."
msgstr "الدليل مستعمل بشكل مسبق في خدمة أخرى"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "استمارة"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "الخدمات الموفرة المخفية"
@@ -3283,10 +3140,7 @@ msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"اضغط زر \"ابدأ Tor\" في لوحة تحكم Vialia لإعادة تشغيل برنامج Tor. إن تم "
-"إغلاق Tor بشكل غير متوقع، انتقل إلى تبويب \"الخيارات المتقدمة\" في الأعلى "
-"لمعرفة تفاصيل عن الخطأ الحاصل."
+msgstr "إضغط \"بدء تور\" في لوحة تحكم فيداليا لإعادة تشغيل تور. إن توقف تور عن العمل بشكل غير متوقع، اختر الصفحة \"متقدم\" أعلاه لتفاصيل حول الأخطاء التي تمت مواجهتها."
msgctxt "StatusEventWidget"
msgid ""
@@ -3294,10 +3148,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"أنت الآن تستخدم النسخة \"%1\" من برنامج Tor وهي نسخة لم يعد استخدامها "
-"مستحسناً. الرجاء التحديث لآخر نسخة من البرنامج فقد توجد فيها إصلاحات أمنية "
-"هامة وإصلاحات لضمان الوثوقية وإصلاحات في الإداء."
+msgstr "تقوم أنت حالياً باستخدام النسخة \"%1\" من التطبيق تور، وهي غير منصوح بها حالياً. الرجاء قم بالتحديث للنسخة الأحدث، والتي يمكن أن تحوي إصلاحات مهمة، أمنية أو للوثوقية أو في سرعة الأداء."
msgctxt "StatusEventWidget"
msgid ""
@@ -3305,10 +3156,7 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"أنت الآن على إصدار \"%1\" من التور, والذي قد لا يعمل مع الشبكة التورية "
-"الحالية. رجاءً طوره إلى آخر نسخ، والتي قد تحتوي على إصلاحات مهمة في الأمن "
-"والكفائة."
+msgstr "تقوم أنت حالياً باستخدام النسخة \"%1\" من التطبيق تور، والتي يمكن أن لا تعمل مع شبكة تور الحالية. الرجاء قم بالتحديث للنسخة الأحدث، والتي يمكن أن تحوي إصلاحات مهمة، أمنية أو للوثوقية أو في سرعة الأداء."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
@@ -3322,8 +3170,7 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"نجح الاتصال بشبكة تور. يمكنك الآن ضبط تطبيقاتك لتستخدم الإنترنت بسرية."
+msgstr "نجح الاتصال بشبكة تور. يمكنك الآن ضبط تطبيقاتك لتستخدم الإنترنت بسرية."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
@@ -3333,9 +3180,7 @@ msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"أعاق البرنامج خلل داخلي. رجاءً أبلغ مبرمجي \"تور\" عن الخلل التالي على "
-"bugs.torproject.org: \"%1\""
+msgstr "واجه تطبيق تور خطأ داخلي. الرجاء إرسال رسالة الخطأ التالية لمطوري تور في bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3343,10 +3188,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"يظن تور أن ساعة حاسبك الآلي أخرت %1 ثانية عن الأصل \"%2\". لو لم تكن ساعتك "
-"مضبوطة، لن يستطيع تور العمل بشكل سليم. رجاءً تأكد من صحة الوفت الذي يظهره "
-"حاسبك."
+msgstr "وجد تور أن ساعة حاسبك مبكرة بـ%1 ثوان عن المصدر %2. إن كانت ساعتك غير صحيحة، لن يتمكن تور من العمل. تأكد أن حاسبك يعرض الوقت الصحيح."
msgctxt "StatusEventWidget"
msgid ""
@@ -3354,10 +3196,7 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"يظن تور أن ساعة حاسبك الآلي قدمت %1 ثانية عن الأصل \"%2\". لو لم تكن ساعتك "
-"مضبوطة، لن يستطيع تور العمل بشكل سليم. رجاءً تأكد من صحة الوفت الذي يظهره "
-"حاسبك."
+msgstr "وجد تور أن ساعة حاسبك متقدمة بـ%1 ثوان مقارنة مع المصدر \"%2\". إن كانت ساعتك غير صحيحة، لن يتمكن تور من العمل. الرجاء التأكد أن حاسبك يعرض الساعة بشكل صحيح."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3369,19 +3208,14 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"أظن أن أحد البرامج التي على حاسبك حاول أن يتصل بلا تشفير من المحطة %1. إرسال"
-" معلومات غير مشفرة من خلال الشبكة التورية خطر ولا ينصح به. لأجل حمايتك، أغلق"
-" تور الإتصال ذاتيا."
+msgstr "يحاول أحد التطبيقات على حاسبك القيام باتصال غير معمى عن طريق بوابة تور %1. إرسال بيانات غير معماة عبر شبكة تور هو شيء خطير وغير منصوح به. لحمايتك، قام تور بإغلاق هذا الاتصال بشكل آلي."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"أظن أن أحد البرامج التي على حاسبك حاول أن يتصل بلا تشفير من المحطة %1. إرسال"
-" معلومات غير مشفرة من خلال الشبكة التورية خطر ولا ينصح به."
+msgstr "قد يكون أحد التطبيقات على حاسبك قد حال القيام باتصال غير معمى عبر بوابة تور %1. إرسال معلومات غير معماة عبر شبكة تور هو شيء خطير وغير منصوح به."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3393,10 +3227,7 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-" أحد برامجك اتصل بـ%1 من خلال تور باستخدام بروتوكول قد يسرب بعض المعلومات عن"
-" اتجاهك. رجاءً تأكد من ترتيب برامجك لاستخدام الـSocks4a أو الSocks5ـ لا غير "
-"حسن الاتصال بمستضفين غير محلين."
+msgstr "قام أحد تطبيقاتك بإنشاء اتصال عبر تور إلى \"%1\" باستخدام بروتوكول قد يسرب معلومات عن وجهتك. الرجاء التأكد من إعداد تطبيقك بحيث يستخدم SOCKS4a أو SOCKS5 مع تحديد اسم بعيد."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
@@ -3407,9 +3238,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-" حاول أحد برامجك أن يتصل ببروتركول لا يفهمه تور. رجاءً تأكد من ترتيب برامجك "
-"لاستخدام الـSocks4a أو الSocks5ـ لا غير حسن الاتصال بمستضفين غير محلين."
+msgstr "حاول أحد تطبيقاتك إنشاء اتصال عبر تور باستخدام بروتوكول لا يفهمه تور. الرجاء التأكد من إعداد تطبيقك بحيث يستخدم SOCKS4a أو SOCKS5 مع تحديد اسم بعيد."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
@@ -3420,9 +3249,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"حاول أحد برامجك أن يتصل بـ%1، والذي لا يعتبره تور مستضيف ممكن. رجاءً تحقق من"
-" إعداد برنامجك."
+msgstr "أحد البرامج حاول الاتصال بتور عبر \"%1\" و الذي لا يعتبره تور اسم نطاق صحيح. يرجى التأكد من اعدادات هذا البرنامج."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
@@ -3433,58 +3260,48 @@ msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"حدد تور أن عنوان الآي بي الخاص بمرحلك هو %1%2. لو لم يكن هذا صحيحا، رجاءً "
-"فكر في تغيير خيار الـ\"عنوان\" على مرحلك."
+msgstr "يتبين لدى تور ان عنوان الانترنت لمنفذك العام هو %1%2 . اذا لم يكن هذا صحيحاً يرجى إدخال العنوان بإعدادات منفذ التحويل لديك."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "تم كشف احتلال دي إن إس."
+msgstr "تم اكتشاف محاولة تزوير لسجل النطاقات"
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"اكتقف تور أن مقدم الدي إن إس الخاص بك يقدم إجابات كاذبة للمواقع غير "
-"الموجودة. بعض مقدمي خدمة الإنترنت و مقدمي الدي إن إس الآخرين، مثلا (أوبن دي "
-"إن إس)، مشهورين بفعل هذا لكي يعرضوا صفحات الإعلان أو البحث الخاضة بهم. "
+msgstr "قام تور باكتشاف ان مزود خدمة اسماء النطاقات لديك يقدم إجابات خاطئة لنطاقات غير موجودة. بعض مزودي الخدمة يقومون بهذا لنشر الاعلانات أو خدمات البحث لديهم."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-" اكتشف تور أن مقدم خدمة الدي إن إس الخاص بك يقدم إجابات كاذبة لمواقع مشهورة."
-" بما أن العملاء تعتمد على مراحل شبكة تور لأجل الحصول على إجابات دي إن إس "
-"دقيقة، لن يتم استعمال مرحلك كمخرج. "
+msgstr "قام تور باكتشاف ان مزود خدمة اسماء النطاقات لديك يقدم إجابات خاطئة لنطاقات معروفة. بما مستخدمي تور يعتمدون على الشبكة لتقديم معلومات صحيحة عن النطاقات، إذاً لا يمكن ضبط منفذك كنقطة خروج لشبكة تور."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "القدرة على الوصول لمحطات الخادم قيد التحقق."
+msgstr "يتم التأكد من امكانية الوصول إلى منفذ الخادم"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"يحاول تور أن يحدد إذا كان من الممكن الاتصال بخادمك المرحل من قبل شبكة تور "
-"باستخدام الاتصال بنفسه على %1:%2. يمكن أن يأخد هذا الاختبار أكثر من دقيقة. "
+msgstr "شبكة تور تحاول التأكد من امكانية الوصول لمنفذ نقطة تحوبلك بتور عن طريق الاتصال بنفسها على %1:%2 . هذا الاختبار قد يأخذ بضع دقائق."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "نجح اختبار القدرة على الوصول لمحطات الخادم!"
+msgstr "تم التأكد من امكانية الوصول إلى منفذ الخادم بنجاح"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "يمكن شبكة تور الآن الوصول إلى مرحل محطة خادمك!"
+msgstr "منفذ نقطة التحويل لديك يمكن الاتصال بها من داخل شبكة تور"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "فشل اختبار القدرة على الوصول لمحطات الخادم."
+msgstr "فشلت محاولة الوصول إلى منفذ الخادم"
msgctxt "StatusEventWidget"
msgid ""
@@ -3492,36 +3309,30 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"منفذ المخدم الخاص بك للترحيل غير قابلة للوصول من قبل عملاء آخرين . يمكن أن "
-"يحدث هذا إذا كنت خلف جهاز التوجيه أو جدار الحماية الذي يتطلب منك إنشاء ميناء"
-" الشحن.إذا كان%1:%2 ليست عنوان الإنترنت الخاص بك والدليل المنفذ الصحيح، "
-"الرجاء التحقق من تكوين المبدلات لديك."
+msgstr "منفذ نقطة التحويل لا يمكن الاتصال بها من النقاط الأخرى بشبكة تور. يمكن لهذا أن يحدث اذا كنت متصل عبر راوتر أو جدار ناري. اذا لم يكن %1:%2 هو عنوان و منفذ الانترنت الخاص بك، يرجى مراجعة إعدادات نقطة التحويل لديك."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "القدرة على الوصول إلى محطة المجلد قيد التحقيق."
+msgstr "يتم التأكد من امكانية الوصول لمنفذ خدمة الدليل"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"تور يحاول تحديد ما إذا كان منفذ الدليل الخاص بك المبدل قابل للوصول من شبكة "
-"تور بالاتصال بحد ذاته في%1:%2. هذا الاختبار يمكن أن يستغرق عدة دقائق."
+msgstr "شبكة تور تحاول التأكد من امكانية الوصول لمنفذ خدمة الدليل لديك عن طريق الاتصال بنفسها على %1:%2 . هذا الاختبار قد يستغرق عدة دقائق."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "نجح اختبار القدرة على الوصول لمحطات المجلد!"
+msgstr "تم التأكد من الاتصال بمنفذ خدمة الدليل لديك بنجاح."
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "منفذ دليل المبدل الخاص بك قابل للوصول من شبكة تور!"
+msgstr "منفذ خدمة الدليل لديك قابل للاتصال من داخل شبكة تور."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "فشل اختبار القدرة على الوصول لمحطات المجلد."
+msgstr "فشلت محاولة الاتصال بمنفذ خدمة الدليل لديك"
msgctxt "StatusEventWidget"
msgid ""
@@ -3529,23 +3340,17 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"منفذ الدليل الخاص بك للتبيل غير قابل للوصول بعملاء آخرين . يمكن أن يحدث هذا "
-"إذا كنت خلف جهاز التوجيه أو جدار الحماية الذي يتطلب منك إنشا منفذ مرجع .إذا "
-"كان%1:%2 ليستعنوان الإنترنت الخاص بك والدليل المنفذ الصحيح، الرجاء التحقق من"
-" تكوين المبدلات لديك."
+msgstr "منفذ خدمة الدليل لديك لا يمكن الاتصال به من النقاط الأخرى بشبكة تور. يمكن لهذا أن يحدث اذا كنت متصل عبر راوتر أو جدار ناري. اذا لم يكن %1:%2 هو عنوان و منفذ الانترنت الخاص بك، يرجى مراجعة إعدادات نقطة التحويل لديك."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "مشخص التبديل قد رفض"
+msgstr "تم رفض وصف نقطة التحويل"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"مشخص المبدل الخاص بك، الذي يمكن العملاء من الاتصال بالمبدل الخاص بك ، رفضه "
-"ملقم الدليل في%1:%2. والسبب:%3"
+msgstr "وصف نقطة التحويل لديك، و الذي يمكن المستخدمين من الاتصال بنقطة تحويلك، تم رفضه من خدمة الدليل على %1:%2 . السبب هو %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
@@ -3557,11 +3362,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"المبدل الخاص بك الآن على الإنترنت ومتاح لعملاء تور ليستخدموه. يجب أن تشاهد "
-"زيادة في حركة مرور شبكة الاتصال التي أبدته Bandwidth Graph في غضون ساعات "
-"قليلة كما علم المزيد من العملاء عن المبدل الخاص بك. شكرا لك على المساهمة في "
-"شبكة تور!"
+msgstr "منفذ التحويل لديك الآن متصل و متوفر لمستخدمي تور. ستلاحظ ارتفاعاً في استهلاك الشبكة مع مرور الوقت بعد أن يقوم المستخدمون باكتشاف نقطة التحويل لديك."
+
+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"
@@ -3599,6 +3416,12 @@ 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]"
@@ -3617,15 +3440,13 @@ msgstr "فشل في حل كلمة سر التحكم."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "تحرير ملف الإعدادات"
+msgstr "تحرير torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"احفظ الإعدادات. إن لم يكن هذا الخيار مُعلّما، ستطبق الإعدادات على تور هذه "
-"المرة فقط."
+msgstr "حفظ الإعدادات. إذا لم تفعل سوف تنطبق فقط نسخة تور الحالية "
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3661,15 +3482,15 @@ msgstr "طبّق المحدد فقط"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "حدث خلل أثناء محاولة الاتصال بتور"
+msgstr "خطأ في الاتصال بتور"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "اختيار فارغ. الرجاء حدد بعض من النص، أو اختر \"تطبيق الكل\""
+msgstr "الاختيار فارغ. اختر جزء من النص أو اضغط على اختيار الكل."
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "خلل في سطر %1: \"%2\""
+msgstr "خطأ بالسطر %1: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
@@ -3677,7 +3498,31 @@ msgstr "خطأ"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "حدث خلل أثناء فتح ملف الإعدادات."
+msgstr "حصل خطأ أثناء محاولة فتح ملف torrc"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "CTRL + X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "CTRL + C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "CTRL + V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "CTRL + Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "على Ctrl + Shift + Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "CTRL + A"
msgctxt "UPNPControl"
msgid "Success"
@@ -3739,17 +3584,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"لم يتمكن ڤيداليا من التحقق من وجود تحديثات للبرنامج لأنه لم يتمكن من إيجاد "
-"'%1'."
+msgstr "لم يتمكن ڤيداليا من التحقق من وجود تحديثات للبرنامج لأنه لم يتمكن من إيجاد '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"لم يتمكن ڤيداليا من التحقق من وجود تحديثات للبرنامج لأن عملية تحديث تور "
-"أغلقت بشكل غير متوقع."
+msgstr "لم يتمكن ڤيداليا من التحقق من وجود تحديثات للبرنامج لأن عملية تحديث تور أغلقت بشكل غير متوقع."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3811,6 +3652,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "إصدار"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "إرسال تقرير إنهيار"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "لا يمكن ارسال تقرير إنهيار: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "موافق"
@@ -3904,10 +3753,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "تعذَّر فتح ملف السِّجل '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "القيمة المطلوبة للمعطى"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "كود اللغة المحدد غير صحيح:"
@@ -3924,10 +3769,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"إحتمال وجود نسخة أخرى من ڤيداليا تعمل مسبقاً. إذا كان فعلاً لاتوجد نسخة أخرى تعمل، يمكن إختيار المتابعة على أي حال.\n"
-"\n"
-"هل تريد مواصلة بدء ڤيداليا؟"
+msgstr "إحتمال وجود نسخة أخرى من ڤيداليا تعمل مسبقاً. إذا كان فعلاً لاتوجد نسخة أخرى تعمل، يمكن إختيار المتابعة على أي حال.\n\nهل تريد مواصلة بدء ڤيداليا؟"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3960,5 +3802,3 @@ 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 49acc44..5e975be 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 1ce565f..b93bc21 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 7f2db5c..f1a9ee6 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 ffcd9b8..11ce05a 100644
--- a/src/vidalia/i18n/po/bg/vidalia_bg.po
+++ b/src/vidalia/i18n/po/bg/vidalia_bg.po
@@ -1,14 +1,13 @@
#
# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
-# <svilen79 at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-12-28 16:26+0000\n"
-"Last-Translator: raymen <svilen79 at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +22,7 @@ msgstr "Относно Видалия"
msgctxt "AboutDialog"
msgid "License"
-msgstr "Лиценз"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
@@ -31,7 +30,7 @@ msgstr "Видалия 0.2.0"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
@@ -39,14 +38,12 @@ msgstr "4.4.2"
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' не е валиден IP адрес."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"Вие избрахте удостоверяване чрез \"Парола\", но не сте упоменали изрично "
-"някаква парола."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -70,23 +67,23 @@ msgstr "Невъзможност за създаване на %1 [%2]"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Изберете Директория, която да бъде използвана за Тор данни"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Невъзможно да премахне Тор услуги"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Невъзможно да инсталира Тор услуги"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Видалия не можа да инсталира Тор услуги."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Удостоверяване:"
+msgstr "Автентикация:"
msgctxt "AdvancedPage"
msgid "Address:"
@@ -94,7 +91,7 @@ msgstr "Адрес:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Нищо"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -110,7 +107,7 @@ msgstr "Случайно генериране"
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
@@ -130,85 +127,71 @@ msgstr "Разлистване"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Директория за данни"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Съхранете данни за Тор софтуеъра в следната директория"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-"Изберете директорията, използвана за съхранение на данни за Тор софтуеъра. "
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Контрол на Тор"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Използвай ТиСиПи връзка (КонтроленПорт)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Път:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Използвай Юникс домейн сокет (КонтроленСокет)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Вкарай настоящите конфигурационни данни в torrc файл"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
msgstr ""
-"БЕЛЕЖКА: това ще редактира заредения в момента конфигурационен torrc файл"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "Пътят към КонтроленСокет не съществува."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
-"Упоменатото място на Тор конфигурационния файл съдържа символи, които не "
-"могат да бъдат представени в момента, чрез 8-битовото символно разкодиране "
-"на системата Ви."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
-"Упоменатото място на Тор директорията за данни съдържа символи, които не "
-"могат да бъдат представени в момента, чрез 8-битовото символно разкодиране "
-"на системата Ви. "
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Внимание"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
msgstr ""
-"Вие променихте пътя на конфигурационния torrc файл, желаете ли да "
-"рестартирате Тор?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Тор конфигурационен файл (torrc);;All Files (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Избери файл за ползване, за пътя на Тор сокета"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Автоматично настройване на КонтролнияПорт"
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -216,9 +199,6 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
-"Видалия не можа да премахне Тор услугите.\n"
-"\n"
-"Ще Ви се наложи да ги премахнете самостоятелно."
msgctxt "AppearancePage"
msgid "Language"
@@ -238,7 +218,7 @@ msgstr "Избери интерфейсен стил на Видалиа"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Видалия не успя да зареди избраният езиков пакет."
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -253,10 +233,6 @@ msgid "Show Settings"
msgstr "Покажи опции"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Използван трафик от Тор"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Ресет"
@@ -296,9 +272,13 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отказ"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Стартиране на заявка за HTTPS мост-свързаност..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -306,44 +286,43 @@ msgstr "Свързване с %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Изпращане на HTTPS заявка за мост-свързване..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Сваляне на списък с мостове..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Сваляне на Мостове"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Невъзможно да свали мостове: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Повторна заявка за мостове..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Страна"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Клиенти"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
msgstr ""
-"Клиенти от следните страни са се възползвали от твоето препредаване от %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Извлечение за Мостово Използване"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Клиентско извлечение"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -383,15 +362,15 @@ msgstr "Статистика"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Приближаване до Веригата"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Затваряне на Веригата (Изтриване)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Затваряне на потока с данни (Изтриване)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
@@ -399,15 +378,15 @@ msgstr "Главни"
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Мрежа"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Споделяне"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Услуги"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
@@ -423,19 +402,19 @@ msgstr "Помощ"
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Грешка при съхранението на настройки"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Видалия нямаше възможност да съхрани твоите %1 настройки"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Грешка при прилагането на настройките"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Видалия нямаше възможност да приложи твоите %1 настройки за Тор"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
@@ -443,31 +422,38 @@ msgstr "Опции"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Видалия нямаше възможност да се свърже с Тор. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Контролното реле не е свързано."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Необходима е парола"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Запомни моята парола"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
-"Видалия се свърза с активен Тор процес който изисква парола.\n"
-"Моля, въведете Вашата контролна парола:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Контролното реле не е свързано."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
@@ -483,207 +469,207 @@ msgstr "Грешен контролен отговор. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Афганистан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Андора"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Ангола"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Анти́гуа и Барбу́да"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Аржентина"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Армения"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Австралия"
+msgstr "Относно Видала"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Азарбейджан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Бахамски острови"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Бангладеш"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Барбадос"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Беларус"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Белгия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Белиз"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Бутан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Боливия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Босна и Херцеговина"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Ботсвана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Бразилия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Дом на мира Бруней"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "България"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Буркина Фасо"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Бурунди"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Камбоджа"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Камерун"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Канада"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Кабо Верде"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Централноафриканска република"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Чад"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Чили"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Китай"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Колумбия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Коморски острови"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Демократична република Конго"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Република Конго"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Коста Рика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Кот д'Ивоар"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Хърватия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Куба"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Кипър"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Чешка република"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Кралство Дания"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Република Джибути"
+msgstr "Относно"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Съюз Доминика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Доминиканска република"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Еквадор"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Египет"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "Ел Салвадор"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Република Екваториална Гвинея"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Еритрея"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Естония"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
@@ -691,651 +677,647 @@ msgstr "Отказ"
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Габон"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Гамбия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Грузия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Германия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Гана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Гренада"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Гватемала"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Гвинея"
+msgstr "Главни"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Гвинея-Бисау"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Гвиана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Хонконг"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Хаити"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Хондурас"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Израел"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Италия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Ямайка"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Япония"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Йордания"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Казахстан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Кения"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Кирибати"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Кувейт"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Киргизстан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Лаос"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Латвия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Либия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Лесото"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Либерия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Лихтенщайн"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Литва"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Люксембург"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Македония"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Мадагаскар"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Малави"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Малайзия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Мали"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Малта"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Маршалови острови"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Мавритания"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Мавриций"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Микронезия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Молдова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Монако"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Монголия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Черна Гора"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Мароко"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Мозамбик"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Намибия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Науру"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Непал"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Нидерландия"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Нова Зеландия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Никарагуа"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Нигер"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Нигерия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Норвегия"
+msgstr "Напред"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Оман"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Пакистан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Палау"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Палестина"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Панама"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Папуа-Нова Гвинея"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Парагвай"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Перу"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Филипини"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Полша"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Португалия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Катар"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Румъния"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Русия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Руанда"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Сент Китс и Невис"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Сейнт Лусия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Сейнт Винсент и Гренадини"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Самоа"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "Сан Марино"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Сао Томе и Принсипи"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Саудитска Арабия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Сенегал"
+msgstr "Главни"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Сърбия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Сейшелски острови"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Сиера Леоне"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Сингапур"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Словакия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Словения"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Соломонови острови"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Сомалия"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Южна Африка"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Испания"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Шри Ланка"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Судан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Суринам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Свазиленд"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Швеция"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Швейцария"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Сирия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Таджикистан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Танзания"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Тайланд"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Тимор (Източен Тимор)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Того"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Тонга"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Тринидад и Тобаго"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Тунис"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Турция"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Туркменистан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Тувалу"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Уганда"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Украйна"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Обединени арабски емирства"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Обединено кралство Великобритания"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Съединени американски щати"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Уругвай"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Узбекистан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Вануату"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Ватикана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Венецуела"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Виетнам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Западна Сахара"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Йемен"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Замбия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Зимбабве"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Заир"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Албания"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Алжир"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Австрия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Бахрейн"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Бенин"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Етиопия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Фиджи"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Финландия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Гърция"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Гуам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Унгария"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Исландия"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "Индия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Индонезия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Иран"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Ирак"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Ирландия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Северна Корея"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Южна Корея"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Либия"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Малдиви"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Мексико"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Мианмар"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Тайван"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Предоставяне на отчет за пораженията"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Видалия се сблъска с грешка и се наложи да бъде затворена"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Рестартирай Видалия"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Не рестартирай"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Невъзможност да рестартира Видалия"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
-"Нямаше възможност да рестартираме Видалия автоматично. Моля, рестартирайте "
-"Видалия самостоятелно."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Моля, попълнете квитанция в:"
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
msgstr ""
-"Създаден бе доклад за претърпяно поражение, който може да изпратите на "
-"развойчиците на Видалия, за да им помогнете да идентифицират и поправят "
-"проблема. Приложеният доклад не съдържа никаква Ваша персонална "
-"идентифицираща информация. "
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
-"с описание на какво сте правили преди програмата да претърпи поражение, "
-"заедно със следните файлове, съответствуващи на доклада за претърпяно "
-"поражение:"
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1347,51 +1329,51 @@ msgstr "Избери път до Тор"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Избери изпълнимо прокси"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Трябва да конкретизирате името на Вашия Тор изпълним файл"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Стартирай Видалия когато моята операционна система стартира"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
msgstr "Разлистване"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Стартирай Тор софтуеъра когато стартира Видалия"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Тор"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Прокси приложение (по избор)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Стартирай прокси приложение когато стартира Тор"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Стойности на Прокси приложението:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Софтуеърно обновление"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Проверявай автоматично за нови софтуеърни обновления"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Провери сега"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1411,11 +1393,11 @@ msgstr "%1 ГБ"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Получен:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Изпратен:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1515,7 +1497,7 @@ msgstr "Намери Следващ"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Чувствителен в случай на големи и малки букви"
+msgstr "Case sensitive"
msgctxt "HelpBrowser"
msgid "Whole words only"
@@ -1523,7 +1505,7 @@ msgstr "Само цели думи"
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Помощни Теми"
+msgstr "Помощ Теми"
msgctxt "HelpBrowser"
msgid "Contents"
@@ -1535,7 +1517,7 @@ msgstr "Търси"
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Търсене за:"
+msgstr "Търси за:"
msgctxt "HelpBrowser"
msgid "Found Documents"
@@ -1543,11 +1525,11 @@ msgstr "Намерени Документи"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Грешка при зареждане на помощното съдържание:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Отваряне на външна връзка"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1555,41 +1537,36 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Видалия може да отвори избраната връзка в браузъра Ви по подразбиране. Ако "
-"браузъра Ви не е конфигуриран в момента да използва Тор, то тогава заявката "
-"няма да бъде анонимна."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Искате ли Видалия да отвори връзката във Вашият уеб браузър?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Невъзможно е отварянето на връзката"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Видалия не можа да отвори избраната връзка във Вашият уеб браузър. Вие "
-"можете все пак да копирате URL адреса и да го поставите във Вашия браузър."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Грешка при отварянето на помощния файл:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Информация за лиценза"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Лиценз"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Заслуги"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
@@ -1617,31 +1594,31 @@ msgstr "Незнайно"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Отстраняване на дефекти"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Информация"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Бележка"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Внимание"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Грешка"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Непознат"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Стартирай Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
@@ -1661,7 +1638,7 @@ msgstr "Карта Мрежа"
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Контролен панел"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
@@ -1680,34 +1657,6 @@ 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 "Тор"
@@ -1716,136 +1665,128 @@ msgid "View"
msgstr "Изглед"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Видалия Помощ"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Грешка при стартирането на уеб браузъра"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Видалия не можа да стартира настроения уеб браузър"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Грешка при стартирането на IM клиента"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Видалия не можа да стартира настроения IM клиент"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Грешка при стартирането на прокси сървъра"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Видалия не можа да стартира настроения прокси сървър"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Свързване с препредаващата директория"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Осъществяване на връзка с криптираната директория"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Получаване на информация за статуса на мрежата"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Зареждане на информацията за статуса на мрежата"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Зареждане на сертификати от достоверен източник"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Запитване за препредаваща информация"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Зареждане на препредаваща информация"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Свързване с Тор мрежата"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Осъществяване на Тор верига"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Свързан с Тор мрежата!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Неразпознат начален статус"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "разнороден"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "несъвпадение с идентичност"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "готов"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "връзката отказана"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "пауза на връзката"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "грешка при четене/писане"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "няма път до хоста"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "недостатъчно ресурси"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "непознат"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Тор не тръгва"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Тор се изключва"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Спри Тор сега"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Спри Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Стартиране на Тор софтуеъра"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Стартиране на Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
@@ -1855,234 +1796,132 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Видалиа не успя да стартира Тор. Проверете опциите си за да проверите дали е"
-" зададено правилно местоположението на Тор."
+msgstr "Видалиа не успя да стартира Тор. Проверете опциите си за да проверите дали е зададено правилно местоположението на Тор."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Свързване с Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Грешка при свързването"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Препредаването е включено"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Грешка при изключването"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Видалия не можа да спре Тор софтуеъра"
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Неочаквана грешка"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Удостоверявам истинността към Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Необходимост от бисквитка за удостоверяване на истинността"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"Тор софтуеърът изисква Видалия да изпрати съдържанието на бисквитката за "
-"автентичност, но Видалия не можа да открие такава."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
-"Бихте ли желали да потърсите самостоятелно файла 'control_auth_cookie' ?"
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Директория за данни"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Контролна бисквитка (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Грешка при регистрацията за събития"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Видалия не можа да регистрира за някои събития. Много от опцийте на Видалия "
-"може да не са достъпни."
-
-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 "Налично е обновление за Тор"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"Понастоящем инсталираната Тор версия не е актуална или не се препоръчва. "
-"Моля, посетете страницата на Тор за да свалите най-последната версия."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "страница на Тор: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr "Всички последващи връзки ще изглеждат различни от старите Ви връзки."
+msgstr "Всички последващи връзки ще изглеждат различни от старите ви връзки."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Неуспех при създаване на нова самоличност"
+msgstr "Неуспех при създаване на Нова Самоличност"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Пренасочването на портове пропадна"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Видалия не можа да настрои автоматичното пренасочване на портове."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Контролен панел на Видалия"
+msgstr ""
msgctxt "MainWindow"
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 "Скрий този прозорец"
+msgstr "Статистика"
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Неуспешно нулиране на паролата"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
msgstr ""
-"Видалия опита да нулира контролната парола на Тор, но не успя да рестартира "
-"Тор софтуеъра. Моля, проверете в Диспечер на задачите за да се подсигурите, "
-"че няма други активни Тор процеси. "
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"Понастоящем инсталираната версия на Тор е остаряла или не се препоръчва "
-"повече."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
msgstr ""
-"Бихте ли желали да проверите за наличие на по-нов инсталационен пакет?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Потенциално несигурна връзка"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"Тор автоматично затвори връзката, с оглед на това да предпази Вашата "
-"анонимност."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2090,19 +1929,17 @@ msgstr "Провалени"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Вашият софтуеър е актуален"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"На този момент няма нови софтуеърни пакети от Тор за инсталиране на "
-"компютъра Ви."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Инсталацията се провали"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
@@ -2110,7 +1947,13 @@ msgstr "Видалиа не успя да регистрира Тор лог с
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Появи се следната грешка:"
+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 ""
@@ -2118,25 +1961,34 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"Каквото и да е изпратено по тази връзка може да бъде следено. Моля, провери "
-"настройките на програмата и ползвай ако е възможно само криптирани "
-"протоколи, като SSH."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "пропаднал (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"Препредаването Ви се изключва.\n"
-"Натиснете 'Стоп' отново за да спрете препредаването сега."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Начално стартиране на torrc от %1 до %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2144,9 +1996,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Препредаването е активно. Прекъсването на препредаването ще пресече отворените връзки от клиенти.\n"
-"\n"
-"Бихте ли желали да се изключите елегантно, като им дадете време да намерят ново препредаване?"
msgctxt "MainWindow"
msgid ""
@@ -2154,25 +2003,38 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Видалия засече, че Тор софтуеъра излезе неочаквано.\n"
-"\n"
-"Моля, проверете съобщенията с данните за скорошни предупредителни съобщения или съобщения за грешки."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероятно Телнет)"
+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 "(probably an email client)"
-msgstr "(вероятно Е-мейл потребител)"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 ""
-"Едно от вашите приложения %1 изглежда извършва потенциално некриптирани и "
-"несигурни връзки с порт %2"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2192,13 +2054,11 @@ msgstr "Видалиа не успя да отвори лог файла."
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Необходимо е името на файла за съобщенията с данни"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
-"Трябва да въведете име на файла за да може да съхраните съобщения с данни "
-"във файл."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2326,7 +2186,7 @@ msgstr "Покажи помощен броузър"
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
@@ -2406,16 +2266,15 @@ msgstr "Дебъг"
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "История на съобщенията с данни"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
-"Брой съобщения, които да бъдат показани в прозореца със съобщенията с данни"
msgctxt "MessageLog"
msgid "messages"
-msgstr "съобщения"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
@@ -2424,44 +2283,30 @@ msgstr "Разлистване"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
msgstr ""
-"Активирай автоматично съхраняване на всички нови съобщенията с данни във "
-"файл"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Автоматично съхранявай нови съобщения с данни във файл"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Основен"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Състояние на Тор"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Напреднал"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Винаги съхранявай нови съобщения с данни"
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Съобщения, появяващи се когато нещо \n"
-"много се обърка и Тор не може да продължи."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Съобщения, появяващи се когато нещо \n"
-"много се обърка с Тор."
msgctxt "MessageLog"
msgid ""
@@ -2470,25 +2315,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Съобщения появяващи се рядко\n"
-"по време на нормалната работа на Тор и \n"
-"не са считани за грешки, но може да се проверят."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Съобщения появяващи се често\n"
-"по време на нормалната работа на Тор."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Многословни съобщения, преди всичко от\n"
-"интерес за Тор разработчиците."
msgctxt "MessageLog"
msgid ""
@@ -2496,13 +2334,6 @@ msgid ""
"\n"
"%2."
msgstr ""
-"Не може да запише файл %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Тор мрежова карта"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2510,11 +2341,11 @@ msgstr "Опресни"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Опресни списъка с Тор препредаванията и връзките"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
@@ -2530,7 +2361,7 @@ msgstr "Показва помоща за мрежовата карта"
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
@@ -2554,7 +2385,7 @@ msgstr "Приближи върху мрежовата карта"
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
@@ -2578,7 +2409,7 @@ msgstr "Нагоди изгледада показва всички вериги
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
@@ -2586,7 +2417,7 @@ msgstr "Файлът не е намерен"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Няма данни на разположение за избраните препредавания."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
@@ -2594,89 +2425,99 @@ msgstr "Неизвестен"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Цял екран"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Покажи мрежовата карта като прозорец на цял екран"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "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 "Недействителен мост"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "Определения мостов идентификатор е недействителен."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Копирай (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Трябва да определите IP адрес или хост име и номер на порта, за да настроите"
-" Тор да използва прокси достъп до интернет."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Трябва да определите един или повече портове, до които защитната Ви стена "
-"позволява да се свържете."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1 е невалиден номер на порт. "
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "Провери дали локалната мрежа изисква прокси за достъп до интернет"
+msgstr ""
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Аз използвам прокси за достъп до интернет"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Настройки на прокси"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Потребителско име:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Парола:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Порт:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Избери само за да се свърже с препращания използващи позволени портове от "
-"защитната стена"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Моята защитна стена ми позволява да се свържа до определени портове"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Настройки на защитната стена"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Позволени портове:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
@@ -2687,81 +2528,76 @@ msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"Избери за да криптира заявки за достъп до директорията и по избор използвай "
-"мостово препращане за достъп до Тор мрежата"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Моят доставчик на интернет услуги блокира връзките с Тор мрежата"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Мостови настройки"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Добавяне на Мост:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Премахни избраните мостове от списъка"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Копирай избраните мостове във временната памет"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Намери мостове сега"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Как мога по друг начин да намеря мостове?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Как мога да намеря мостове?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"В момента няма нови мостове на разположение. Можете или да изчакате за малко"
-" и да опитате отново или да опитате друг метод за намиране на нови мостове."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-"Натиснете Помощ за да видите други методи за намиране на нови мостове."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Адрес:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Вид:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Трябва да изберете вида на проксито."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2829,11 +2665,11 @@ msgstr "Неизвестен"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Подрбности на препращането"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Резюме"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2873,7 +2709,7 @@ msgstr "Последен Ъпдейт:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Чертожник"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2889,15 +2725,15 @@ msgstr "%1 КБ/с"
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Препращане"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Приближажане до препращане"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 препращания онлайн"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2905,67 +2741,59 @@ msgstr "Копирай"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Прякор"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Отпечатък"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Мостова подръжка не е на разположение"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Вие настроихте Тор да действа като мостов препращач, но Тор версията Ви не "
-"подържа мостове."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Моля, обновете Вашия Тор софтуеър или настройте Тор да действа като нормален"
-" Тор препращач."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Мостовото Ви препращане не работи."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Трябва да посочите поне препращащо потребителско име и порт."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Действай само като потребител"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Предавай трафик за Тор мрежата"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Порт за препращане"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Упълномощи огледален образ на препращащата директория"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Опит за автоматично настройване на пренасочване на портове"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Тест"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Покажи помощни теми при пренасочване на портове"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
@@ -2981,13 +2809,11 @@ msgstr "Контект информация:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Име на препращането"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"Портове на които потребители и други препращания могат да осъществят диалог "
-"със твоето препращане"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2995,43 +2821,41 @@ msgstr "Псевдоним:"
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Основни настройки"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"За интернет връзки с бърза скорост на сваляне, но бавно качване, моля "
-"впишете тук скоростта си на качване."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "обичаен"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Изберете стойност, която най се доближава до интернет възката Ви."
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3062,61 +2886,58 @@ msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"Вашата максимална степен на пропускателна способност трябва да е по-голяма "
-"или равна на средната пропускателна способност. Двете стойности трябва да са"
-" поне 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Лимит на пропускателна способност"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Портове 6660 - 6669 и 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Интернет чат на препращане (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Портове 110, 143, 993 и 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Прехвърляне на Поща (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Неупоменати изрично портове в други маркиращи кутийки"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Разни Други услуги"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Портове 706, 1863, 5050, 5190, 5222, 5223, 8300 и 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Мигновенно съобщаване (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Порт 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Сигурни уеб страници (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Порт 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "уеб страници"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
@@ -3126,16 +2947,12 @@ msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
-"До какви интернет ресурси могат потребителите да имат достъп през Вашето "
-"препращане?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Тор въпреки всичко ще блокира някои изходящи писма и програми за споделяне "
-"на файлове по подразбиране, за да намали спам или друга злоупотреба."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3143,38 +2960,34 @@ msgstr "Изход Политика"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Позволи на други достъп до твоя мост давайки им тази линия: "
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
-"Това е идентичността на твоя препредаващ мост, който може да дадете на други"
-" хора"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Копирай идентичността на твоя препредаващ мост във временната памет"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Няма скорошна употреба"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Потребители не са използвали твоето препредаване напоследък."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Не спирай твоето препредаване за да може потребителите да имат по-голям шанс"
-" да го намерят и използват."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "История на моста"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
@@ -3185,52 +2998,54 @@ msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Тор върна неправилно форматиран отговор, след като Видалия изиска историята "
-"на употребата на моста."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Върнатият отговор бе: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Помогни на цензурирани потребители да достигнат Тор мрежата"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Кой е използвал моят мост?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Какво е това?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Автоматично разпределяне на моят мостов адрес"
+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 "Отражение на препращащата директория"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Е-мейл адрес на който може да бъдеш достигнат ако има проблем с твоето "
-"препращане. Можеш също така да включиш твоя PGP или GPG отпечатък."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Грешка докато опитвате да прекратите оповестяването на всички услуги"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Моля, конфугирирайте най-малко директория на услугите и виртуален порт за "
-"всяка услуга, която искате да съхраните. Отстранете другите."
msgctxt "ServicePage"
msgid "Error"
@@ -3238,89 +3053,83 @@ msgstr "Грешка"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Моля, изберете услуга."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr " Изберете директория на услугите."
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Виртуален порт може да съдържа само числа за валиден порт [1..65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Целта може да съдържа само адрес:порт, адрес, или порт."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Директорията вече се използва от друга услуга."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Форма"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Осигурени скрити услуги"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Адрес на Лукчето"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Виртуален порт"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Цел"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Път на директорията"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Включен"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Добави нова услуга към списъка"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Премахни избраната услуга от списъка"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Копирай адреса на лукчето от избраната услуга във временната памет"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
-"Разгледай локалната система от файлове и избери директория за избраните "
-"услуги"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Създаден от Тор"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Копиране във временната памет"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Тор софтуеърът е в действие"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "В момента действате с версия \"%1\" на Тор софтуеъра."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Тор софтуеърът не е в действие"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3328,9 +3137,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"Натисни \"Стартиране на Тор\" в контролния панел на Видалия за да се "
-"рестартира Тор програмата. Ако Тор излезне неочаквано, избери по-горе раздел"
-" \"Напреднал\" за подробности за неочаквани грешки."
msgctxt "StatusEventWidget"
msgid ""
@@ -3339,9 +3145,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"В момента ползвате версия \"%1\" на Тор програмата, която не се препоръчва "
-"повече. Моля, обновете до най-съвременната версия на софтуеъра, която може "
-"да съдържа важни поправки в сигурността, надежността и производителността."
msgctxt "StatusEventWidget"
msgid ""
@@ -3350,39 +3153,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"В момента ползвате версия \"%1\" на Тор програмата, която може да не работи "
-"повече с настоящата Тор мрежа. Моля, обновете до най-съвременната версия на "
-"софтуеъра, която може да съдържа важни поправки в сигурността, надежността и"
-" производителността."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Тор софтуеърът е остарял."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Свързан към Тор мрежата"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"Успешно осъществихме връзка с Тор мрежата. Сега можете да настроите Вашите "
-"програми да използват Интернет анонимно."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Грешка на Тор софтуеъра"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"Програмата Тор се натъкна на неочакван вътрешен технически дефект. Моля, "
-"докладвайте следното съобщение за грешка на разработчиците на Тор, на "
-"bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3391,9 +3185,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Тор установи, че Вашия копютърен часовник може би е нагласен на %1 секунди "
-"назад, в сравнение с източника \"%2\". Ако часовникът не е верен, Тор нама "
-"да може да работи. Моля, проверете дали компютъра Ви показва точното време."
msgctxt "StatusEventWidget"
msgid ""
@@ -3402,13 +3193,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Тор установи, че Вашия копютърен часовник може би е нагласен на %1 секунди "
-"напред, в сравнение с източника \"%2\". Ако часовникът не е верен, Тор нама "
-"да може да работи. Моля, проверете дали компютъра Ви показва точното време."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Часовника на Вашият компютър вероятно е настроен погрешно."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3417,10 +3205,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"Една от програмите на Вашия компютър може да е опитала да осъществи "
-"некриптирана връзка през Тор до порт %1. Изпращане на некриптирана "
-"информация през Тор мрежата е опасно и не се препоръчва. С оглед на Вашата "
-"безопасност, Тор автоматично затвори тази връзка."
msgctxt "StatusEventWidget"
msgid ""
@@ -3428,13 +3212,10 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"Една от програмите на Вашия компютър може да е опитала да осъществи "
-"некриптирана връзка през Тор до порт %1. Изпращане на некриптирана "
-"информация през Тор мрежата е опасно и не се препоръчва."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Потенциално опасна връзка!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3443,14 +3224,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"Една от програмите на Вашия компютър е осъществила връзка през Тор до порт "
-"%1 използвайки протокол, който може да изпуска информация за Вашата "
-"дестинация. Моля, уверете се, че сте настроили програмите си да ползват само"
-" SOCKS4a или SOCKS5 със отдалечен анализ на хост името."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Непознат SOCKS Протокол"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3458,14 +3235,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"Една от програмите на Вашия компютър е опитала да осъществи връзка през Тор "
-"използвайки протокол, който Тор не разбира. Моля, уверете се, че сте "
-"настроили програмите си да ползват само SOCKS4a или SOCKS5 със отдалечен "
-"анализ на хост името."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Хост име с невалидно предназначение"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3473,13 +3246,10 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"Една от програмите, които ползвате се е опитала да осъществи връзка през Тор"
-" до порт \"%1\", който Тор не разпознава като валидно хост име. Моля, "
-"проверете настройките на програмите си."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Промяна на външния IP адрес"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3487,13 +3257,10 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
-"Тор установи, че в момента препращащия публичен IP адрес е %1%2. Ако не е "
-"правилен, моля, вземете под внимание настройката на \"Адрес\" опцията в "
-"конфигурацията на препращането."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Засечена е DNS измама"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3501,10 +3268,6 @@ 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 ""
-"Тор установи, че DNS доставчика подава лъжливи отговори за домейни които не "
-"съществуват. Известно е, че някои доставчици на интернет услуги и други "
-"доставчици на услуги за домейн имена, като OpenDNS правят това за да "
-"показват своите собствени рекламни страници или търсачки."
msgctxt "StatusEventWidget"
msgid ""
@@ -3512,14 +3275,10 @@ 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 ""
-"Тор установи, че твоя DNS доставчика подава лъжливи отговори за добре "
-"известни домейни. Тъй като потребителите разчитат на Тор мржовите "
-"препращания да предоставят точни DNS отговори,твоето препращане няма да бъде"
-" настроено като изходящо препращане."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Проверка на достъпността на порта към сървъра."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3527,21 +3286,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"Тор се опитва да определи дали порта към сървъра за препращане е достъпен от"
-" Тор мрежата чрез свързване към себе си в %1:%2. Този тест може да отнеме "
-"няколко минути."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Успешен тест за достъпност на порта на сървъра!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Вашия порт към сървара за препращане е достъпен от мрежата на Тор!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Провален тест за достъпност на порта на сървъра."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3550,15 +3306,10 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
-"Вашия порт към сървара за препращане не е достъпен от други потребители на "
-"Тор! Възможна причина за това е ако се намирате зад рутер или защитна стена,"
-" която изисква да настроите пренасочване на портове. Ако %1:%2 не е вашия "
-"правилен IP адрес и порт на сървъра, моля, проверете настройките на "
-"препращането."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Проверка на достъпност до порта на директорията."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3566,21 +3317,18 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
-"Тор се опитва да определи дали порта към директорията за препращане е "
-"достъпен от Тор мрежата чрез свързване към себе си в %1:%2. Този тест може "
-"да отнеме няколко минути."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Успешен тест за порт-достъпност на директорията."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Вашия порт на препращащата директория е достъпен от Тор мрежата."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Неуспешен тест за порт-достъпност на директорията."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3589,28 +3337,20 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
-"Вашият порт на препращащата директория не е достъпен от други потребители на"
-" Тор. Това може да се получи ако се намирате зад рутер или ако защитната "
-"стена изисква да се настрои прехвърляне на портове. Ако %1:%2 не е Вашият "
-"правилен IP адрес и порт на директория, моля проверете настройките на "
-"препращането си."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Чертожникът на препращане е отхвърлен"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"Твоя чертожник на препращания, който опълномощява потребители да се свържат "
-"към твоето препращане, беше отхвърлен от сървъра в директорията на %1:%2. "
-"Дадената причина бе: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Твоето препращане е онлайн"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3619,11 +3359,22 @@ 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 ""
msgctxt "Stream"
msgid "New"
@@ -3655,185 +3406,207 @@ msgstr "Повторение"
msgctxt "Stream"
msgid "Remapped"
-msgstr "Прекартографиран"
+msgstr ""
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]"
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Тор услугата не е инсталирана."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Невъзможност да стартира Тор услугата."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Неуспешно хеширане на контролната парола."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Настройване на конфигурационния файл torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
-"Съхрани настройките. Ако не е отбелязано ще приложи настройки само за "
-"настоящия Тор случай."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Изрежи"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Копирай"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Постави копираното"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Стъпка назад"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Стъпка напред"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Избири всичко"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Приложи всичко"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Приложи само избраното"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Грешка при свързването с Тор"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
-"Селектираното е празно. Моля, избери някакъв текст или отбележи \"Приложи "
-"всичко\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Грешка на линия %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Греша"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Появи се грешка при отварянето на конфигурационния torrc файл"
+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 "Успех"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Не са открити активни UPnP устройства"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Не е открито действително активно UPnP гейтуей устройство."
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAСтартиране пропадна"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Неуспешно картиране на добавен порт"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Неуспешно картиране на възвърнат порт"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Неуспешно премахване на порт картиране"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Непозната грешка"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Откриване на UPnP-активни устройства"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Обновление на картирането на портове в директорията"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Обновление на картирането на портове в препращането"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Тестът приключи успешно!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Тестване на UPnP подръжка"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Тестване на универсална Plug & Play подръжка"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Видалия не успя да провери за налични програмни обновления, защото не откри "
-"'%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Видалия не успя да провери за налични програмни обновления, защото Тор-"
-"процесът на обновление бе прекъснат неочаквано."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Проверка за налични обновления..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Скрий"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Сваляне на обновления..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Инсталиране на обновената програма..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Готово! Вашата програма вече е актуализирана."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3841,11 +3614,11 @@ msgstr "ОК"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Обновления за програмата"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "проверяване за обновления..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3853,19 +3626,19 @@ msgstr "Отказ"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Наличие на нови обновления на програмата"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Напомни ми по-късно"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Инсталация"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Следните обновени програмни пакети за готови за инсталация:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3873,7 +3646,15 @@ msgstr "Бекспейс"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Версия"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
@@ -3909,11 +3690,11 @@ msgstr "Покажи опции"
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Продължи"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Край"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
@@ -3921,7 +3702,7 @@ msgstr "Разлисти"
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Невалидна стойност"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
@@ -3929,62 +3710,55 @@ msgstr "Видалиа вече работи"
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Показва това потребителско съобщение и излиза."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Пренастройва ВСИЧКИ съхранени настройки на Видалия."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Настройва директорията, която Видалия използва за файлове с данни."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
-"Настройка на името и местоположението на файла с идентифицираните процеси на"
-" Видалия."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Настройка на името и местоположението на прихващащия файл на Видалия."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Настройка на сетивноста на процеса на прихващане на Видалия."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Настройка на интерфейсния стил на Видалия."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Настройка на езика на Видалия."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Информация за употребата на Видалия"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Невъзможност да отвори файл за данни '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Стойност необходима за параметър:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Недействително установяване на езиков код:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
msgstr ""
-"Недействително установяване на стила, на графичната потребителска среда:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Недействително установяване на нивото на данни:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3992,13 +3766,10 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"По всяка вероятност друг процес на Видалия вече е в ход. Ако наистина няма друг работещ процес, може да изберете да продължите.\n"
-"\n"
-"Искате ли да продължите стартирането на Видалия?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 секунди"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -4018,14 +3789,12 @@ msgstr "%1 GБ/с"
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 дни"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 часове"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 минути"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
index 2330eea..8e4e29f 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ca/qt_ca.po b/src/vidalia/i18n/po/ca/qt_ca.po
index ec991de..72bc351 100644
--- a/src/vidalia/i18n/po/ca/qt_ca.po
+++ b/src/vidalia/i18n/po/ca/qt_ca.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# Gerard Farràs Ballabriga <>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-01-11 18:49+0000\n"
-"Last-Translator: Gerard Farràs Ballabriga <>\n"
+"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +22,17 @@ msgstr "Activa"
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "L'executable '%1' requereix Qt %2 i s'ha trobat Qt %3."
+msgstr ""
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Error d'incompatibilitat amb la llibreria Qt"
+msgstr ""
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr "QT_LAYOUT_DIRECTION"
+msgstr ""
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
@@ -245,27 +242,27 @@ msgstr "Enrere"
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "Directori superior"
+msgstr ""
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "Vista com a llistat"
+msgstr ""
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "Vista en detall"
+msgstr ""
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr "Tipus de fitxers:"
+msgstr ""
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "Directori:"
+msgstr ""
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
@@ -274,10 +271,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"\n"
-"Directori no trobat.\n"
-"Si us plau, verifiqueu que s'ha proporcionat un nom de directori correcte."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -285,98 +278,96 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' està protegit per escriptura.\n"
-"El desitgeu suprimir igualment?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Esteu segur que desitgeu suprimir '%1'?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Podria no suprimir aquest directori."
+msgstr ""
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr "Tots els fitxers (*.*)"
+msgstr ""
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "Desa com a"
+msgstr ""
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "Unitat"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr "Fitxer"
+msgstr ""
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr "Desconegut"
+msgstr ""
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Cerca directori"
+msgstr ""
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "Mostra"
+msgstr ""
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Reenvia"
+msgstr ""
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr "Nova carpeta"
+msgstr ""
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "&Nova carpeta"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&Escolliu"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "Suprimeix"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "Nom de fitxer:"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Mira a:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "Crea nova carpeta"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Nom de fitxer invàlid"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -384,67 +375,63 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>No es pot utilitzar el nom \"%1\".</b><p>Intenteu utilitzar un altre nom,"
-" amb menys caracters o sense marques de puntuació."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr "Nom"
+msgstr ""
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr "Mida"
+msgstr ""
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Tipus"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr "Tipus"
+msgstr ""
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr "Data de modificació"
+msgstr ""
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "El meu ordinador"
+msgstr ""
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr "Ordinador"
+msgstr ""
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr "%1 TB"
+msgstr ""
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/ca/vidalia_ca.po b/src/vidalia/i18n/po/ca/vidalia_ca.po
index 9d32a7a..fd1a754 100755
--- a/src/vidalia/i18n/po/ca/vidalia_ca.po
+++ b/src/vidalia/i18n/po/ca/vidalia_ca.po
@@ -1,13 +1,11 @@
#
-# Translators:
-# Gerard Farràs Ballabriga <>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-11 18:40+0000\n"
-"Last-Translator: Gerard Farràs Ballabriga <>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:43+0000\n"
+"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,128 +16,124 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Quant a Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Llicència"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "%1 no és una adreça ip vàlida."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"Heu seleccionat autenticació amb 'Contrasenya', però no n'heu especificat "
-"cap."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Selecciona el fitxer de configuració del Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Fitxer no trobat"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 no existeix. El desitgeu crear ?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Creació de fitxer fallida"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Incapaç de crear %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Selecciona el directori per a utilitzar les dades del Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Incapaç de suprimir el servei del Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Incapaç d'instal·lar el servei del Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia ha estat incapaç d'instal·lar el servei del Tor."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Autenticació:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Adreça:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Cap"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Galeta"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Contrasenya"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Generació aleatòria"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Fitxer de configuració del Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Arranca el Tor amb el fitxer de configuració especificat (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Seleccioneu la ruta del vostre fitxer de configuració"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Navega"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Directori de dades"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Emmagatzema les dades per al programari Tor en la carpeta següent"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-"Seleccioneu el directori utilitzat per a emmagatzemar la informació del "
-"programari Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -198,720 +192,718 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia ha estat incapaç de suprimir el servei del Tor.\n"
-"\n"
-"Haureu de suprimirlo manualment."
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Llengua"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Escolliu l'idioma utilitzat a Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Estil"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Escolliu l'estil per a la interfície de Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
-"Vidalia ha estat incapaç de carregar el fitxer de llengua especificat."
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Des de:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Oculta les preferències"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Mostra les preferències"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Ús de l'amplada de banda del Tor"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Reinicia"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Velocitat de recepció"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Velocitat de tramesa"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Sempre visible"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Estil"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Canvis en la transparència del gràfic d'amplada de banda"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% d'opacitat"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Desa"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Està fent la petició per al pont HTTPS...."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "S'està connectant al %1:%2...."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "S'està trametent una petició HTTPS pels ponts..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "S'està descarregant un llistat dels ponts..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "S'estan descarregant els ponts"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Incapaç de descarregar els ponts: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "S'està reintentant una petició per a pont...."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "País"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Clients"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
msgstr ""
-"Clients des dels països següents que han utilitzat el vostre relay des de %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Sumari d'ús de ponts"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Sumari de client"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Nou"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Obre"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "S'està construïnt"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Fallit"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Tancat"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Desconegut"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Ruta buida>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Connexió"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Estat"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Apropa el circuit"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Tanca el circuit (Del)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Tanca el flux (Del)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "General"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Xarxa"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "S'està compartint"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Serveis"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Aparença"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Avançat"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Ajuda"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Error mentre es desaven les preferències"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia ha estat incapaç de desar les vostres %1 preferències."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Error mentre s'aplicaven les preferències"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia ha estat incapaç d'aplicar les %1 preferències pel Tor."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Preferències"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia ha estat incapaç de connectar-se al Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "No hi ha connexió amb el sòcol de control."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Contrasenya requerida"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Recorda la meva contrasenya"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia s'ha connectat amb un procés de Tor que requereix contrasenya. Si us"
-" plau, inseriu la contrasenya de control:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "No hi ha connexió amb el sòcol de control."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Error en la tramesa de la comanda de control. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Sòcol desconnectat mentre s'intentava llegir una línia de dades."
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Rèplica de control invàlida.[%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afganistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua i Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armènia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Austràlia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaitjan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahames"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Banglasesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielorússia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Bèlgica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolívia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bòsnia i Hercegovina "
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botsuana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brasil"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgària"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso "
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Cambodja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Camerun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Canadà"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Cap Verd"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "República Centrafricana "
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Txad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Xile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Xina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Colòmbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comores"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "República Democràtica del Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Costa d'Vori"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Croàcia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Cuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Xipre"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "República Txeca"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Dinamarca"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Gibuti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominicia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "República Dominicana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egipte"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Guinea Equatorial"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estònia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "França"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gàmbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Geòrgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Alemanya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guaiana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haití"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Hondures"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Itàlia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japó"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordània"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Casaquistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kènia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Quirguisistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Letònia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Líban"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Libèria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lituània"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxemburg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Macedònia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagascar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malàisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Illes Marshall"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritània"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Maurici"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Micronèsia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldàvia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Mònaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongòlia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Marroc"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Moçambic"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namíbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Naüru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Holanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Nova Zelanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaràgua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Níger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigèria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Noruega"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Paquistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
@@ -919,255 +911,255 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panamà"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Nova Guinea Pàpua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Perú"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filipines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polònia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Romania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rússia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Ruanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts i Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Santa Llúcia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent i les Grenadines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "Sant Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "São Tomé i Príncipe "
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Aràbia Saudita"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Sèrbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leona"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapur"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Eslovàquia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Eslovènia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Illes Salomó"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somàlia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Àfrica del Sud"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Espanya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Suazilàndia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Suècia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Suïssa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Síria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tatgiquistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzània"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Tailàndia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor Oriental"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinitat i Tobago "
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tuníssia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turquia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turcmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ucraïna"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Emirats Àrabs Units"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Regne Unit"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Estats Units"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Usbequistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vaticà"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Veneçuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sahara occidental"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Iemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zàmbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbàue"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1175,99 +1167,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albània"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algèria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Àustria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Etiopia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finlàndia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Grècia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Hongria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Islàndia"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "Índia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonèsia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Iraq"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irlanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Corea del Nord"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Corea del Sud"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Líbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldives"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mèxic"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Mianmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1278,259 +1270,264 @@ msgid "Vidalia encountered an error and needed to close"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid "Send my crash report to the Vidalia developers"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+msgid "Restart Vidalia"
msgstr ""
-"Hem estat incapaços de reiniciar Vidalia de manera automàtica. Si us plau, "
-"reinicieu Vidalia manualment."
msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
+msgid "Don't Restart"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgid "Unable to restart Vidalia"
msgstr ""
msgctxt "CrashReportDialog"
msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Executables (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Seleccioneu la ruta del Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Seleccioneu l'executable per al servidor intermediari"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Heu d'especificar el nom de l'executable del Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Executa Vidalia quan el sistema arranqui"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Navega"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Executa el Tor quan arranqui Vidalia"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Aplicació de proxy (opcional)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Arranca l'aplicació de proxy quan arranqui el Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Paràmetres per a l'aplicació del servidor intermediari"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Actualitzacions de programari"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Reviseu de forma automàtica les actualitzacions de nou programari"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Revisau ara"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Rebuts:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Enviats:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "El fitxer XML proporcionat no és un document vàlid de Continguts."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "La recerca ha arribat al final del document"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "La recerca ha arribat a l'inici del document"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "El text no ha estat trobat en el document"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "S'han trobat %1 resultats"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Ajuda de Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Enrera"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Mou a la pàgina prèvia (Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Retrocés"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Avança"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Mou a la pàgina següent (Shift+Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Inici"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Vés a la pàgina d'inici (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Cerca"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Cerca per una paraula o frase en la pàgina actual (Ctrl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Tanca"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Tanca l'ajuda de Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Cerca:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Cerca anterior"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Cerca següent"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Distingeix majúscules i minúscules"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Només paraules senceres"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Temes d'ajuda"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Continguts"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Recerca"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Recerca per:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Documents trobats"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Error mentre carregava els continguts d'ajuda"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "S'està obrint un enllaç extern"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1538,66 +1535,60 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Vidalia pot obrir l'enllaç que heu seleccionat en el seu navegador per "
-"defecte. Si el vostre navegador no està actualment configurat per a "
-"utilitzar el Tor, llavors la petició no podrà ser anònima"
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Desitgeu que Vidalia obri l'enllaç en el seu navegador web ?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Incapaç d'obrir l'enllaç"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia ha estat incapaç d'obrir l'enllaç que heu seleccionat en el seu "
-"navegador Web. De totes maneres, encara podeu copiar la URL i enganxar-la en"
-" el vostre navegador web."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Error mentre s'obria el fitxer d'ajuda:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Informació de la llicència"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Llicència"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Crèdits"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Informació"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Notice"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Avís"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Desconegut"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
@@ -1605,7 +1596,7 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1613,140 +1604,107 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Avís"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Desconegut"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Arranca el Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Surt"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Gràfica de l'amplada de banda"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Message Log"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Mapa de xarxa"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Panell de control"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Preferències"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "En quant a"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Ajuda"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nova identitat"
-
-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"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Visualitza"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ajuda de Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Error mentre s'iniciava el navegador web"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia ha estat incapaç d'iniciar el navegador web configurat"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Error mentre s'iniciava el client IM"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia ha estat incapaç d'iniciar el client IM configurat"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Error mentre s'iniciava el servidor intermediari"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
-"Vidalia ha estat incapaç d'iniciar el servidor intermediari configurat"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Connecting to a relay directory"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "S'està establint una connexió a un directori xifrat"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "S'està rebent l'estat de la xarxa"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "S'està carregant l'estat de la xarxa"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "S'estan carregant les autoritats de certificació"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
@@ -1758,15 +1716,15 @@ msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "S'està connectant a la xarxa Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "S'està establint un circuit amb el Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Connectats a la xarxa Tor!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
@@ -1774,7 +1732,7 @@ msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "miscel·lània"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
@@ -1782,11 +1740,11 @@ msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "fet"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "connexió refusada"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
@@ -1794,312 +1752,206 @@ msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "error de lectura/escriptura"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "no hi ha ruta cap al servidor"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "recursos insuficients"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "desconegut"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "El Tor no s'està executant"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "S'està tancant el Tor"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Atura el Tor ara"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Atura el Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "S'està arrancant el programari Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "S'està arrancant el Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Error mentre s'arrancava el Tor"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"Vidalia ha estat incapaç d'arrancar el Tor. Reviseu les vostres preferències"
-" per a assegurar-vos que el nom és correcte i la ubicació de l'executable "
-"del Tor està especificada."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "S'està connectant al Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Error en la connexió"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "El relaying està habilitat"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Error mentre es tancava"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia ha estat incapaç d'aturar el Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Error imprevist"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "S'està autenticant el Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Es requereix l'autenticació amb galetes"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"El programari Tor requereix Vidalia per a trametre els continguts d'una "
-"galeta d'autenticació, però Vidalia ha estat incapaç de trobar-ne cap."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "Desitgeu navegar pel fitxer 'control_auth_cookie' vós mateix?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Carpeta de dades"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Control de galetes (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Error mentre s'enregistraven els esdeveniments"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Vidalia ha estat incapaç d'entregistrar diversos esdeveniments. Moltes de "
-"les característiques de Vidalia podrien no estar disponibles."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Error d'autenticació"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia ha estat incapaç d'autenticar-se amb el programari Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Si us plau, reviseu el paràmetre amb el port de control d'autenticació."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Actualització de Tor disponible"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"La versió actual del Tor està desactualitzada i ja no està recomanada. Si us"
-" plau, visiteu el lloc web del Tor per a descarregar la darrera versió."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Lloc web del Tor: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
-"Totes les connexions següents apareixeran diferents que les seves antigues "
-"connexions."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Creació de Nova Identitat fallida"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Reenviament de ports fallit"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
-"Vidalia ha estat incapaç de configurar automàticament el reenviament de "
-"ports."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Panell de control de Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Estat"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Dreceres de Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Configuració del relaying"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Establiu un relay i ajudeu la xarxa a créixer"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Visualitza la xarxa"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Visualitza un mapa de la xarxa Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Utilitza una nova Identitat"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Fés que les connexions següents semblin noves"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Visualitza l'ús recent de l'amplada de banda"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Visualitza l'historial de missatges de registre"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Visualitza la documentació d'ajuda"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configura Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Visualitza la versió i informació de llicència"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Surt de Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Mostra aquesta finestra en l'arrancada"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Oculta"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Oculta aquesta finestra"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Reinicialització de la contrasenya fallida"
-
-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 intentat reinicialitzar la contrasenya de control del Tor, però "
-"no ha etat capaç de reinicialitzar el programari Tor. Si us plau, reviseu el"
-" Gestor de Tasques per a assegurar-vos que no hi ha d'altres processos Tor "
-"executant-se."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"La versió instal·lada del Tor està desactualitzada i ja no està recomanada."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
msgstr ""
-"Desitgeu revisar si un paquet més nou està disponible per a ser instal·lat?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Connexió potencialment insegura"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"El Tor ha tancat de manera automàtica la seva connexió per tal d'assegurar "
-"la seva anonimitat."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Actualització fallida"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "El seu programari està actualitzat"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"No hi ha nous paquets de programari del Tor disponibles pel seu ordinador en"
-" aquest moment."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Instal·lació fallida"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
msgstr ""
-"Vidalia ha estat incapaç d'instal·lar les actualitzacions de programari."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Ha succeït el següent error:"
+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 ""
@@ -2107,18 +1959,29 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, "
-"reviseu la configuració de la vostra aplicació i utilitzeu només protocols "
-"xifrats, com SSL."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fallit (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
msgctxt "MainWindow"
@@ -2138,35 +2001,50 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia ha detectat que el programari Tor ha abortat inesperadament.\n"
-"\n"
-"Si us plau, reviseu el fitxer de registre per a avisos recents o missatges d'error."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+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 "(probably an email client)"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 "Error establint filtre"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia ha estat incapaç d'enregistrar els esdeveniments del Tor"
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Error mentre s'obrir el fitxer de registre"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
@@ -2190,11 +2068,11 @@ msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Fitxers de text (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
@@ -2202,11 +2080,11 @@ msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Cerca:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "No ha estat trobat"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
@@ -2222,19 +2100,19 @@ msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Estableix filtres de missatge"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Mida de la història"
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Estableix el nombre màxim de missatges a mostrar"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Neteja"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
@@ -2242,51 +2120,51 @@ msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Copia"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Copia els missatges seleccionats en el porta-retalls (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Selecciona-ho tot"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Selecciona tots els missatges (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Desa-ho tot"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Desa tots els missatges en el fitxer"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Desa els seleccionats"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Desa els missatges seleccionats en el fitxer"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Preferències"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
@@ -2294,11 +2172,11 @@ msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Ajuda"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
@@ -2409,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Bàsic"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Estat del Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avançat"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2449,8 +2319,6 @@ msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Missatges que apareixen sovient\n"
-"durant l'operació normal del Tor"
msgctxt "MessageLog"
msgid ""
@@ -2464,17 +2332,10 @@ msgid ""
"\n"
"%2."
msgstr ""
-"No és possible escriure el fitxer %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa de xarxa del Tor"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Refresca"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
@@ -2482,59 +2343,59 @@ msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Ajuda"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Mostra l'ajuda del mapa de la xarxa"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Mostra l'ajuda del mapa de la xarxa"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Tanca"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Tanca el mapa de xarxa"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Augmenta"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Augmenta el mapa de la xarxa"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Allunya't"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Allunya't del mapa de la xarxa"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
@@ -2546,7 +2407,7 @@ msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
@@ -2558,78 +2419,87 @@ msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Desconegut"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Pantalla completa"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Visualitza el mapa de xarxa com una finestra a mida completa"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "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 "Pont invàlid"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "L'identificador especificat de pont no és vàlid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Copia (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Heu d'especificar tant una adreça IP o domini com un número de port per a "
-"configurar el Tor per tal que pugui utilitzar un servidor intermediari per a"
-" accedir a Internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Heu d'especificar un o més ports del vostre tallafocs per tal que us permeti"
-" connectar-vos."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "%1' no és un número de port vàlid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
-"Reviseu si la vostra xarxa local requereix un servidor intermediari per a "
-"accedir a Internet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Jo utilitzo un servidor intermediari per a accedir a Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Preferències del servidor intermediari"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Nom d'usuari:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Contrasenya:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
@@ -2637,19 +2507,19 @@ msgstr ""
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "El meu tallafocs només em permet connectar-me en ports concrets"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Preferències del tallafocs"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Ports permesos:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
@@ -2659,43 +2529,41 @@ msgstr ""
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "El meu ISP bloca les connexions a la xarxa Tor"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Preferències del pont"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Afegeix un pont:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Suprimiu els ponts seleccionats de la llista"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Copia els ponts seleccionats en el porta-retalls"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Afegeix nous ponts"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Com més puc trobar ponts?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Com puc trobar ponts?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Ara mateix, no hi ha ponts disponibles. Podeu esperar-vos una estona i "
-"torna-ho a intentar o provar un mètode alternatiu per a trobar nous ponts."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2703,67 +2571,67 @@ msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Adreça:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Tipus:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Heu de seleccionar el tipus de proxy."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "accepta"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "refusa"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "En línia"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "S'està hibernant"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Fora de línia:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Localització:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "Adreça IP:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Plataforma:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Amplada de banda:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
@@ -2771,27 +2639,27 @@ msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Darrera actualització:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Copia"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "S'està hibernant:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "En línia"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Fora de línia"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Desconegut"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
@@ -2799,31 +2667,31 @@ msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Sumari"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Nom:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Estat:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Ubicació:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "Adreça IP:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Plataforma:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Amplada de banda:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
@@ -2831,11 +2699,11 @@ msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Contacte:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Darrera actualització:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
@@ -2843,15 +2711,15 @@ msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Fora de línia"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "S'està hibernant"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
@@ -2867,15 +2735,15 @@ msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Copia"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Àlies"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Fingerprint"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
@@ -2906,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -2923,15 +2787,15 @@ msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Mostra el tema d'ajuda sobre el reenviament de ports"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Directori de ports"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
@@ -2939,56 +2803,53 @@ msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Informació de contacte:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nom del seu repetidor"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"Port en el qual usuaris i d'altres repetidors podran comunicar-se amb el seu"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Sobrenom:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Preferències bàsiques"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"Per a connexions a Internet amb descàrrega ràpida però càrrega lenta, si us "
-"plau, llisteu la seva velocitat aquí."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1,5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Personalitzat"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
@@ -2997,27 +2858,26 @@ msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
-"Mostra el tema d'ajuda sobre els límits en la velocitat d'amplada de banda"
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Velocitat mitjana"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Límit d'amplada de banda mitjana a llarg plaç"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Velocitat màxima"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Pic en l'amplada de banda"
+msgstr ""
msgctxt "ServerPage"
msgid ""
@@ -3027,27 +2887,27 @@ msgstr ""
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Límits d'amplada de banda"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Ports 6660 - 6669 i 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Ports 110, 143, 993 i 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Recupera el correu (POP,IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Ports no especificats per d'altres opcions"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
@@ -3055,27 +2915,27 @@ msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 i 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Instant Messaging (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Port 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Secure Websites (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Port 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Llocs web"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
@@ -3111,7 +2971,7 @@ msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "No hi ha ús recent"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
@@ -3125,7 +2985,7 @@ msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Història del pont"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
@@ -3139,11 +2999,11 @@ msgstr ""
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "La resposta retornada ha estat: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Ajudeu als usuaris censurats d'accedir a la xarxa del Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3151,11 +3011,19 @@ msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Què és això?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Distribueix de manera automàtica l'adreça del meu pont"
+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"
@@ -3179,11 +3047,11 @@ msgstr ""
msgctxt "ServicePage"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Si us plau, seleccioneu un servei."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
@@ -3191,23 +3059,19 @@ msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "El port virtual pot contenir només números de port vàlids [1..65535]"
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "L'objectiu pot contenir solament adreça:port, adreça o port."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulari"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Serveis ocuts proveïts"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
@@ -3215,27 +3079,27 @@ msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Port virtual"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Objectiu"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Ruta"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Habilitat"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Afegeix nou servei a la llista"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Suprimeix el servei seleccionat de la llista"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
@@ -3244,28 +3108,26 @@ msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
-"Navega pel sistema de fitxers local i esculliu un directori pel servei "
-"seleccionat"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Creat pel Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Copia al porta-retalls"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "S'està executant el Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Esteu executant la versió \"%1\" del Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "El Tor no s'està executant"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3273,9 +3135,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"Feu clic a \"Inicia el Tor\" en el panell de control de Vidalia per a "
-"reiniciar el programari. En el cas que el Tor aborti de manera inesperada, "
-"seleccioneu \"Avançat\" per a conéixer més detalls sobre els errors"
msgctxt "StatusEventWidget"
msgid ""
@@ -3284,9 +3143,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"Esteu executant la versió \"%1\" del Tor, la qual ja no està suportada. Si "
-"us plau, actualitzeu-vos a la versió més recent, que conté correccions "
-"relacionades amb la seguretat, la fiabilitat i el rendiment. "
msgctxt "StatusEventWidget"
msgid ""
@@ -3295,38 +3151,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"Esteu executant la versió \"%1\" del Tor, que probablement ja no funciona "
-"amb la xarxa de Tor actual. Si us plau, actualitze-vos a la versió més "
-"recent, que conté correccions relacionades amb la seguretat, la fibilitat i "
-"el rendiment."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "El seu Tor està desactualitzat"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "S'ha connectat a la xarxa Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"Estem en condicions de connectar-nos correctament a la xarxa Tor. Ara, podeu"
-" configurar aplicacions per tal d'utilitzar Internet de manera anònima."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Error del Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"El Tor ha topat amb un error de programació. Si us plau, informeu als "
-"desenvolupadors de l'error següent a bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3335,10 +3183,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"El Tor ha determinat que el rellotge del seu sistema està establert %1 "
-"seconds en el passat que el de la font de \"%2\". Si l'hora del seu rellotge"
-" no és correcta, el Tor no podrà funcionar correctament. Si us plau, "
-"verifiqueu que el seu sistema tingui l'hrora correcta."
msgctxt "StatusEventWidget"
msgid ""
@@ -3347,14 +3191,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"El Tor ha determinat que el rellotge del seu sistema està establert %1 "
-"seconds en el futur que el de la font de \"%2\". Si l'hora del seu rellotge "
-"no és correcta, el Tor no podrà funcionar correctament. Si us plau, "
-"verifiqueu que el seu sistema tingui l'hrora correcta."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "L'hora del seu sistema és potencialment incorrecta"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3363,10 +3203,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"Una de les aplicacions del seu sistema ha intentat realitzar una connexió no"
-" xifrada al Tor a través del port %1. Enviar informació en clar a través de "
-"la xarxa Tor és perillós i no està recomanat. Per la seva protecció, el Tor "
-"ha tancat de manera automàtica aquesta connexió."
msgctxt "StatusEventWidget"
msgid ""
@@ -3374,13 +3210,10 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"Una de les aplicacions del seu sistema ha intentat realitzar una connexió no"
-" xifrada al Tor a través del port %1. Enviar informació en clar a través de "
-"la xarxa Tor és perillós i no està recomanat. "
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Connexió potencialment perillosa!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3389,15 +3222,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"Una de les vostres aplicacions ha establert una connexió a través del Tor a "
-"\"%1\" utilitzant un protocol que podria proporcionar informació sobre la "
-"seva destinació. Si us plau, assegureu-vos que heu configurat les vostres "
-"aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució "
-"d'objectiu remot."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocol SOCKS desconegut"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3405,14 +3233,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"Una de les vostres aplicacions ha establert una connexió a través del Tor "
-"emprant un protocol que aquest no compren. Si us plau, assegureu-vos que heu"
-" configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i "
-"SOCKS5 amb resolució d'objectiu remot."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Destinació d'objectiu invàlida"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3420,13 +3244,10 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"Una de les vostres aplicacions ha intentat establir una connexió via el Tor "
-"a \"%1\", que aquest no reconeix com a objectiu vàlid. Si us plau, reviseu "
-"la configuració de la seva aplicació."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "L'adreça IP externa s'ha canviat"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3437,7 +3258,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Detecció de DNS Hijacking"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3445,10 +3266,6 @@ 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 ""
-"El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes "
-"falses per dominis que no existeixen. És conegut que alguns ISPs i d'altres "
-"proveïdors de DNS, com per exemple, OpenDNS, fan això per tal de mostrar les"
-" seves pròpies pàgines de cerca o de publicitat."
msgctxt "StatusEventWidget"
msgid ""
@@ -3456,10 +3273,6 @@ 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 ""
-"El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes "
-"falses per a dominis reconeguts. Since clients rely on Tor network relays to"
-" provide accurate DNS repsonses, your relay will not be configured as an "
-"exit relay."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3545,58 +3358,79 @@ 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 "Nou"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "S'està resolent"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "S'està connectant"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Obre"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Fallit"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Tancat"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "S'està rebent"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Remapejat"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Desconegut"
+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 "El procés %1 ha fallat en l'aturada. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "El servei del Tor no està instal·lat."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Incapaç d'iniciar el servei del Tor."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-"La generació d'una funció resum per a la contrasenya de control ha fallit."
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3660,13 +3494,37 @@ 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 "Èxit"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "No s'han trobat dispositius UPnP habilitats"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
@@ -3674,7 +3532,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup ha fallat"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
@@ -3690,7 +3548,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Error desconegut"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
@@ -3706,7 +3564,7 @@ msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "El test ha estat completat correctament!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
@@ -3730,31 +3588,31 @@ msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "S'està verificant actualitzacions disponibles..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Oculta"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "S'estan descarregant actualitzacions..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "S'està actualitzant el programari..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Fet! El seu programari està actualitzat."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Actualitzacions de programari"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
@@ -3762,11 +3620,11 @@ msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Actualitzacions de programari disponibles"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
@@ -3774,7 +3632,7 @@ msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Instal·la"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
@@ -3782,35 +3640,43 @@ msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Paquet"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Versió"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Sí"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "No"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Ajuda"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Reintenta"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
@@ -3818,51 +3684,51 @@ msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Mostra les preferències"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Continua"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Surt"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Navega"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Argument invàlid"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia ja s'està executant"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Mostra el missatge d'ús i surt."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Reinicialitza TOTES les preferències de Vidalia emmagatzemades."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Estableix la carpeta que Vidalia utilitza per als fitxers de dades."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Estableix el nom i la ubicació del pidfile de Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Estableix el nom i la ubicació del fitxer de registre de Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Estableix el nivell de detall del fitxer de registre de Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
@@ -3881,10 +3747,6 @@ msgid "Unable to open log file '%1': %2"
msgstr ""
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr ""
@@ -3934,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/cs/qt_cs.po b/src/vidalia/i18n/po/cs/qt_cs.po
index 2dae2a4..d758917 100644
--- a/src/vidalia/i18n/po/cs/qt_cs.po
+++ b/src/vidalia/i18n/po/cs/qt_cs.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# <gsanky+transifex 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-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-11-17 19:48+0000\n"
-"Last-Translator: Sanky <gsanky+transifex at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +22,12 @@ msgstr "Aktivovat"
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "Spustitelný soubor '%1' vyžaduje Qt %2, nalezeno Qt %3"
+msgstr "Spuštěný '%1' vyžaduje aby %2, byl nazalezen"
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Chyba - Nekompatibilní knihovna Qt"
+msgstr "Chyba nekompatibility knihovny Qt"
#: qapplication.cpp:2095
msgctxt "QApplication"
@@ -40,7 +37,7 @@ msgstr "QT_LAYOUT_DIRECTION"
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "Aktivovat hlavní okno programu"
+msgstr "Aktivovat program do hlavního okna"
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
@@ -90,7 +87,7 @@ msgstr "Neukládat"
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "Zahodit"
+msgstr "Odložit"
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
@@ -110,7 +107,7 @@ msgstr "&Ne"
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "Ne &pro všechny"
+msgstr "Ne & pro všechny"
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
@@ -175,7 +172,7 @@ msgstr "Datum změny"
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr "Všechny soubory (*)"
+msgstr "Všechny Soubory (*)"
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
@@ -215,12 +212,12 @@ msgid ""
msgstr ""
"%1\n"
"Soubor nebyl nalezen.\n"
-"Prosím ověřte, zda byl název souboru zadán správně."
+"Prosím ověřte správný název souboru."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "Tento počítač"
+msgstr "Můj počítač"
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
@@ -235,7 +232,7 @@ msgstr "&Smazat"
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "Zobrazit &skryté soubory"
+msgstr "Zobrazit & skrýt složky"
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
@@ -250,12 +247,12 @@ msgstr "Hlavní adresář"
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "Jako seznam"
+msgstr "Zobrazit seznam"
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "Jako detaily"
+msgstr "Zobrazit detail"
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
@@ -325,17 +322,17 @@ msgstr "Neznámý"
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Najít adresář"
+msgstr "Vybrat adresář"
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "Zobrazit "
+msgstr "Zobrazit"
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Vpřed"
+msgstr "vpřed"
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
@@ -360,12 +357,12 @@ msgstr "Odebrat"
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "Jmé&no souboru:"
+msgstr "Soubor & jméno:"
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Vizte:"
+msgstr "Podívejte se:"
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
@@ -375,7 +372,7 @@ msgstr "Vytvořit novou složku"
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Nevalidní název souboru"
+msgstr "Špatné jméno souboru"
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -414,7 +411,7 @@ msgstr "Datum úpravy"
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "Tento počítač"
+msgstr "Můj počítač"
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
@@ -444,6 +441,4 @@ msgstr "%1 KB"
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bajtů"
-
-
+msgstr "%1 bajt"
diff --git a/src/vidalia/i18n/po/cs/vidalia_cs.po b/src/vidalia/i18n/po/cs/vidalia_cs.po
index d1563be..8ee6ff2 100644
--- a/src/vidalia/i18n/po/cs/vidalia_cs.po
+++ b/src/vidalia/i18n/po/cs/vidalia_cs.po
@@ -1,13 +1,14 @@
#
# Translators:
+# <johnathan.smith1968 at gmail.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-11-03 16:11+0000\n"
-"Last-Translator: smejicisebestie <smejicisebestie at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: Johnathan.Smith <johnathan.smith1968 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"
@@ -44,8 +45,6 @@ msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"Jako způsob autentizace jste vybrali \"Heslo\", ale žádné heslo jste "
-"neurčili"
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -69,7 +68,7 @@ msgstr "Nelze vytvořit %1 [%2]"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Vyberte adresář, který může Tor používat pro svá data"
+msgstr "Vyberte adresář který bude Tor využívat pro data."
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
@@ -105,7 +104,7 @@ msgstr "Heslo"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Generováno Náhodně"
+msgstr "Náhodně vygenerované."
msgctxt "AdvancedPage"
msgid ":"
@@ -117,11 +116,11 @@ msgstr "Tor Konfigurační soubor"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Spustit Tor s vybraným konfiguračním souborem (torrc)"
+msgstr "Spusťte Tor s konkrétním konfiguračním souborem (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Vyberte umístění vašeho konfiguračního souboru"
+msgstr "Zadejte cestu k vašemu konfiguračnímu souboru."
msgctxt "AdvancedPage"
msgid "Browse"
@@ -133,19 +132,19 @@ msgstr "Adresář dat"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Ukládat data pro Tor software v následujícím adresáři"
+msgstr "Ukládejte data z Toru v tomto adresáři"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Vyberte adresář pro ukládání dat Tor softwaru"
+msgstr "Vyberte adresář který bude Tor používat pro ukládání dat"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor Ovládání"
+msgstr "Kontrola Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Používat TCP spojení (ControlPort)"
+msgstr "Použijte připojení TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
@@ -153,35 +152,31 @@ msgstr "Cesta:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Use Unix domain socket (ControlSocket)"
+msgstr "Použijte Unixový doménový socket (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Upravit používaný torrc"
+msgstr "Upravte aktuální torrc"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "UOZORNĚNÍ: to změní momentálně nahraný torrc"
+msgstr "Poznámka: toto upraví aktuálně načtený torrc"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "cesta k CotrolSocket neexistuje"
+msgstr "Cesta k ControlSocket neexistuje"
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Uvedené umístění konfiguračního souboru Tor obsahuje znak, který není v "
-"používaném 8-bitovém kódování povolen."
+msgstr "Vybraný konfigurační soubor Tor obsahuje znaky které nemůžou být zobrazeny ve vašem systému aktuálním 8-bitovým kódováním."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"Uvedené umístění adresáře určeného pro data Tor obsahuje znak, který není v "
-"používaném 8-bitovém kódování povolen."
+msgstr "Vybraná složka s daty Tor obsahuje znaky které nemůžou být zobrazeny ve vašem systému aktuálním 8-bitovým kódováním."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -189,19 +184,15 @@ msgstr "Varování"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Změnili jste cestu k torrc, přejete si restartovat aplikaci?"
+msgstr "Změnili jste cesta k torrc, chcete Tor restartovat?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Konfigurační soubor (torrc);;Všechny soubory(*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Vyberte soubor pro Tor cestu soketu"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Nastavit ControlPort automaticky"
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -209,9 +200,6 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
-"Program Vidalie nemůže odebrat službu Tor.\n"
-"\n"
-" Musíte ji tedy odebrat ručně."
msgctxt "AppearancePage"
msgid "Language"
@@ -246,10 +234,6 @@ msgid "Show Settings"
msgstr "Zobrazit Nastavení"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Míra vytíženosti Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Resetovat"
@@ -289,33 +273,37 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Zrušit"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Graf připojení"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Zahájení navazování HTTPS přemostění"
+msgstr "Začínám požadavek na HTTPS bridge ..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Připojování k %1:%2..."
+msgstr "Připojuji se %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Odesílání HTTPS požadvku přemostěním"
+msgstr "Posílám požadavek na HTTPS bridges..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Stahování seznamu přemostění..."
+msgstr "Stahuji list bridges"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Stahování přemostění"
+msgstr "Stahuji Bridges"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Nelze stáhnout přemostění"
+msgstr "Nemohu stáhnout bridges: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Znovu odesílám žádost"
+msgstr "Znovu posílám požadavek na bridge"
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -327,15 +315,15 @@ msgstr "# Klienti"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klienti z následujících států použili Váš uzel %1"
+msgstr "Klienti z těchto zemí vás použili k přenosu od %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Celkové využití přemostění"
+msgstr "Souhrn využití bridge"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Souhrn za klienta"
+msgstr "Souhrn klienta"
msgctxt "Circuit"
msgid "New"
@@ -375,15 +363,15 @@ msgstr "Status"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Nahled na data řetězce"
+msgstr "Nahled na data okruh"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Uzavřít řetězec (Del)"
+msgstr "Uzavření okruh (Del)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Uzavřít datový tok (Del)"
+msgstr "Uzavřený stream (Del)"
msgctxt "ConfigDialog"
msgid "General"
@@ -419,15 +407,15 @@ msgstr "Chyba ukládání nastavení"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia nebyla schopna uložit %1 vašich nastavení"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Chyba při použití nastavení"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia nebyla schopna uložit %1 vašich nastavení do sítě Tor"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
@@ -435,27 +423,34 @@ msgstr "Nastavení"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia se nebyla schopna připojit do sítě Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr "Kontrolni socket neni detekovan"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Heslo je povinné"
+msgid "Problem connecting to Tor"
+msgstr "Problém s připojením k Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Zapamatovat heslo"
+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 "Tor běží, ale Vidalia se k němu nemůže připojit.\n\nTo se může stát pokud(nějaký jiný aktivní Vidalia proces je spuštěn, nebo pokud Vidali proces spadnul) zapínáte Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia se snaží připojit do běžícího Tor procesu, který vyžaduje heslo. "
-"Prosím zadejte vaše heslo:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Musíte nejprve ukončit proces Tor aby mohla Vidalia zapnout nový."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia může zkusit restartovat Tor . Během tohoto procesu bude všechno aktivní připojení přes Tor ukončeno."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -859,47 +854,47 @@ msgstr "Mongolia"
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Morocco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambique"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Netherlands"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "New Zealand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
@@ -907,91 +902,91 @@ msgstr "Presmerovani"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestine"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Philippines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Poland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Romania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Russia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts & Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent & the Grenadines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
@@ -999,239 +994,239 @@ msgstr "Hlavni"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovakia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Solomon Islands"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "South Africa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Spain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Suriname"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Sweden"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Switzerland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Syria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thailand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (East Timor)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad & Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turkey"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukraine"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "United Arab Emirates"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "United Kingdom"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "United States"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatican"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Western Sahara"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Austria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Greece"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Hungary"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Iceland"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
@@ -1271,60 +1266,59 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Odeslat zprávu o chybách"
+msgstr "Pošlete crash report o pádu programu"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia narazila na chybu a musí být uzavřena"
+msgstr "Vidalia narazila na problém a je potřeba ji ukončit"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Crash report o pádu programu byl můžete automaticky poslat vývojářům z Vidalia, toto slouží k nalezení příčiny a řešení problému. Poslaný crash report neobsahuje žádné osobní údaje, ale vaše připojení k serveru při odesílání nemusí být anonymní."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Popište prosím co vše jste dělali před pádem aplikace (volitelné):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Poslat můj crash report vývojářům z Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Restartovat Vidalii"
+msgstr "Restartovat Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Nerestartovat"
+msgstr "Nerestartovat Vidalia"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Vidaliu nelze restartovat"
+msgstr "Není možné restarovat Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Nepodařilo se Vidalii restartovat automaticky. Prosím restrtujte ručně."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Prosím vyplňte tiket na?"
+msgstr "Nemůžeme automaticky restartovat Vidalia. Restartujte ji prosím manuálně."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Připojuji se..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Byla sestavena zpráva o chybě, kterou můžete odeslat vývojovému týmu Vidalia"
-" a pomoci tak s odstraněním problému. Schválená zpráva neobsahuje žádná "
-"osobní data."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Posílám crash report..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"s popisem Vašich činností před selháním aplikace a s následující zprávě o "
-"chybě."
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Přijímám odpověď...."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1336,51 +1330,51 @@ msgstr "Oznac cestu k Tor."
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Vyberte aplikaci proxy serveru"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Musíte specifikovat jméno Tor aplikace"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Spustit Vidalii při spuštění mého systému"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
msgstr "Prohlizej"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Spustit software Tor při spuštění Vidalii"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Proxy aplikace (volitelné)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Spustit proxy aplikace při startu tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Argumenty proxy aplikace"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Aktualizace programu"
+msgstr "Aktualizace softwaru"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Kontrolovat dostupné aplikace automaticky"
+msgstr "Kontroluj nové aktualizace automaticky"
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Zkontrolovat nyní"
+msgstr "Zkontroluj teď"
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Připoj se k Tor automaticky"
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1400,11 +1394,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Obdrž:"
+msgstr "Příjmuté:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Odesl:"
+msgstr "Odeslané:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1532,7 +1526,7 @@ msgstr "Najdi dokument"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Chyba při načtení nápovědy:"
+msgstr "Nastala chyba při načítání nápovědy:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1543,34 +1537,29 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia může vybraný odskaz otevřít ve výchozím prohlížeči. Pokud Váš "
-"prohlížeč není momentálně nastaven pro použití sítě Tor, nebude váš "
-"požadavek již anonymní"
+msgstr "Vidali může otevřít váš odkaz ve vašem primárním webovém prohlížeči. Avšak pokud není aktuálně nastaven pro používání Tor, váš požadavek na prohlížení nemusí být anonymní."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Přejete si odkaz otevřít v internetovém prohlížeči?"
+msgstr "Chcete aby Vidalia otevřela odkaz ve vašem webovém prohlížeči?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Nepodařilo se získat odkaz"
+msgstr "Nemůžeme otevřít odkaz"
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Nepodařilo se rovnou otevřít odkaz ve vašem prohlížeči. Vložte URL adresu "
-"odkazu přímo do prohlížeče."
+msgstr "Vidalia nemůže otevřít vybraný odkaz ve vašem prohlížeči. Avšak můžete zkopírovat URL odkazu a vložit jej do vašeho prohlížeče."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Chyba při otevírání souboru nápovědy:"
+msgstr "Nastala chyba při otevíraní souboru s nápovědou:"
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Licenční informace"
+msgstr "Informace o licenci"
msgctxt "LicenseDialog"
msgid "License"
@@ -1578,7 +1567,7 @@ msgstr "Licence"
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Credits"
+msgstr "Zásluha"
msgctxt "LogEvent"
msgid "Debug"
@@ -1606,11 +1595,11 @@ msgstr "Nezname"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr "Ladění"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr "Informace"
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1630,7 +1619,7 @@ msgstr "Neznámý"
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Spustit Tor"
+msgstr "Zapnout Tor"
msgctxt "MainWindow"
msgid "Exit"
@@ -1669,34 +1658,6 @@ 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"
@@ -1705,84 +1666,80 @@ msgid "View"
msgstr "Nahled"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Napoveda Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Chyba při spouštění prohlížeče"
+msgstr "Chyba při spouštění webového prohlížeče"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalii se nepodařilo spustit nastavený webový prohlížeč"
+msgstr "Vidalia nebyla schopná zapnout vámi nastavený webový prohlížeč"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Chyba při spouštění IM klienta"
+msgstr "Chyba při startu IM klienta"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalii se nepodařilo spustit nastavený IM klient"
+msgstr "Vidalia nebyla schopná zapnout vámi nastavený IM klient"
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Chyba při spouštění proxy serveru"
+msgstr "Chyba při zapínání proxy serveru"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalii se nepodařilo spustit nastavený proxy server"
+msgstr "Vidalia nebyla schopná zapnout vámi nastavený proxy server"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Připojování do adresáře uzlu"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Navazuji spojení s šifrovaným adresářem"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Zjišťuji stav sítě"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Načítam stav sítě"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Nahrávám certifikáty autority"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Zjišťuji informace o uzlu"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Nahrávám informace o uzlu"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Připojuji se do sítě Tor"
+msgstr "Připojuji se k síti Tor"
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Sestavuji Tor řetězec"
+msgstr "Navazuji na okruh Tor"
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Připojeno do sítě Tor!"
+msgstr "Připojen k síti Tor!"
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Nerozpoznaný stav spuštění"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "různý"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "nesouhlasí identita"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
@@ -1790,27 +1747,27 @@ msgstr "hotovo"
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "spojení odmítnuto"
+msgstr "připojení odmítnuto"
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "čas spojení vypršel"
+msgstr "vypršel čas na připojení"
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "chyba čtená/zápisu"
+msgstr "chyba během čtení/zápisu"
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "bez spojení s hostitelem"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "nedostatečné zdroje"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "nenámý"
+msgstr "neznámý"
msgctxt "MainWindow"
msgid "Tor is not running"
@@ -1821,20 +1778,16 @@ msgid "Tor is shutting down"
msgstr "Tor se vypina"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Zastavit Tor nyní"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Zastavit Tor"
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Spouštím software Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Spoštím Tor"
+msgstr "Spustit Tor"
msgctxt "MainWindow"
msgid "Error Starting Tor"
@@ -1844,101 +1797,81 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia nemuze spustit Tor. Ujistete se, ze vase nastaveni identifikatoru a "
-"lokality je odpovidajici."
+msgstr "Vidalia nemuze spustit Tor. Ujistete se, ze vase nastaveni identifikatoru a lokality je odpovidajici."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Připojuji se k Tor"
+msgstr "Připojení k Tor"
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Chyba spojení"
+msgstr "Chyba při připojení"
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Povoleno využití uzlu"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Chyba Ukončování programu"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalii se nepodařilo zastavit Tor software"
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Neočekávaná chyba"
+msgstr "Nečekaná chyba"
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Přihlašování do Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie ověření požadováno"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"Tor software potřebuje aby Vidalia odeslala obsah ověřovací cookie, ale "
-"Vidalia žádné nanšla"
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "Přejete si najít soubor 'control_auth_cookie' sám?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Adresář dat"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Kontrolní cookie (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Chyba při odběru událostí"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Vidalia se nebyla schopna přihlásit k odběru událostí. Množství funkcionalit"
-" bude nejspíš nedostupných "
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Chyba při ověřování"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia se nebyla schopna autentizovat do Tor softwaru (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Prosím zkontrolujte nastavení ověření kontrolního portu"
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "K dispozici Tor aktualizace "
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"Momentálně nainstalovaná verze Tor je zastaralá a již se nedoporučuje. Pro "
-"novější verzi navštivte stránky projektu."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor webová stránka: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -1952,11 +1885,11 @@ msgstr "Vytvoreni nove identity selhalo."
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Přesměrování portu selhalo"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalii se nepodařilo nastavit automatické přesměrování portu"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1967,105 +1900,29 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Zkratky Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Nastav Preposilani"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Vytvořte uzel a pomožte síťi růst"
-
-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 "Zobrazit využití sítě"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Zobrazit zprávy logu"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Dokumentace Napovedy"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Nastavit Vidalii"
-
-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 "Chyba při resetu hesla"
-
-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 ""
-"Vidalie se pokusila resetovat heslo Tor, ale nepodařilo se restartovat Tor "
-"software. Prosím ujistěte se ve správci úloh že neprobíha žádný další Tor "
-"processes"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"Právě nainstalovaná verze Toru je zastaralá a již se ji nedporučuje "
-"používat."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Přejete si zkontrolovat dostupnost nových instalačních balíčků?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Potencionálně nebezpečné připojení"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "Tor automaticky ukončil vaše připojení aby ochránil Vaši anonimitu"
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2073,17 +1930,17 @@ msgstr "Neuspesne"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Váš software je zastaralý"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "Není k dispozici žádný Tor softwarový balíček "
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Instalace selhala"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
@@ -2091,7 +1948,13 @@ msgstr "Vidalia neni schopna instalovat Tor jako sluzbu"
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Objevila se následující chyba"
+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 ""
@@ -2099,25 +1962,34 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"Veškerá komunikace přes toto připojení může být monitorováno. Zkontrolujte "
-"nastavení aplikace a pokud možno používejte výhradně šifrovaný protokol jako"
-" je SSL"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Selhání (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"Váš uzel se vypíná.\n"
-"Klikněte na 'Stop' znovu pro okamžité odpojení."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Konfigurace připojení v torrc pomocí BOOTP od %1 do %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2125,9 +1997,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Máte právě spuštěný uzel. Jeho ukončením přerušíte všechna otevřená připojení klientů.\n"
-"\n"
-"Přejete si spojení s klienty ukončit a nechat jim čas nalézt nový uzel?"
msgctxt "MainWindow"
msgid ""
@@ -2135,25 +2004,38 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia zaznamenala neočekávané ukončení Tor software.\n"
-"\n"
-"Zkontrolujte poslední varovné a chybové zprávy v logu."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(pravděpodobně Telnet)"
+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 "(probably an email client)"
-msgstr "(pravděpodobně emailový klient)"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 ""
-"Zdá se že jedna z Vašich aplikací %1 komunikuje nešifrovaně a nebezpečně na "
-"portu %2."
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2408,36 +2290,24 @@ msgid "Automatically save new log messages to a file"
msgstr "Automaticky uloz nove oznameni do souboru"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Jednoduchý"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Stav"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Pokročilý"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Vzdy Ukladat Nove Oznameni"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Zprávy které se objeví při závadě \n"
-"kdy Tor nemůže nadále pokračovat."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Zprávy které se objeví při závadě \n"
-"Tor."
msgctxt "MessageLog"
msgid ""
@@ -2446,23 +2316,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Zprávy které se během normálního \n"
-"provozu zřídka objevují a které nepředstavují \n"
-"chybu, nicméně měli by jste jim věnovat pozornost"
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Zprávy které se objevují při běžném \n"
-" provou často"
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Zprávy určené Tor vývojářů"
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2470,13 +2335,6 @@ msgid ""
"\n"
"%2."
msgstr ""
-"Nelze zapisovat do souboru %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa sítě"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2484,7 +2342,7 @@ msgstr "Aktualizace"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Obnovit výpis detailů k uzlům a připojením"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2560,7 +2418,7 @@ msgstr "Soubro nenalezen"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Není vybrán žádný detail uzlu"
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
@@ -2568,88 +2426,99 @@ msgstr "Nezname"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Celá obrazovka"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Zobrazit mapu sítě jako okno na celou obrazovku"
+msgstr ""
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 "Neplatný most"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "Uvedený identifikátor mostu je neplatný"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Kopírovat (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Pro nastavení Toru pro použití proxy serveru musíte specifikovat jak IP "
-"adresu (nebo jméno hostitele) tak číslo portu"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Musíte specifikovat jeden nebo více portů, které Váš firewall neblokuje"
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' je neplatné číslo portu."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "Zkontrolujte zda k přístupu k internetu nepoužíváte proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Pro připojení k internetu používám proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Nastavení proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Uživatel:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Heslo."
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Ujistěte se že na uzlech jsou nastaveny porty, které jsou povoleny na "
-"firewallu"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Můj firewall mě povoluje jen něktré porty"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Nastavení firewallu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Povolené porty:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
@@ -2660,80 +2529,76 @@ msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"Zkontrolujte že jste zakodovali požadavky a použijte mostové uzly k přístupu"
-" na internet"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Můj Provider blokuje připojení do Tor sítě"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Nastavení mostu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Přidej most:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Odeber vybrané mosty ze seznamu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Zkopírujte vybrané mosty do schránky"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Najdi mosty teď"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Kde dál najdu mosty?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Kde najdu mosty?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Nyní je k dispozici nový most. Můžete počkat a zkušet to za chvili, nebo "
-"přejít na jinou metodu jak si najít snoubenku."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Klikněte na nápovědu pro dalšé metody jak najít nové mosty"
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Adresa:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Typ:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Musíte vybrat typ proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2801,11 +2666,11 @@ msgstr "Nezname"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Detail uzlu"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Souhrn"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2845,7 +2710,7 @@ msgstr "Aktualizovano naposled:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Ukazatel"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2861,15 +2726,15 @@ msgstr "%1 KB/s"
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Uzel"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zvětšit uzel"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 uzlů online"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2877,67 +2742,59 @@ msgstr "Kopirovat"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Přezdívka"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Otisk prstu"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Nedostupná podpora uzlu"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Nastavili jste Tor jako most pro uživatele postižené cenzurou, ale Vaše "
-"verze Toru nepodporuje mosty"
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Prosím upgradujte Váš Tor, nebo jej nastavte tak, aby se choval jako "
-"normální uzel"
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Váš most neběží"
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Musíte uvézt alespoň jméno uzlu a port"
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Pracovat pouze jako klient"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Prenos dat pro sit Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Uzel portu"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Poskytnout adresář uzlu ke stahování"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Zkouším automaticky nastavit přesněrování portů"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Nápověda k přesměrování portů"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
@@ -2953,11 +2810,11 @@ msgstr "Kontaktni informace:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Název Vašeho uzlu"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr "Port na kterém mohou uživatelé a jiné uzly komunikovat s Vaším uzlem"
+msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2971,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Pro pripojeni s rychlym downloadem ale pomalym uploadem zde nastav rychlost "
-"pro uploadu."
+msgstr "Pro pripojeni s rychlym downloadem ale pomalym uploadem zde nastav rychlost pro uploadu."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3031,9 +2886,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Tvoje maximalni prenosova kapacita musi byt vyssi nebo rovna prumerne. Obe "
-"hodnoty musi byt minimalne 20 KB/s (160kbps)."
+msgstr "Tvoje maximalni prenosova kapacita musi byt vyssi nebo rovna prumerne. Obe hodnoty musi byt minimalne 20 KB/s (160kbps)."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3065,9 +2918,7 @@ msgstr "Ruzne dalsi sluzby"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"Porty 706, 1863, 5050, 5190, 5222, 8300 a 8888 {706, 1863, 5050, 5190, 5222,"
-" 5223, 8300 ?}"
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 8300 a 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3096,15 +2947,13 @@ msgstr "Ukaza napovedu pro provozni pravidla"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr "Jaké prostředky internetu zpřístupníte z Vašeho uzlu"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Tor bude nadále blokovat některé emaily a aplikace pro sdílení souborů, "
-"kvuli omezení spamu"
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3112,31 +2961,30 @@ msgstr "Pravidla Provozu"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Umožněte ostatním sdílet Váš most. Poskytněte jim následující odkaz:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "Jedná se o označnčí Vašeho mostu, které můžete poskytnout ostatním"
+msgstr ""
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Zkopírujte Vaše označení do Schránky."
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Momentálně bez vytížení"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "NV poslední době nikdo nevyužil Váš uzel"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Nechte Váš uzel puštěný, klienti pak budou snáze schopni ho najít a používat"
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3151,52 +2999,54 @@ msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor navrátil nesprávně formátovanou odpověď Viladie, když se dotaovala na "
-"historii vyzužití mostu"
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Vrácená odpověď byla: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Pomožte uživatelům pod cenzurou připojit se do sítě Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Kdo použil můj most?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Co to je?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Automatická distribuce adresy mého mostu"
+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 "Sdílet adresář uzlu"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Email na kterém jste k zastižení kdyby se\n"
-"objevili problémy s uzlem. Měli by jste také váš PGP nebo GPG fingerprint."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Chyba při odhlášení všech služeb"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Nastavte přinejmenším adresář služby a virtualní port pro každou službu, "
-"kterou chcete zachránit. Ostatní odstraňte."
msgctxt "ServicePage"
msgid "Error"
@@ -3204,88 +3054,83 @@ msgstr "Chyba"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Prosím vyberte službu"
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Vyberte Adresář služby"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtuální port smí obsahovat pouze platné šíslice."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Cíl by měl obsahovat pouze adresu:port, adresu, nebo port"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Adresář již využívá jiná služba"
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Forma"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Poskytované skryté služby"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Cibulová adresa"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Virtuální port"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Cél"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Cesta k adresáři"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Povoleno"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Přidat do seznamu novou službu"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Odebrat vybranou službu ze seznamu"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopírovat cibulová adresa vybrané služby do schránky"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
-"Projděte na lokálním disku soubory a vyberte adresář pro vybranou službu"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Created by Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Kopírovat do schránky"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor software běží"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Právě máte spuštěnou verzi \"%1\" tor softwaru"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor software neběží"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3293,9 +3138,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"Ve Vidalia Ovládacím panelu klikněte na \"Start Tor\" pro restartování "
-"softwaru. Pokud Tor skončil neočekávaně, klikněte na \"Pokročilé\" a "
-"zobrazí se Vám informace o chybách"
msgctxt "StatusEventWidget"
msgid ""
@@ -3304,8 +3146,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"Právě používáte program Tor ve verzi \"%1\" . Tato verze již není "
-"podporována. Prosím upgradujte software pro získání důležitých oprav."
msgctxt "StatusEventWidget"
msgid ""
@@ -3314,36 +3154,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"Právě používáte program Tor ve verzi \"%1\" . Tato verze již není "
-"podporována. Prosím upgradujte software pro získání důležitých oprav."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Váš Tor software je zastaralý"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Připojeno do Sítě Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"Nyní se již můžeme připojit do sítě Tor. Nyní můžete nastavit Vaše aplikace "
-"pro anonymní používání internetu"
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Tor Software Error"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"Software Tor našel interní chybu. Prosím odešlete básledující zprávu "
-"vývojářům na bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3352,9 +3186,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Tor identifikoval, že vaše systémové hodiny jdou o %1 sekund opožděne oproti"
-" zdroji \"%2\". S nesprávně nastaveným časem nemůže Tor správně pracovat. "
-"Prosím ověřte správnost systémového času."
msgctxt "StatusEventWidget"
msgid ""
@@ -3363,13 +3194,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Tor identifikoval, že vaše systémové hodiny jdou o %1 sekund napřed oproti "
-"zdroji \"%2\". S nesprávně nastaveným časem nemůže Tor správně pracovat. "
-"Prosím ověřte správnost systémového času."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Nesprávný systémový čas"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3378,9 +3206,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"Jedna z aplikací na Vašem počítači se pokusila o nezašifrovanou komunikaci "
-"na portu %1. Posílání nezašifrovaných informací sítí Tor je nebezpečné. Pro "
-"Vaši ochranu Tor automaticky uzavřel spojení."
msgctxt "StatusEventWidget"
msgid ""
@@ -3388,13 +3213,10 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"Jedna z aplikací na Vašem počítači se pokusila o nezašifrovanou komunikaci "
-"na portu %1. Posílání nezašifrovaných informací sítí Tor je nebezpečné. Pro "
-"Vaši ochranu Tor automaticky uzavřel spojení."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potenciálně nebezpečné připojení!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3403,14 +3225,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"Jedna z Vašich aplikací navázala spojení přes Tor na \"%1\" používajíc "
-"protokol, který by prozradil informace o Vaší poloze. Ujistěte se že jste "
-"nastavil Vaše aplikace aby používali pouze SOCKS4a nebo SOCKS5 se remote "
-"hostname resolution."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Neznámý SOCKS protokol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3418,13 +3236,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"Jedna z Vašich aplikací navázala spojení přes Tor používajíc protokol, který"
-" Tor nezna. Ujistěte se že jste nastavil Vaše aplikace aby používali pouze "
-"SOCKS4a nebo SOCKS5 se remote hostname resolution."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Neplatný název cílového serveru"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3432,13 +3247,10 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"Jedna z Vašich aplikací se pokouší spojit přes Tor na \"%1\", jehož "
-"hostname nepovažuje Tor za platné. Prosím zkontrolujte nastavení Vaší "
-"aplikace."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Externí IP adresa se změnila"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3446,12 +3258,10 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
-"Tor určil Vaši veřejnou IP adresu na %1%2. Pokud to není správně, upravte "
-"hodnotu 'Adresa' v nastavení uzlu."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Detekován DNS Hijacking"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3459,9 +3269,6 @@ 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 zaznamenal, že Váš DNS provider odesílá nesprávné odpovědi při hledání "
-"neexistujících domén. Někteří poskytovatelé DNS a internetu to dělají, aby "
-"uživateli podstrčili vlastní reklamy nebo vyhledávače."
msgctxt "StatusEventWidget"
msgid ""
@@ -3469,13 +3276,10 @@ 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 zaznamenal, že Váš DNS provider poskytuje nesprávné odpovědi u "
-"existujícíhc stránek. Vzhledem k tomu nebude Váš uzel nastaven jako "
-"výstupní."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Kontrola dostupnosti portů"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3483,20 +3287,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"Tor zkouší jestli je Váš uzel přístupný ze sítě Tor přihlášením sám sebe na "
-"%1:%2. Test může trvat několik minut."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Test dostupnosti portu úspěšně dokončen!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Váš uzel je na svém portu přístupný ze sítě Tor!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Test přístupnosti portu serveru selhal"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3505,14 +3307,10 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
-"Váš uzlový server není dostupný klientům ze sítě Tor. To může být pokud jste"
-" za routerem, nebo firewallem kvůli kterému je nutné porty přesměrovat. "
-"Pokud toto není Vaše IP adresa %1:%2 i a port serveru, zkontrolujte "
-"nastavení Vašeho uzlu"
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Kontrola Dostupnosti adresářového portu"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3520,20 +3318,18 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
-"Tor zkouší jestli je Váš adresářový port na uzlu přístupný ze sítě Tor "
-"přihlášením sám sebe na %1:%2. Test může trvat několik minut."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Test dostupnosti adresářového portu úspěšný!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Váš uzel je na svém adresářovém portu přístupný ze sítě Tor!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Test dostupnosti adresářového portů úspěšně dokončen!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3542,26 +3338,20 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
-"Váš adresářový port uzlu není dostupný klientům ze sítě Tor. To může být "
-"pokud jste za routerem, nebo firewallem kvůli kterému je nutné porty "
-"přesměrovat. Pokud toto není Vaše IP adresa %1:%2 i a port serveru, "
-"zkontrolujte nastavení Vašeho uzlu"
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Odmítnut uzlový ukazatel"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"Váš ukazatel uzlu, který umožňuje klientům se na něj připojit, byl odmítnut "
-"adresářovým serverm na %1:%2. Uvedený důvod: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Váš uzel je Online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3570,9 +3360,22 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-"Váš uzel je nyní online a dostupný pro klienty Toru. Za několik hodin dojde "
-"pravděpodobně k vyššímu vytížení v souvislosti s tím jak vás jednotlivé "
-"klienty postupně objevují. Děkujeme Vám za přispívání Tor síti"
+
+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"
@@ -3604,12 +3407,18 @@ msgstr "Opakovat"
msgctxt "Stream"
msgid "Remapped"
-msgstr "Přemapováno"
+msgstr ""
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]"
@@ -3624,148 +3433,165 @@ msgstr "Tor neni instalovan jako servis."
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Chyba při hashování hesla"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Uprava torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
-"Uložit nastavení. Pokud není zaškrtnuto, změny se projeví na právě běžící "
-"instance Toru"
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Vyjmout"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Kopírovat"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Vložit"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Zpět"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Vpřed"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Označit vše"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Použít vše"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Použít poze označené"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Chyba připojování do Tor"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
-"Výběr je prázdný. Prosím vyberte nějaký text, nebo použijte \"Označit vše\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Chyba na řádce %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Chyba"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Vyskytla se chyba při otevírání souboru torrc"
+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 "Úspěšně dokončeno"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Nenalezeno žádné UPnP zařízení"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Nenalzeno žádné UPnP zařízení pro přístup k internetu"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup selhalo"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Selhal pokus přidat mapování portů"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Selhalo obdržení mapování portů"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Selhalo odstranění mapování portů"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Neznámá chyba"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Zjišťování UPnP zařízení"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Aktualizace mapování adresářového portu"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Aktualizace mapování portů uzlu"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Test úspěšně skončen"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Testování podpory UPnP "
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Testování podpory Universal Plug & Play"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Vidalia se nepodařilo zjistit přítomnost dostupných aktualizací, protože se "
-"nepodařilo nalézt '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Vidalia se nepodařilo zjistit přítomnost dostupných aktualizací, protože "
-"proces Tor aktualizace skončil neočekávaně."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Kontroluji nové aktualizace"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3773,15 +3599,15 @@ msgstr "Schovat"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Stahuji aktualizace..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Insatalace aktualizovaného software..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Hotovo! Váš software je aktuální!"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3789,11 +3615,11 @@ msgstr "OK"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "SW Aktualizace"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Zjišťuji aktualizace"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3801,19 +3627,19 @@ msgstr "Smaz"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Dostupné SW aktualizace"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Připomenout poději"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Instalace"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Následující aktualizované SW balíčky jsou připraveny k instalaci"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3821,7 +3647,15 @@ msgstr "Backspace"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Verze"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
@@ -3916,20 +3750,16 @@ msgid "Unable to open log file '%1': %2"
msgstr "Nemohu otevrit soubor zaznamu '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Parametr vyžaduje hodnotu:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Neplatný kód jazyka"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Neplatná specifikace stylu GUI"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Neplatná úroveň logu"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3937,13 +3767,10 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Je možné že již běží jiný proces Vidalia. Pokud skutečně žádný další proces Vidalia neběží můžete pokračovat dál.\n"
-"\n"
-"Přejete si dále spoštět Vidaliu?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 sekund"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -3963,14 +3790,12 @@ msgstr "%1 GB/s"
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 dnů"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 hodin"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 min"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/csb/vidalia_csb.po b/src/vidalia/i18n/po/csb/vidalia_csb.po
index 4d94dae..0b40a42 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 442d953..eecb6cd 100644
--- a/src/vidalia/i18n/po/cy/vidalia_cy.po
+++ b/src/vidalia/i18n/po/cy/vidalia_cy.po
@@ -1,12 +1,11 @@
#
-# 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: cymro <markives at hotmail.co.uk>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
+"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,23 +16,23 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Amdan Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Trwydded"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
@@ -50,7 +49,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Ffeil heb ei darganfod"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
@@ -86,11 +85,11 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Cyfeiriad:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Dim"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -98,7 +97,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Cyfrinair"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
@@ -106,7 +105,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
@@ -209,7 +208,7 @@ msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Steil"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
@@ -221,18 +220,14 @@ msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Ers:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Cyddiwch Gosodiadau"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Dangos Gosodiadau"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
msgstr ""
msgctxt "BandwidthGraph"
@@ -269,11 +264,15 @@ msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Cadw"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Canslo"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
@@ -428,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -479,679 +487,679 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Awstralia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaijan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Belarws"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Gwlad Belg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnia a Herzegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brasil"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bwlgaria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Bwrwndi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Cambodia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Camerŵn"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Canada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Cape Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Gweriniaeth Canolbarth Affrica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Chad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Chile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "China"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Colombia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comoros"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, Gweriniaeth Ddemocrataidd y"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Cote da Ivoire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Croatia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Cuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Cyprus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Denmarc"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibouti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Gweriniaeth Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Yr Aifft"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Guinea Gyhydeddol"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Ffrainc"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Yr Almaen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haiti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Yr Eidal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Latfia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Lebanon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lithwania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Lwcsembwrg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Macedonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagascar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malaysia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Ynysoedd Marshall"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauritius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Micronesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldova"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Moroco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambique"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Iseldiroedd"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Seland Newydd"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norwy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palesteina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Guinea Newydd"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Periw"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Philippines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Gwlad Pwyl"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portiwgal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Rwmania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rwsia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts a Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent a'r Grenadines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome a Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slofacia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slofenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Ynysoedd Solomon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "De Affrica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Sbaen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Suriname"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Sweden"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Swistir"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Syria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Gwlad Thai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Dwyrain Timor)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad a Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Twrci"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Twfalw"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Wcráin"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Emiradau Arabaidd Unedig"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Y Deyrnas Unedig"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Unol Daleithiau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Fatican"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Gorllewin Sahara"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1159,99 +1167,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Awstria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Ffindir"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Gwlad Groeg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Hwngari"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Gwlad yr Iâ"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irac"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Iwerddon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Korea, North"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Korea, De"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldives"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mexico"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Myanmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1331,15 +1339,11 @@ msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Pori"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
@@ -1365,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1411,7 +1419,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Help Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
@@ -1427,7 +1435,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Ymlaen"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
@@ -1647,34 +1655,6 @@ 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 ""
@@ -1683,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1799,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1885,18 +1857,6 @@ 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 ""
@@ -1937,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Would you like to check if a newer package is available for installation?"
+"Anything 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 "Potentially Unsafe Connection"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2076,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2356,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2411,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2514,6 +2433,22 @@ 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 ""
@@ -2839,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3087,6 +3018,14 @@ 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 ""
@@ -3131,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3423,6 +3358,22 @@ 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 ""
@@ -3459,6 +3410,12 @@ 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 ""
@@ -3487,23 +3444,23 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Torri"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Copi"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Gludo"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Dadwneud"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Ail-wneud"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
@@ -3531,12 +3488,36 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Gwall"
+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 ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3815,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/da/qt_da.po b/src/vidalia/i18n/po/da/qt_da.po
index 261ba9d..b1eb83c 100644
--- a/src/vidalia/i18n/po/da/qt_da.po
+++ b/src/vidalia/i18n/po/da/qt_da.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 byte"
-
-
diff --git a/src/vidalia/i18n/po/da/vidalia_da.po b/src/vidalia/i18n/po/da/vidalia_da.po
index 6180b32..5f9aa10 100644
--- a/src/vidalia/i18n/po/da/vidalia_da.po
+++ b/src/vidalia/i18n/po/da/vidalia_da.po
@@ -1,14 +1,12 @@
#
# Translators:
-# Aputsiaq Janussen <aputtu at gmail.com>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
# <theoliver at live.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-09 21:55+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
"Last-Translator: OliverMller <theoliver at live.co.uk>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -45,13 +43,11 @@ msgstr "'%1' er ikke en gyldig IP-adresse."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Du har valgt 'Password' autentificering, men har ikke angivet en "
-"adgangskode."
+msgstr "Du har valgt 'Password' godkendelse, men har ikke angivet en adgangskode."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Vælg Tor konfigurations fil"
+msgstr "Vælg Tor konfigurationsfil"
msgctxt "AdvancedPage"
msgid "File Not Found"
@@ -71,15 +67,15 @@ msgstr "Kunne ikke oprette %1 [%2]"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Vælg en mappe som skal bruges til Tor Data"
+msgstr "Vælg en mappe til brug for Tor data"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Kan ikke fjerne Tor Service"
+msgstr "Kan ikke fjerne Tor service"
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Ude af stand til at installere Tor Service"
+msgstr "Kan ikke installere Tor service"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
@@ -87,7 +83,7 @@ msgstr "Vidalia var ikke i stand til at installere Tor service."
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Autentificering:"
+msgstr "Autentificiering:"
msgctxt "AdvancedPage"
msgid "Address:"
@@ -103,11 +99,11 @@ msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Adgangskode"
+msgstr "Password"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Tilfældigt Genereret"
+msgstr "Tilfældigt Generer"
msgctxt "AdvancedPage"
msgid ":"
@@ -119,11 +115,11 @@ msgstr "Tor konfigurationsfil"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Start Tor med den angivne opsætningsfil (torrc)"
+msgstr "Start Tor software med den angivne konfigurationsfil (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Valg stien til din konfigurationsfil"
+msgstr "Vælg sti til din konfigurationsfil"
msgctxt "AdvancedPage"
msgid "Browse"
@@ -131,15 +127,15 @@ msgstr "Gennemse"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Fil Mappe"
+msgstr "Mappe"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Gem Tors data i den følgende mappe"
+msgstr "Lagre data for de Tor software i følgende mappe"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Vælg hvilken katalog der skal bruges til at gemme data fra Tor"
+msgstr "Vælg den mappe der skal bruges til at lagre data for Tor software"
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -155,35 +151,31 @@ msgstr "Sti:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Brug Unix-domænesokkel (ControlSocket)"
+msgstr "Brug Unix domæne-stik (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Rediger aktuel torrc"
+msgstr "Rediger nuværende torrc"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "BEMÆRK: dette vil redigere aktuelt indlæste torrc"
+msgstr "Bemærk: Dette vil redigere den aktuelt indlæste torrc"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket-sti eksisterer ikke."
+msgstr "ControlSocket Stien findes ikke."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Den angivne placering for Tor-konfigurationsfil indeholder tegn som ikke kan"
-" repræsenteres i dit systems aktuelle 8-bit tegnindkodning. "
+msgstr "Den angivne Tor konfiguration filplacering indeholder tegn, der ikke kan repræsenteres i systemets nuværende 8-bit tegnsæt."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"Den angivne placering for Tor-datakatalog indeholder tegn som ikke kan "
-"repræsenteres i dit systems aktuelle 8-bit tegnindkodning. "
+msgstr "Den angivne Tor data mappeplaceringen indeholder tegn, der ikke kan repræsenteres i systemets nuværende 8-bit tegnsæt."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -191,29 +183,22 @@ msgstr "Advarsel"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Du ændrede torrc-sti, vil du gerne genstarte Tor?"
+msgstr "Du har ændret torrc sti, ønsker du at genstarte Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor-konfigurationsfil (torrc);; Alle filer (*)"
+msgstr "Tor Configuration File (torrc);;Alle filer(*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Vælg en fil til brug for Tor-sokkelsti"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Konfigurer KontrolPort Automatisk"
+msgstr "Vælg en fil, der skal bruges til Tor socket vej"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia var ikke i stand til at fjerne Tor-tjeneste.\n"
-"\n"
-"Du skal muligvis fjerne den manuelt."
+msgstr "Vidalia var ikke i stand til at fjerne Tor service.\n\nDet kan være nødvendigt at fjerne det manuelt."
msgctxt "AppearancePage"
msgid "Language"
@@ -221,7 +206,7 @@ msgstr "Sprog"
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Vælg sproget til brug i Vidalia"
+msgstr "Vælg det sprog, der anvendes i Vidalia"
msgctxt "AppearancePage"
msgid "Style"
@@ -229,11 +214,11 @@ msgstr "Stil"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Vælg Vidalia's grænsefladestil"
+msgstr "Vælg Vidalia grænseflade stil"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia kunne ikke hente det valgte sprog"
+msgstr "Vidalia kunne ikke indlæse det valgte sprog oversættelse."
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -241,1305 +226,1310 @@ msgstr "Siden:"
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Skjul Indstillinger"
+msgstr "Skjul indstillinger"
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr "Vis Indstillinger"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tors Bredbåndsbrug"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Nulstil"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Modtagelseshastighed"
+msgstr "Modtagelsesrate"
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Sendehastighed"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Altid øverst"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Stil"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Ændre gennemsigtigheden af Båndbredsgrafen"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Uigennemsigtig"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Gem"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Annuller"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Starter forespørgel af HTTPS-bro..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Forbinder til %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Sender en HTTPS-forespørgsel efter broer... "
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Henter en liste af broer..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Henter broer"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Ikke i stand til at hente broer: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Forsøger igen med bro-forespørgsel..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Land"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Klienter"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klienter fra følgende lande har brugt dit relæ siden %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Opsummering for anvendelse af bro"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Klientopsummering"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Ny"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Åben"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "Bygger"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Mislykkedes"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Lukket"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Ukendt"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Tom Sti>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Forbindelse"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Status"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Zoom til Kredsløb"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Luk Kredsløb (Del)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Luk Strøm (Del)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "Generelt"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Netværk"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Deling"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Tjenester"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Udseende"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Avanceret"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Hjælp"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Fejl ved Gemning af Indstillinger"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia kunne ikke gemme dine %1 indstillinger."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Fejl ved anvendelse af Indstillinger"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia kunne ikke anvende dine %1 indstillinger til Tor."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Indstillinger"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia kunne ikke forbinde til Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Kontrol socket er ikke tilsluttet."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Kodeord påkrævet"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Husk mit kodeord"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia er tilsluttet til en kørende Tor-proces som kræver et kodeord. "
-"Venligst indtast til kontrolkodeord:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Kontrol socket er ikke forbundet."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Fejl ved sending af kontrol kommando. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Socket afbrudt mens forsøg på læsning af en linje data."
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Ugyldigt kontrol svar. [%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afghanistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Australien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Aserbajdsjan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Hviderusland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnien & Hercegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brasilien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgarien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Cambodja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Cameroun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Canada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Kap Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centralafrikanske Republik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Tchad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Chile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Kina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Columbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comorerne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, Den Demokratiske Republik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Elfenbenskysten"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Kroatien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Cuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Cypern"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Tjekkiske Republik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Danmark"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibouti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominikanske Republik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egypten"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Ækvatorial Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estland"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Frankrig"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Tyskland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haiti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kasakhstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirgisistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Letland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Libanon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Litauen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxembourg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Makedonien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagaskar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malaysia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Marshalløerne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauretanien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauritius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Mikronesien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldova"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongoliet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Marokko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambique"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Holland"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "New Zealand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norge"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palæstina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Ny Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filippinerne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Rumænien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rusland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts & Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent & Grenadinerne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome og Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Saudi-Arabien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychellerne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovakiet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Salomonøerne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Sydafrika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Spanien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Sverige"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Schweiz"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Syrien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadsjikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thailand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Østtimor)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad & Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunesien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Tyrkiet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukraine"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "De Forenede Arabiske Emirater"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Storbritannien"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "USA"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Usbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatikanet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Vestsahara"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albanien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algeriet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Østrig"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Etiopien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Grækenland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Ungarn"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Island"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "Indien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Nordkorea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Sydkorea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libyen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldiverne"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mexico"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Myanmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Indsend en fejlrapport"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia stødte på en fejl og måtte lukke"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Genstart Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Undlad at genstarte"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Ikke i stand til at genstarte Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
-"Vi kunne ikke automatisk genstarte Vidalia. Venligst genstart Vidalia "
-"manuelt."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Udfyld en formular:"
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
msgstr ""
-"Et nedbrudsrapport er blevet oprettet, som du kan sende til Vidalia "
-"udviklere til at hjælpe med at identificere og løse problemet. Rapporten "
-"indeholder ikke personligt identificerbare oplysninger."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
-"med en beskrivelse af, hvad du gjorde, før ansøgningen styrtede ned, sammen "
-"med følgende filer, der svarer til rapporten:"
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Program filer (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Vælg Stien til Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Vælg Proxy Programfil"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Du skal angive navnet på din Tor programfil."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Start Vidalia når mit system starter"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Gennemse"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Start Tor når Vidalia starter"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Proxy Program (valgfri)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Start et proxy program når Tor starter"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Proxy Program Argumenter:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Software-opdateringer"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Tjek efter nye software-opdateringer automatisk"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Tjek nu"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Modt:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Sendt:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Angivne XML fil er ikke et gyldigt indholdsdokument"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "Søgning har nået slutning af dokument"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "Søgning har nået start af dokument"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Tekst ikke fundet i dokument"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Fundet %1 resultat(er)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Vidalia Hjælp"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Tilbage"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Gå til sidste side (Slet)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Slet"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Frem"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Gå til næste side (Skift+Slet)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Skift+Slet"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Hjem"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Gå til Hjem-siden (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Find"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Søg efter et ord eller en frase på denne side (Ctrl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Luk"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Luk Vidalia Hjælp"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Find:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Find Sidste"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Find Næste"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Versalfølsomt"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Kun hele ord"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Hjælpe-emner"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Indhold"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Søg"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Søger efter:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Fundne Dokumenter"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Fejl under indlæsning af Hjælpe-indhold:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Åbner Eksternt Link"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1547,562 +1537,423 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Vidalia kan åbne det valgte link i din standart Internet Browser. Hvis din "
-"browser ikke er opsat til at anvende Tor, vil din anmodning ikke være "
-"anonym. "
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Skal Vidalia åbne linket i din Internetbrowser?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Kan ikke Åbne Linket"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia kunne ikke åben det valgte link i din Internetbrowser. Du kan stadig"
-" kopiere URLen og paste den ind i din browser."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Fejl ved åbning af hjælpefil"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Licens-information"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licens"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Tak til"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Fejlsøg"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Bemærk"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Fejl"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Ukendt"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Fejlsøg"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Bemærk"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Fejl"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Ukendt"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Start Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Afslut"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Båndbredde-graf"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Beskedlog"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Netværksoversigt"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Kontrolpanel"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Indstillinger"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "Om"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Hjælp"
+msgstr ""
msgctxt "MainWindow"
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"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Se"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Hjælp"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Fejl ved start af Internetbrowser"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia kunne ikke starte den konfigurerede internetbrowser"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Fejl ved start af IM klient"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia kunne ikke starte den konfigurerede IM klient"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Fejl ved start af proxy server"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia kunne ikke starte den konfigurerede proxy server"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Tilslutter til relæ mappe"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Opretter en krypteret mappe forbindelse"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Henter netværk status"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Henter netværk status"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Henter nøglecentercertifikater"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Beder om relæ information"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Henter relæ information"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Forbinder til Tor netværk"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Opretter et Tor kredsløb"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Forbundet til Tor netværket!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Ukendt startop status"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "diverse"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "identitet matcher ikke"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "færdig"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "forbindelse afvist"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "forbindelse timeout"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "læs/skriv fejl"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "ingen rute til vært"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "utilstrækkelige ressourcer"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "ukendt"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor kører ikke"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor er ved at lukke ned"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Stop Tor Nu"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Stop Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Starter Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Starter Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Mislykket Tor Start"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"Vidalia kunne ikke starte Tor. Kontroller dine indstillinger for at sikre, "
-"at din Tor programfil er korrekt angivet med navn og placering."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Forbinder til Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Forbindelse mislykkedes"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Genudlægning er aktiveret"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Fejl ved Nedlukning"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia kunne ikke stoppe Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Uforventet fejl"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Godkender til Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie Godkendelse Påkrævet"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"Tor kræver at Vidalia sender indholdet af en godkendelses-cookie, men "
-"Vidalia var i stand til at finde en."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "Vil du kigge efter filen 'control_auth_cookie' selv?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Data Mappe"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Kontrol Cookie (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Fejl Registrering af Begivenheder"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Vidalia kunne ikke registrere bestemte begivenheder. Mange af Vidalia's "
-"funktioner kan være utilgængelige."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Godkendelsesfejl"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia kunne ikke godkende Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Tjek venligst din kontrolports godkendelses indstillinger."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Tor Opdatering Tilgængelig"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"Den nuværende installation af Tor er enten for gammel eller ikke længere "
-"anbefalelsesværdig. Besøg venligst hjemmesiden for Tor og hent den nyeste "
-"version."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor hjemmeside: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
-"Alle efterfølgende forbindelser vil synes at være anderledes end dine gamle "
-"forbindelser."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Mislykkedes af Oprette Ny Identitet"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Port Viderestilling Mislykkedes"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia kunne ikke opsætte automatisk port viderestilling."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia Kontrolpanel"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Status"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Genveje"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Indstil Relæ\n"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Opsæt et relæ and hjælp netværket gro"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Se Netværket"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Se et kort over Tor netværket"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Brug en Ny Identitet"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Få efterfølgende forbindelse til at se nye ud"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Vis seneste båndbredde"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Se log-besked historie"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Se hjælpe dokumentation"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Indstil Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Se version og licens information"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Afslut Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Vis vinduet ved opstart"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Skjul"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Skjul dette vindue"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Nulstil Kodeord Mislykkedes"
-
-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øvede at nulstille Tors kontrol kodeord, men kunne ikke genstarte "
-"programmet. Kontroller venligst, at der ikke køre nogle Tor processer i din "
-"Jobliste."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"Den aktuelt installerede version af Tor er forældet eller kan ikke længere "
-"anbefales."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
msgstr ""
-"Vil du gerne se, om der er en nyere pakke tilgængelig for installation?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Potentielt set usikker forbindelse"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"Tor har automatisk lukket din forbindelse for at beskytte din anonymitet."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Opdatering mislykkedes"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Din software er opdateret"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"Der er ingen nye Tor-softwarepakker tilgængelige til din computer på "
-"nuværende tidspunkt."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Installation mislykkedes"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
msgstr ""
-"Vidalia var ude af stand til at installere dine software-opdateringer."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Følgende fejl opstod:"
+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 ""
@@ -2110,25 +1961,34 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"Alt som sendes over denne forbindelse vil kunne overvåges. Tjek venligst din"
-" applikations konfiguration og brug kun krypterede protokoller, såsom SSL, "
-"om muligt."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "mislykkedes (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"Deres relæ er ved at lukke. \n"
-"Klik på 'Stop' igen for at stoppe din relæ nu."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootsstrapper torrc fra %1 til %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2136,9 +1996,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Du har i øjeblikket et relæ kørende. Afbrydelse af dit relæ vil forstyrre alle åbne klientforbindelser.\n"
-"\n"
-"Vil du gerne lukke taktfuldt og give klienterne tid til at finde nye relæer?"
msgctxt "MainWindow"
msgid ""
@@ -2146,309 +2003,310 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia registrerede at Tor-softwaren uventet blev afsluttet.\n"
-"\n"
-"Tjek venligst beskedloggen for seneste advarsler eller fejlbeskeder."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(måske Telnet)"
+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 "(probably an email client)"
-msgstr "(måske en email klient)"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 ""
-"En af dine applikationer %1 synes at være ved at lave en potentielt "
-"ukrypteret og usikre forbindelse til port %2."
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "Fejl ved Indstilling af Filter"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia var i stand til at registrere for Tor's log begivenheder."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Fejl ved Åbning af Logfil"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia kunne ikke åbne den angivne logfil."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Log Filnavn Påkrævet"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "Do skal angive et filnavn for at kunne gemme log beskeder til en fil."
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Vælg Log Fil"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Gem Log Besked"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Tekst Filer (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Find i Besked Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Find:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Ikke Fundet"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "Søgning fandt 0 resultater."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Besked Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Besked Filtre..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Indstil besked filtre"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Historie Størrelse..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Angiv hvor mange beskeder der skal vises"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Ryd"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Ryd alle beskeder fra Besked Loggen (Ctrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Kopier"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Kopier den valgte besked til udklipholderen (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Vælg alle"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Vælg alle beskeder (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Gem Alle"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Gem alle beskeder til en fil"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Gem Valgte"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Gem valgte beskeder til en fil"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Indstillinger"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Juster Logbesked Instillingerne"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Hjælp"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Vis hjælp browseren"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Luk"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Luk Besked Loggen"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Find"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Find alle beskeder indeholdende søge teksten (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Tid"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Type"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Besked"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Gemmer de nuværende Logbesked instillinger"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Gem Indstillinger"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Annullerer ændringer foretaget i indstillingerne"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Annuller"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Besked Filter"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Fejl"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Meddelelse"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Logbesked Historie"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Antal beskeder der skal vises i logbesked vinduet"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "beskeder"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Gennemse"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "Aktiver automatisk at gemme alle nye log-meddelelser til en fil"
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Gem automatisk nye log-meddelelser til en fil"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Grundlæggende"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor status"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avanceret"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Gem Altid Nye Log Beskeder"
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Beskeder som fremkommer når noget er gået\n"
-"meget galt og hvor Tor ikke kan forsætte."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Beskeder som kun fremkommer når\n"
-"noget er gået galt med Tor."
msgctxt "MessageLog"
msgid ""
@@ -2457,26 +2315,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Beskeder som fremkommer mindre hyppigt \n"
-"under normal Tor-brug og som ikke kan \n"
-"betragtes som fejl, men som du kan være\n"
-"interesseret i."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Beskeder som fremkommer hyppigt \n"
-"under normal brug af Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Meget detaljerede beskeder som primært\n"
-"har interesse for Tor-udviklere."
msgctxt "MessageLog"
msgid ""
@@ -2484,826 +2334,802 @@ msgid ""
"\n"
"%2."
msgstr ""
-"Kan ikke skrive til %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Netværksoversigt"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Genopfrisk"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Genopfrisk listen med Tor-relæer og -forbindelser"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Hjælp"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Vis netværkoversigts-hjælpen"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Vis netværksoversigts-hjælp"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Luk"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Luk netværksoversigten"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Zoom Ind"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Zoom ind på netværksoversigten"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Zoom Ud"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Zoom ud på netværksoversigten"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Zoom til at Passe"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Zoomer til at passe for alle pt. viste relæ"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Relæ ikke fundet"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Ingen tilgængelige detaljer om valgte relæ."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Ukendt"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Fuld skærm"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Vis netværkoversigten som fuldskærm-vindue"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "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 "Ugyldig Bro"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "Den angivne bro identifikator er ikke gyldigt."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Kopier (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Du skal angive både IP adresse eller værts navn og en port, for at indstille"
-" Tor til at bruge en proxy som forbindelse til Internettet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Du skal angive en eller flere porte, som din firewall tillader dig at "
-"tilslutte."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' er ikke et accepteret port nummer."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
-"Kontroller, om dit lokale netværk kræver en proxy for at få adgang til "
-"Internettet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Jeg bruger en proxy for at forbinde til Internettet"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Proxy Indstillinger"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Brugernavn:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Kodeord:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Kryds for kun at forbinde til relæer der benytter porte godkendt af din "
-"firewall"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Min firewall lader mig kun forbinde til specifikke porte"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Firewall Indstillinger"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Tilladte Porte:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"Kryds for at kryptere mappe anmodninger, og eventuelt bruge bro relæer til "
-"at få adgang til Tor nettet"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Min udbyder (ISP) blokerer forbindelse til Tor netværket"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Bro Indstillinger"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Tilføj en Bro:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Fjern den valgte bro fra listen"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Kopier den valgte bro til udklipsholderen"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Find broer nu"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Hvordan kan jeg også finde broer?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Hvordan kan jeg finde broer?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Ingen nye broer er tilgængelige i øjeblikket. Du kan enten vente en stund og"
-" forsøge igen, eller forsøge at finde nye broer med en anden metode."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Klik Hjælp for at se andre metoder til at finde nye broer."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Adresse:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Type:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Du skal vælge proxy-typen:"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "godkend"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "afvis"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Dvale"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Placering:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP-adresse:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Platform:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Båndbredde:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Oppetid:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Sidst Opdateret:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Kopier"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "I dvale"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Ukendt"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Detaljer om relæ"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Opsummering"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Navn:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Status:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Placering:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "IP-adresse:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Platform:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Båndbredde:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Oppetid:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Kontakt:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Senest opdateret:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Deskriptor"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "I Dvale"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Relæ"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zoom til Relæ"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 relæer online"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Kopier"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Kaldenavn"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Fingeraftryk"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Bro Support er Ikke Tilgælgelig"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Du har konfigureret Tor til at fungere som en relæ-bro for censureret "
-"brugere, men din version af Tor understøtter ikke broer."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Du skal opgradere din Tor software eller konfigurere Tor til at fungere som "
-"et normalt Tor relæ."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Din relæ-bro kører ikke"
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Du skal angive mindst et kaldenavn og port."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Kør kun som en klient"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relæ trafik til Tor netværket"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Relæ Port:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Tænd for at afbillede relæ mappe"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Forsøg at indstille automatisk port viderestilling"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Vis hjælp emner om viderestilling af porte"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Mappe Port:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Mappe Port Nummer:"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Kontakt Info:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Navnet på dit relæ"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr "Port hvor brugere og andre relæer kan kommunikere med dit relæ"
+msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Kaldenavn:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Grundlæggende indstillinger"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"For internetforbindelser med hurtig download hastighed, men langsom upload, "
-"skal du angive din upload hastighed her."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Kabel/DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Kabel/DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Kabel/DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Kabel/DSL 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Tilpasset"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Vælg den adgang, der mest ligner din internetforbindelse"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Vis hjælp emner om båndbrede grænser"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Gennemsnitlig"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Langsigtede gennemsnit båndbredde grænse"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Maksimal Hastighed"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Peak båndbrede grænse"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"Dit maksimale båndbredde grænse skal være større end eller lig med din "
-"gennemsnitlige båndbredde grænse. Begge værdier skal være mindst 20 kb/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Båndbrede Grænser"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Porte 6660 - 6669 og 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relæ Chat (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Porte 110, 143, 993 og 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Modtag Mail (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Porte uspecificerede af andre afkrydsningsfelter"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Diverse Andre Tjenester"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Porte 706, 1863, 5050, 5190, 5222, 5223, 8300 og 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Instant Messaging (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Port 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Sikker Hjemmeside (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Port 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Hjemmeside"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Vis hjælpe emne om afslutningspolitikker"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
-"Hvilke Internet ressourcer skal brugere kunne få adgang til fra dit relæ?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Tor vil stadig blokere nogle udgående post og fildeling applikationer som "
-"standard for at reducere spam og anden misbrug."
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "Afslutningspolitikker"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Lad andre få adgang til din bro ved at give dem denne linje:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
-"Dette er identiteten af dit bro relæ, som du kan give til andre mennesker"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Kopier dit bro relæs identitet til udklipsholderen"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Intet nyligt forbrug"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Ingen klienter har brugt dit relæ for nylig."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Efterlad dit relæ kørende, så klienter har bedre chance for at finde og "
-"anvende det."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Historik for bro"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
-"Vidalia var ikke i stand til at indhente forbrugshistorik for din bro."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor returnerede et ukorrekt formatteret svar, da Vidalia forespurgte din "
-"bros forbrugshistorik."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Det returnerede svar var: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Hjælp censurerede bruger med at nå Tor-netværket"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Hvem har anvendt min bro?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Hvad er dette?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Distribuer automatisk min bro-adresse"
+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 "Spejl relækataloget"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Epost-adressen som du kan kontakte, hvis der er et\n"
-"problem med dit relæ. Du kan også inkludere din PGP- eller GPG-fingeraftryk."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Fejl under forsøg på at annullere udgivelsen af alle tjenester"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Opsæt mindst en tjeneste mappe og en virtuel port for hver tjeneste du vil "
-"gemme. Fjern de andre."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Fejl"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Vælg venligst en Tjeneste."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Vælg en Service Mappe"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtuel Port må kun indeholde godkendte port numre [1...65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Målet kan kun indeholde adresse: port, adresse, eller port."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Mappen er allerede i brug af en anden tjeneste."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Form"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Angivne Skjulte Tjenester"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Onion Adresse"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Virtuel Port"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Mål"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Mappe Sti"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Aktiveret"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Tilføj en ny tjeneste til listen"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Fjern den valgte tjeneste fra listen"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopier onion adresse fra den valgte tjeneste til udklipsholderen"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "Gennemse lokale filsystem og vælg bibliotek til udvalgte tjenester"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Lavet af Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Kopier til udklipsholder"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor-programmelet er kørende"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Den aktuelt kørende version \"%1\" af Tor-programmelet."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor-programmelet kører ikke"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3311,9 +3137,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"Klik \"Start Tor\" i Kontrolpanelet for Vidalia for at genstarte Tor-"
-"programmelet. Hvis Tor afsluttede uventet, så vælg \"Avanceret\"-fanen "
-"ovenfor for detaljer om hvilke fejl som opstod."
msgctxt "StatusEventWidget"
msgid ""
@@ -3322,9 +3145,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere "
-"anbefales. Opgradér venligst til den seneste version af softwaren, der kan "
-"indeholde vigtige rettelser vedrørende sikkerhed, pålidelighed og ydelse."
msgctxt "StatusEventWidget"
msgid ""
@@ -3333,39 +3153,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere "
-"fungerer med det nuværende Tor-netværk. Opgradér venligst til den seneste "
-"version af softwaren, der kan indeholde vigtige rettelser vedrørende "
-"sikkerhed, pålidelighed og ydelse."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Din Tor-software er forældet"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Forbundet til Tor-netværket"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"Vi var i stand til succesfuldt at etablere en forbindelse til Tor-netværket."
-" Du kan nu konfigurere dine applikationer til at anvende Internettet "
-"anonymt."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Softwarefejl i Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"Tor-softwaren stødte på en intern fejl. Rapportér venligst den følgende "
-"fejlbesked til Tor-udviklerne på bugs.torproject.org: \"%1\"\n"
msgctxt "StatusEventWidget"
msgid ""
@@ -3374,10 +3185,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Tor af afgjort at din maskines ur kan sætte til %1 sekunder tilbage i tid "
-"sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor "
-"ikke være i stand til at fungere. Bekræft venligst at maskinen viser den "
-"korrekte tid."
msgctxt "StatusEventWidget"
msgid ""
@@ -3386,14 +3193,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Tor af afgjort at din maskines ur kan sætte til %1 sekunder frem i tid "
-"sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor "
-"ikke være i stand til at fungere. Bekræft venligst at maskinen viser den "
-"korrekte tid."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Din maskines ur går muligvis forkert."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3402,10 +3205,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret"
-" forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information "
-"over Tor-netværket er farligt og anbefales ikke. For din egen beskyttelse, "
-"så har Tor automatisk lukket denne forbindelse."
msgctxt "StatusEventWidget"
msgid ""
@@ -3413,13 +3212,10 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret"
-" forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information "
-"over Tor-netværket er farligt og anbefales ikke."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potentielt farlig forbindelse!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3428,14 +3224,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"En af dine applikationer etablerede en forbindelse via Tor til \"%1\" ved "
-"hjælp af en protokol, der kan lække oplysninger om din destination. Sørg "
-"venligst for at konfigurere dine applikationer til kun at bruge SOCKS4a "
-"eller SOCKS5 med fjern værtsnavnsopløsning."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Ukendt SOCKS protokol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3443,14 +3235,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"En af dine applikationer forsøgte at etablere en forbindelse via Tor ved "
-"hjælp af en protokol, som Tor ikke forstår. Sørg venligst for at konfigurere"
-" dine applikationer til kun at bruge SOCKS4a eller SOCKS5 med fjerne "
-"værtsnavnopløsning."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Ugyldigt værtsnavn for destination"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3458,13 +3246,10 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"En af dine applikationer forsøgte at etablere en forbindelse gennem Tor til "
-"\"%1\", hvilken Tor ikke genkender som gyldigt værtsnavn. Tjek venligst din "
-"applikations konfiguration."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Ekstern IP-adresse ændrede sig"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3472,13 +3257,10 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
-"Tor har detekteret at dit relæs offentlige IP-adresse i øjeblikket er %1%2. "
-"Hvis dette ikke er korrekt, så overvej venligst at ændre indstillingen "
-"'Adresse' i dit relæs konfiguration."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS-kapring blev opdaget"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3486,9 +3268,6 @@ 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 har detekteret at din DNS-udbyder udbyder falske svar for domæner som "
-"ikke eksisterer. Nogle internetudbydere, såsom OpenDNS, er kendt for at gøre"
-" dette for at kunne vise deres egen søgefunktion eller reklamesider."
msgctxt "StatusEventWidget"
msgid ""
@@ -3496,13 +3275,10 @@ 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 har detekteret at din DNS-udbyder udbyder falske svar for velkendte "
-"domæner. Da klienter afhænger af at Tor-netværkets relæer tilbyder akkurate "
-"DNS-svar, så vil det relæ ikke blive konfigureret som et udgående relæ."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Tjekker serverports tilgængelighed"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3510,21 +3286,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"Tor forsøger at afgøre om dit relæs serverport er tilgængelig fra Tor-"
-"netværket ved selv at tilslutte sig på %1:%2. Denne test kan tage flere "
-"minutter."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Test af serverports tilgængelighed var succesfuld!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Dit relæs serverport er tilgængelig fra Tor-netværket!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Test af serverports tilgængelighed mislykkedes!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3533,14 +3306,10 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
-"Dit relæs serverport er ikke tilgængelig for andre Tor-klienter. Dette kan "
-"ske når du er bag en router eller brandmur som kræver at du opsætter port-"
-"videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og serverport, så"
-" tjek venligst dit relæs konfiguration."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Tjekker katalogportens tilgængelighed."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3548,21 +3317,18 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
-"Tor forsøger at afgøre om dit relæs katalogport er tilgængelig fra Tor-"
-"netværket ved selv at tilslutte på %1:%2. Denne test kan tage flere "
-"minutter. "
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Test af katalogports tilgængelighed var succesfuld! "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Dit relæs katalogport er tilgængeligt fra Tor-netværket!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Test af katalogports tilgængelighed mislykkedes "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3571,27 +3337,20 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
-"Dit relæs katalogport er ikke tilgængeligt fra andre Tor-klienter. Dette kan"
-" ske hvis du er bag en router eller brandmur som kræver at du opsætter port-"
-"videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og katalogport, "
-"så tjek venligst dit relæs konfiguration."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Relæ-deskriptor afvist"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"Dit relæs deskriptor, der gør det muligt for klienter at forbinde til dit "
-"relæ, blev afvist af katalogserveren på %1:%2. Begrundelsen som blev givet "
-"var: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Dit relæ er online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3600,366 +3359,406 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-"Dit relæ er nu online og tilgængelig for anvendelse af Tor-klienter. Du bør "
-"kunne se en forøgelse i netværkstrafikken vist med Båndbredde-grafen inden "
-"for få timer i takt med at flere klienter finder frem til dit relæ. Tak for "
-"dit bidrag til Tor-netværket\"!"
+
+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"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Finder"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Forbinder"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Åben"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Mislykkedes"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Lukket"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Prøver igen"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Genmapped"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Ukendt"
+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 "Tjeneste %1 mislykkedes at stoppe. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Tor tjenesten er ikke installeret."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Kan ikke starte Tor tjenesten."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Kunne ikke finde hash-værdi af kodeordet."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Redigerer torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
-"Gem indstillinger. Hvis umarkeret vil de kun blive anvendt på den aktuelle "
-"Tor-instans."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Klip"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Kopier"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Indsæt"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Fortryd"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Gentag"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Marker alle"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Anvend alle"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Anvend kun markerede"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Fejl ved tilslutning til Tor"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Markering er tom. Vælg venligst noget tekst, eller marker \"Anvend alle\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Fejl på linje %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Fejl"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "En fejl opstod under åbning af filen torrc"
+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 "Succes"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Ingen UPnP-aktiverede enheder fundet"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Ingen gyldige UPnP-aktiverede Internet gateway enheder fundet"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartop mislykkedes"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Det lykkedes ikke at tilføje en port angivning"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Det lykkedes ikke at hente en port angivning"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Det lykkedes ikke at fjerne en port angivning"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Ukendt fejl"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Søger efter UPnP-aktiverede enheder"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Opdaterer mappe port angivninger"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Opdaterer relæ port angivninger"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Test gennemført succesfuldt!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Tester UPnP Understøttelse"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Tester Universal Plug & Plug Understøttelse"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Vidalia var ude af stand til at søge efter tilgængelige "
-"softwareopdateringer, fordi det ikke kunne finde '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Vidalia var ude af stand til at søge efter tilgængelige "
-"softwareopdateringer, fordi Tor's opdateringsproces afsluttede uventet."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Tjekker om der er tilgængelige opdateringer ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Skjul"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Henter opdateringer..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Installerer opdateret programmel..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Færdig! Din software er nu opdateret."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Software-opdateringer"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Tjekker for opdateringer..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Fortryd"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Tilgængelige software-opdateringer"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Påmind mig senere"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Installér"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Følgende opdaterede softwarepakker er klar til installation:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Pakke"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Version"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Annuller"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Ja"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "Nej"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Hjælp"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Forsøg igen"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Vis Log"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Vis Indstillinger"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Fortsæt"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Afslut"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Gennemse"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Argumentet er ugyldigt"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia kører allerede"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Viser denne brugs beskeder og afslutter."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Nulstiller ALLE gemte Vidalia indstillinger."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Indstiller mappen som Vidalia bruger til data filer."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Indstiller navn og placering af Vidalias profil."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Indstiller navn og placering af Vidalias logfil."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Indstiller mængden af data Vidalia logger."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Indstiller Vidalias græseflade stil."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Indstiller Vidalias sprog."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Vidalia Forbrugs Information"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Kunne ikke åbne log fil '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Værdi krævet fra parameter:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Ugyldigt angivet sprogkode:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Ugyldigt angivet stil for grafisk brugerfladet:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Ugyldigt angivet logniveau:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3967,40 +3766,35 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"En anden Vidalia-proces kører muligvis allerede. Hvis der ikke kører andre processer, så kan du vælge alligevel at fortsætte.\n"
-"\n"
-"Vil du gerne fortsætte med at starte Vidalia? "
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 sek."
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 B/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 MB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 GB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 dage"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 timer"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 min."
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/de/qt_de.po b/src/vidalia/i18n/po/de/qt_de.po
index 6aac76f..92d9536 100644
--- a/src/vidalia/i18n/po/de/qt_de.po
+++ b/src/vidalia/i18n/po/de/qt_de.po
@@ -1,13 +1,10 @@
#
-# Translators:
-# Hendrik Richter <hendrikr at gnome.org>, 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-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -445,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 Byte"
-
-
diff --git a/src/vidalia/i18n/po/de/vidalia_de.po b/src/vidalia/i18n/po/de/vidalia_de.po
index afda12e..10d5c10 100644
--- a/src/vidalia/i18n/po/de/vidalia_de.po
+++ b/src/vidalia/i18n/po/de/vidalia_de.po
@@ -1,15 +1,13 @@
#
# Translators:
-# bastik <bastik.tor at googlemail.com>, 2011.
-# cosimacosa <leccefv at libero.it>, 2011.
-# Hendrik Richter <hendrikr at gnome.org>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
+# Sacro <Razor30 at web.de>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-13 23:02+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: Sacro <Scion at T-Online.de>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -46,9 +44,7 @@ msgstr "'%1' ist keine gültige IP-Adresse."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Sie haben 'Passwort'-Authentifizierung ausgewählt, aber kein Passwort "
-"angegeben."
+msgstr "Sie haben 'Passwort'-Authentifizierung ausgewählt, aber kein Passwort angegeben."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -120,8 +116,7 @@ msgstr "Tor-Konfigurationsdatei"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Starte die Tor-Software mit der angegebenen Konfigurationsdatei (torrc)"
+msgstr "Starte die Tor-Software mit der angegebenen Konfigurationsdatei (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -141,9 +136,7 @@ msgstr "Speichere Daten für die Tor-Software im folgenden Verzeichnis"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Wählen Sie das Verzeichnis, das verwendet wird, um Daten für die Tor-"
-"Software zu speichern"
+msgstr "Wählen Sie das Verzeichnis, das verwendet wird, um Daten für die Tor-Software zu speichern"
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -177,19 +170,13 @@ msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, "
-"die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht "
-"dargestellt werden können."
+msgstr "Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht dargestellt werden können."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, "
-"die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht "
-"dargestellt werden können."
+msgstr "Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht dargestellt werden können."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -208,18 +195,11 @@ msgid "Select a file to use for Tor socket path"
msgstr "Wählen Sie eine Datei für die Verwendung von Tor Socket Pfad"
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Konfiguriere den Kontroll-Port automatisch."
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia konnte den Tor-Dienst nicht entfernen\n"
-"\n"
-"Sie müssen diesen manuell entfernen."
+msgstr "Vidalia konnte den Tor-Dienst nicht entfernen\n\nSie müssen diesen manuell entfernen."
msgctxt "AppearancePage"
msgid "Language"
@@ -254,10 +234,6 @@ msgid "Show Settings"
msgstr "Zeige Einstellungen"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Bandbreitennutzung von Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Zurücksetzen"
@@ -297,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Abbrechen"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Bandbreiten-Diagramm"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Starte HTTPS-Anfrage..."
@@ -335,8 +315,7 @@ msgstr "Anzahl der Clients"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"Rechner aus den folgenden Ländern haben deinen Tor-Server seit %1 benutzt"
+msgstr "Rechner aus den folgenden Ländern haben deinen Tor-Server seit %1 benutzt"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
@@ -451,20 +430,27 @@ msgid "Control socket is not connected."
msgstr "Kontrollsocket ist nicht verbunden."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Password wird benötigt"
+msgid "Problem connecting to Tor"
+msgstr "Probleme sich mit Tor zu Verbinden"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Mein Passwort speichern"
+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 "Vidalia kann sich nicht mit Tor verbinden, obwohl Tor bereits ausgeführt wird.\n\nDas kann passieren wenn etwas anderes (wie ein anderer Vidalia-Prozess oder ein Vidalia-Prozess der abgestürzt ist) Tor gestartet hatt."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia hat sich zu einem laufenden Tor-Prozess verbunden, der ein Passwort "
-"benötigt. Bitte gib das Kontroll-Passwort ein:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Du musst den Tor-Prozess beenden, bevor Vidalia einen neuen starten kann."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia kann versuchen, Tor für dich neu zu Starten. Dieses würde alle, im Momment aktiven, Verbindungen deines Tor-Prozesses schließen."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1287,6 +1273,24 @@ msgid "Vidalia encountered an error and needed to close"
msgstr "Vidalia hat einen Fehler entdeckt und muss geschlossen werden."
msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Ein Fehlerbericht wurde erstellt. Sie können diesen automatisch an die Vidalia-Entwickler senden und damit zur Identifizierung und zur Lösung des Problems beitragen. Der Bericht enthält keine persönlichen Identifizierungsinformationen, nur die Verbindung zum Fehlerreport-Server könnte nicht anonym sein."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Bitte beschreiben Sie auch was passiert ist, bevor das Programm abgestürzt ist (optional):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Sende meinen Fehlerbericht an die Vidalia-Entwickler"
+
+msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
msgstr "Vidalia neu starten"
@@ -1302,39 +1306,19 @@ msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Leider konnte Vidalia nicht automatisch neu gestartet werden. Bitte starten "
-"Sie Vidalia händisch neu."
+msgstr "Leider konnte Vidalia nicht automatisch neu gestartet werden. Bitte starten Sie Vidalia händisch neu."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Bitte erstelle ein ticket bei:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Verbinde..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Ein Crash-Bericht wurde erstellt, den du an die entwickler von Vidalia "
-"senden kannst, damit das Problem schneller erkannt und beseitigt werden "
-"kann. Der gesendete Bericht enthält keine Persöhnlichen Informationen."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Sende Fehlerbericht..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"mit einer Beschreibung was sie getan haben bevor die Anwendung abgestürzt "
-"ist, zusammen mit den folgenden Dateien, die zu dem Bericht gehören:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Empfange Antwort..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1361,10 +1345,6 @@ 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"
@@ -1392,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Jetzt prüfen"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Automatisch zu Tor verbinden"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1553,10 +1537,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia kann den gewählten Link in Ihrem Standard-Webbrowser öffnen. Wenn "
-"der Browser jedoch nicht für die Nutzung von Tor konfiguriert ist, wird die "
-"Anfrage nicht anonym sein."
+msgstr "Vidalia kann den gewählten Link in Ihrem Standard-Webbrowser öffnen. Wenn der Browser jedoch nicht für die Nutzung von Tor konfiguriert ist, wird die Anfrage nicht anonym sein."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1570,9 +1551,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia konnte den gewählten Link nicht im Webbrowser öffnen. Sie können "
-"aber die URL kopieren und sie in Ihrem Browser einfügen."
+msgstr "Vidalia konnte den gewählten Link nicht im Webbrowser öffnen. Sie können aber die URL kopieren und sie in Ihrem Browser einfügen."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1679,34 +1658,6 @@ 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"
@@ -1715,10 +1666,6 @@ 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"
@@ -1831,10 +1778,6 @@ 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"
@@ -1854,9 +1797,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia konnte Tor nicht starten. Überprüfen Sie Ihre Einstellungen, um "
-"sicherzustellen, dass der Pfad zur Tor-Anwendung korrekt angegeben ist."
+msgstr "Vidalia konnte Tor nicht starten. Überprüfen Sie Ihre Einstellungen, um sicherzustellen, dass der Pfad zur Tor-Anwendung korrekt angegeben ist."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1894,10 +1835,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Die Tor-Software fordert Vidalia dazu auf den Inhalt eines "
-"Authentifizierungskennworts zu schicken, aber Vidalia konnte kein solches "
-"finden."
+msgstr "Die Tor-Software fordert Vidalia dazu auf den Inhalt eines Authentifizierungskennworts zu schicken, aber Vidalia konnte kein solches finden."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1919,24 +1857,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia konnte sich für einige Ereignisse nicht registrieren. Einige von "
-"Vidalias Funktionen könnten nicht verfügbar sein."
-
-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."
+msgstr "Vidalia konnte sich für einige Ereignisse nicht registrieren. Einige von Vidalias Funktionen könnten nicht verfügbar sein."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1946,10 +1867,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. "
-"Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu "
-"laden."
+msgstr "Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu laden."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1959,8 +1877,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Alle folgenden Verbindungen werden anders als alte Verbindungen erscheinen."
+msgstr "Alle folgenden Verbindungen werden anders als alte Verbindungen erscheinen."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1983,97 +1900,19 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Schnellzugriff"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Weiterleitung einrichten"
-
-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 ""
-"Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. "
-"Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu "
-"laden."
+msgstr "Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu laden."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Wollen Sie überpüfen, ob eine neuere Version zur Installation verfügbar ist?"
+msgstr "Wollen Sie überpüfen, ob eine neuere Version zur Installation verfügbar ist?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
@@ -2083,9 +1922,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor hat Ihre Verbindung automatisch geschlossen, um Ihre Anonymität zu "
-"schützen."
+msgstr "Tor hat Ihre Verbindung automatisch geschlossen, um Ihre Anonymität zu schützen."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2115,65 +1952,90 @@ msgstr "Der folgende Fehler ist aufgetreten:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Eines Ihrer Programme%1a scheint eine potenziell unverschlüsselte und unsichere Verbindung zu Port %2 herzustellen."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. "
-"Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie "
-"wenn möglich nur verschlüsselte Protokolle wie SSL. "
+msgstr "Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie wenn möglich nur verschlüsselte Protokolle wie SSL. "
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fehlgeschlagen (%1)"
+msgid "toolBar"
+msgstr "toolBar"
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."
+msgid "Start"
+msgstr "Start"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Stop"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Neustart"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Lade Tor's config neu"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Aktionen"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc von %1 zu %2"
+msgstr "Bootstrapping torrc von %1 auf %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Momentan läuft bei Ihnen eine Tor-Brücke. Wenn Sie diese beenden, werden alle darüber aktiven Verbindungen unterbrochen.\n"
-"\n"
-"Wollen Sie durch ein angekündigtes Beenden den verbundenen Rechnern die Möglichkeit geben eine andere Tor-Brücke zu finden? (das kann etwas dauern)"
+msgstr "Momentan läuft bei Ihnen eine Tor-Brücke. Wenn Sie diese beenden, werden alle darüber aktiven Verbindungen unterbrochen.\n\nWollen Sie durch ein angekündigtes Beenden den verbundenen Rechnern die Möglichkeit geben eine andere Tor-Brücke zu finden? (das kann etwas dauern)"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia entdeckte dass Tor unerwartet beendet wurde.\n"
-"\n"
-"Bitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
+msgstr "Vidalia entdeckte dass Tor unerwartet beendet wurde.\n\nBitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(vermutlich Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia hatt versucht, Tor neu zu starten, war aber nicht in der Lage dazu. Bitte überprüf deinen Task-Manager, um sicher zu gehen, dass keine anderen Tor-Prozesse laufen."
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(vermutlich ein Email Client)"
+msgid "failed (%1)"
+msgstr "fehlgeschlagen (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", wahrscheinlich Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", wahrscheinlich ein E-Mail-Programm,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell "
-"unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Ihr Relais wird beendet.\nKlicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Fehler beim neuladen der Konfiguration"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia war nicht in der Lage Tor's Konfiguration neu zu laden"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2197,8 +2059,7 @@ msgstr "Name der Logdatei wird benötigt"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Sie müssen einen Dateinamen angeben, um die Logdaten speichern zu können."
+msgstr "Sie müssen einen Dateinamen angeben, um die Logdaten speichern zu können."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2422,44 +2283,31 @@ msgstr "Öffnen"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Das automatische Speichern aller neuen Nachrichten in eine Datei aktivieren"
+msgstr "Das automatische Speichern aller neuen Nachrichten in eine Datei aktivieren"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
msgstr "Alle neuen Nachrichten automatisch in einer Datei speichern"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Einfach "
-
-msgctxt "MessageLog"
-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 "toolbar"
+msgstr "toolbar"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Meldung, welche erscheint, wenn etwas mit Tor schief \n"
-"gegangen ist, und es nicht mehr weiter laufen kann."
+msgstr "Meldung, welche erscheint, wenn etwas mit Tor schief \ngegangen ist, und es nicht mehr weiter laufen kann."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Meldung, welche nur erscheint, wenn \n"
-"etwas mit Tor schief gegangen ist."
+msgstr "Meldung, welche nur erscheint, wenn \netwas mit Tor schief gegangen ist."
msgctxt "MessageLog"
msgid ""
@@ -2467,41 +2315,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Meldungen, die in unregelmässigen Abständen erscheinen\n"
-"und nicht offensichtlich als Fehler erkennbar sind\n"
-"sollten unkritisch sein. \n"
-"Dennoch sollten Sie diese beachten."
+msgstr "Meldungen, die in unregelmässigen Abständen erscheinen\nund nicht offensichtlich als Fehler erkennbar sind\nsollten unkritisch sein. Dennoch sollten Sie diese beachten."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Meldungen die in regelmäßigen Abständen \n"
-"im laufenden Betrieb erscheinen."
+msgstr "Meldungen die in regelmäßigen Abständen im laufenden\\Betrieb erscheinen."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Extrem aussagekräftige Meldungen die hauptsächlich\n"
-"für Tor Entwickler interessant sind."
+msgstr "Extrem aussagekräftige Meldungen die hauptsächlich\nfür Tor Entwickler interessant sind."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Kann Datei %1 nicht speichern\n"
-"\n"
-"%2"
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor-Netzwerk-Karte"
+msgstr "Kann Datei %1 nicht speichern\n\n%2"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2603,6 +2436,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Strg+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Relais"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Verbindung"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Status"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ungültige Brücke"
@@ -2619,17 +2468,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Sie müssen eine IP-Adresse oder einen Hostnamen und eine Portnummer abgeben,"
-" damit Tor einen Proxy für die Internetverbindung benutzt."
+msgstr "Sie müssen eine IP-Adresse oder einen Hostnamen und eine Portnummer abgeben, damit Tor einen Proxy für die Internetverbindung benutzt."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Sie müssen einen oder mehrere Ports angeben, zu der Ihre Firewall "
-"Verbindungen erlaubt."
+msgstr "Sie müssen einen oder mehrere Ports angeben, zu der Ihre Firewall Verbindungen erlaubt."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2637,9 +2482,7 @@ msgstr "'%1' ist keine gültige Port-Nummer."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Anklicken, wenn Ihr lokales Netzwerk einen Proxy für den Internetzugriff "
-"benötigt"
+msgstr "Anklicken, wenn Ihr lokales Netzwerk einen Proxy für den Internetzugriff benötigt"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2663,9 +2506,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Anklicken, wenn Ihre Firewall nur bestimmte Ports zur Verbindung mit Relays "
-"zulässt"
+msgstr "Anklicken, wenn Ihre Firewall nur bestimmte Ports zur Verbindung mit Relays zulässt"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2687,9 +2528,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Anklicken, damit Anfragen an das Verzeichnis verschlüsselt und Tor-Brücken "
-"zum Zugriff auf das Tor-Netzwerk verwendet werden"
+msgstr "Anklicken, damit Anfragen an das Verzeichnis verschlüsselt und Tor-Brücken zum Zugriff auf das Tor-Netzwerk verwendet werden"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2727,15 +2566,11 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Aktuell sind keine neuen Bridges verfügbar. Sie können entweder warten und "
-"es später erneut versuchen oder andere Methoden versuchen um neue Bridges zu"
-" finden."
+msgstr "Aktuell sind keine neuen Bridges verfügbar. Sie können entweder warten und es später erneut versuchen oder andere Methoden versuchen um neue Bridges zu finden."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Klicken Sie auf Hilfe, um mit anderen Methoden neue Brücken zu finden."
+msgstr "Klicken Sie auf Hilfe, um mit anderen Methoden neue Brücken zu finden."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2921,17 +2756,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Sie haben Tor so konfiguriert, dass es als Brückenverteiler für zensierte "
-"Nutzer dient, aber Ihre Tor-Version unterstützt Brücken nicht."
+msgstr "Sie haben Tor so konfiguriert, dass es als Brückenverteiler für zensierte Nutzer dient, aber Ihre Tor-Version unterstützt Brücken nicht."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Bitte aktualisieren Sie Ihre Tor-Version oder konfigurieren Sie Tor so, dass"
-" es als normaler Verteiler arbeitet."
+msgstr "Bitte aktualisieren Sie Ihre Tor-Version oder konfigurieren Sie Tor so, dass es als normaler Verteiler arbeitet."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2946,10 +2777,6 @@ msgid "Run as a client only"
msgstr "Benutze Tor nur als Client"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Verkehr für das Tor-Netzwerk weiterleiten"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Verteiler-Port:"
@@ -2987,8 +2814,7 @@ msgstr "Name deines Relays"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Port, auf dem andere Benutzer und Relays deinen Relay kontaktieren können"
+msgstr "Port, auf dem andere Benutzer und Relays deinen Relay kontaktieren können"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -3002,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Bei Internetverbindungen mit hoher Downloadgeschwindigkeit aber niedriger "
-"Uploadgeschwindigkeitgeben Sie Ihre Uploadgeschwindigkeit bitte hier an."
+msgstr "Bei Internetverbindungen mit hoher Downloadgeschwindigkeit aber niedriger Uploadgeschwindigkeitgeben Sie Ihre Uploadgeschwindigkeit bitte hier an."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3032,8 +2856,7 @@ msgstr "Benutzerdefiniert"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Wählen Sie den Eintrag der Ihrer Internetverbindung am ehesten entspricht"
+msgstr "Wählen Sie den Eintrag der Ihrer Internetverbindung am ehesten entspricht"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3063,10 +2886,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Ihre maximale Bandbreite muss größer oder gleich groß wie die "
-"durchschnittliche Bandbreite sein. Beide Werte müssen mindestens 20 KB/s "
-"betragen."
+msgstr "Ihre maximale Bandbreite muss größer oder gleich groß wie die durchschnittliche Bandbreite sein. Beide Werte müssen mindestens 20 KB/s betragen."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3098,7 +2918,7 @@ msgstr "Verschiedene andere Dienste"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Ports 706, 1863, 5050, 5190, 5222, 8300 und 8888"
+msgstr "Ports 706, 1863, 5050, 5190, 5222, 8300 und 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3127,17 +2947,13 @@ msgstr "Zeige Hilfe zu Exit-Regeln"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Welche Internetressourcen sollen Benutzer von deinem Relay aus zugreifen "
-"dürfen?"
+msgstr "Welche Internetressourcen sollen Benutzer von deinem Relay aus zugreifen dürfen?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor blockiert standardmäßig weiterhin einige Mailversand- und Filesharing-"
-"Programme, um Spam und anderen Mißbrauch zu vermindern."
+msgstr "Tor blockiert standardmäßig weiterhin einige Mailversand- und Filesharing-Programme, um Spam und anderen Mißbrauch zu vermindern."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3145,15 +2961,12 @@ msgstr "Exit-Regeln"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Lasse andere Benutzer auf deine Tor-Brücke zugreifen, indem du ihnen diese "
-"Zeile gibst:"
+msgstr "Lasse andere Benutzer auf deine Tor-Brücke zugreifen, indem du ihnen diese Zeile gibst:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Dies ist die Identität deiner Tor-Brücke, die du anderen Leute geben kannst"
+msgstr "Dies ist die Identität deiner Tor-Brücke, die du anderen Leute geben kannst"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3171,9 +2984,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Lassen sie bitte ihre Tor-Brücke aktiv damit andere Nutzer eine größere "
-"Chance haben diese zu finden und zu nutzen."
+msgstr "Lassen sie bitte ihre Tor-Brücke aktiv damit andere Nutzer eine größere Chance haben diese zu finden und zu nutzen."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3181,15 +2992,13 @@ msgstr "Tor-Brücken-Einstellungen"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia konnte Ihre Bridge's Benutzverlauf nicht finden."
+msgstr "Vidalia konnte Ihre %1 Einstellungen nicht speichern."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor erhielt einen Rückgabewert mit falscher Formatierung als Ergebnis einer "
-"Vidalia Anfrage zu ihrer Tor-Brücke."
+msgstr "Tor erhielt einen Rückgabewert mit falscher Formatierung als Ergebnis einer Vidalia Anfrage zu ihrer Tor-Brücke."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3197,7 +3006,7 @@ msgstr "Die zurückgelieferte Antwort war: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Hilf zensierten Benutzern, das Tor-Netzwerk zu erreichen."
+msgstr "Nutzern, die einer Internetzensur unterliegen, helfen das Tor-Netzwerk zu nutzen (Tor 0.2.0.8-alpha oder neuer)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3212,6 +3021,14 @@ 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 "Relais Datenverkehr innerhalb des Tor-Netzwerks (nicht-ausgangs Relais)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Relais Datenverkehr für das Tor-Netzwerk (ausgangs-Relais)"
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Spiegele das Relay Verzeichnis"
@@ -3219,9 +3036,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Kontakt E-Mail-Adresse, über welche du im Falle eines \n"
-"Problemes informiert werden kannst. Du kannst auch deinen PGP oder GPG Fingerabdruck mit angeben."
+msgstr "Kontakt E-Mail-Adresse, über welche du im Falle eines Problemes informiert werden kannst. Du kannst auch deinen PGP oder GPG Fingerabdruck mit angeben."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3231,9 +3046,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Bitte konfiguriere wenigstens ein Verzeichnis und einen virtuellen Port für "
-"jeden Dienst, den du speichern möchtest. Entferne die übrigen."
+msgstr "Bitte konfiguriere wenigstens ein Verzeichnis und einen virtuellen Port für jeden Dienst, den du speichern möchtest. Entferne die übrigen."
msgctxt "ServicePage"
msgid "Error"
@@ -3249,24 +3062,17 @@ msgstr "Verzeichnis auswählen"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Der virtuelle Port darf nur gültige Port-Nummern enthalten [1..65535]."
+msgstr "Der virtuelle Port darf nur gültige Port-Nummern enthalten [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"Das Ziel darf nur Einträge der Form Adresse:Port, Adresse oder Port "
-"enthalten."
+msgstr "Das Ziel darf nur Einträge der Form Adresse:Port, Adresse oder Port enthalten."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
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"
@@ -3304,8 +3110,7 @@ msgstr "Kopiere die Onion-Adresse in die Zwischenablage"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Durchsuchen Sie ihr lokales Dateisystem um ein Verzeichnis auszuwählen"
+msgstr "Durchsuchen Sie ihr lokales Dateisystem um ein Verzeichnis auszuwählen"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3332,10 +3137,7 @@ msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Klicken Sie auf \"Tor starten\" in der Vidalia Systemsteuerung um Tor "
-"neuzustarten. Falls Tor unerwartet beendet wurde, klicken Sie auf die "
-"Registerkarte \"Erweitert\" für weitere Einzelheiten zu etwaigen Fehlern."
+msgstr "Klicken Sie auf \"Tor starten\" in der Vidalia Systemsteuerung um Tor neuzustarten. Falls Tor unerwartet beendet wurde, klicken Sie auf die Registerkarte \"Erweitert\" für weitere Einzelheiten zu etwaigen Fehlern."
msgctxt "StatusEventWidget"
msgid ""
@@ -3343,11 +3145,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"Sie verwenden zur Zeit Version \"%1\" der Tor-Software. Diese wird nicht "
-"mehr empfohlen. Bitte aktualisieren Sie auf die aktuellste Version der "
-"Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, "
-"Stabilität und Performance enthalten kann."
+msgstr "Sie verwenden zur Zeit Version \"%1\" der Tor-Software. Diese wird nicht mehr empfohlen. Bitte aktualisieren Sie auf die aktuellste Version der Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
msgctxt "StatusEventWidget"
msgid ""
@@ -3355,11 +3153,7 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"Sie verwenden zur Zeit Version \"%1\" der Tor-Software, diese funktioniert "
-"evt. nicht mehr mit dem aktuellen Tor-Netzwerk. Bitte aktualisieren Sie auf "
-"die aktuellste Version der Software, da diese wichtige Verbesserungen "
-"hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
+msgstr "Sie verwenden zur Zeit Version \"%1\" der Tor-Software, diese funktioniert evt. nicht mehr mit dem aktuellen Tor-Netzwerk. Bitte aktualisieren Sie auf die aktuellste Version der Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
@@ -3373,9 +3167,7 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Es wurde eine Verbindung zum Tor-Netzwerk erfolgreich hergestellt. Sie "
-"können jetzt Ihre Programme konfigurieren um das Internet anonym zu nützen."
+msgstr "Es wurde eine Verbindung zum Tor-Netzwerk erfolgreich hergestellt. Sie können jetzt Ihre Programme konfigurieren um das Internet anonym zu nützen."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
@@ -3385,10 +3177,7 @@ msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Die Tor-Software hat einen internen Fehler entdeckt. Bitte informieren Sie "
-"die Tor-Entwickler über die folgendene Fehlermeldung via "
-"bugs.torproject.org: \"%1\""
+msgstr "Die Tor-Software hat einen internen Fehler entdeckt. Bitte informieren Sie die Tor-Entwickler über die folgendene Fehlermeldung via bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3396,11 +3185,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden "
-"zurückgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig "
-"eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr "
-"Computer die richtige Zeit verwendet. "
+msgstr "Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden zurückgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr Computer die richtige Zeit verwendet. "
msgctxt "StatusEventWidget"
msgid ""
@@ -3408,11 +3193,7 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden "
-"vorgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig "
-"eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr "
-"Computer die richtige Zeit verwendet. "
+msgstr "Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden vorgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr Computer die richtige Zeit verwendet. "
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3424,21 +3205,14 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
+msgstr "One of the applications on your computer may have attempted to make an unencrypted connection through Tor to port %1. Sending unencrypted information over the Tor network is dangerous and not recommended. For your protection, Tor has automatically closed this connection."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Eines Ihrer Programme auf Ihrem Computer hat wahrscheinlich versucht eine "
-"unverschlüsselte Verbindung durch Tor zu Port %1 herzustellen. Das Senden "
-"von unverschlüsselten Informationen ist gefährlich und nicht empfehlenswert."
+msgstr "Eines Ihrer Programme auf Ihrem Computer hat wahrscheinlich versucht eine unverschlüsselte Verbindung durch Tor zu Port %1 herzustellen. Das Senden von unverschlüsselten Informationen ist gefährlich und nicht empfehlenswert."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3450,11 +3224,7 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Eines Ihrer Programme hat eine Verbindung durch Tor zu \"%1\" hergestellt. "
-"Es verwendet ein Protokoll, welches Informationen über Ihr Ziel preisgeben "
-"könnte. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass "
-"diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
+msgstr "Eines Ihrer Programme hat eine Verbindung durch Tor zu \"%1\" hergestellt. Es verwendet ein Protokoll, welches Informationen über Ihr Ziel preisgeben könnte. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
@@ -3465,11 +3235,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Eines Ihrer Programme hat versucht mit einem für Tor unbekannten Protokoll "
-"eine Verbindung durch Tor herzustellen. Bitte stellen Sie sicher Ihre "
-"Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit "
-"\"Remote\" Hostnamen-Auflösung verwenden."
+msgstr "Eines Ihrer Programme hat versucht mit einem für Tor unbekannten Protokoll eine Verbindung durch Tor herzustellen. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
@@ -3480,10 +3246,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Eines Ihrer Programme hat versucht eine Verbindung durch Tor zu \"%1\" "
-"herzustellen, was Tor nicht als gültigen Hostnamen erkannt hat. Bitte "
-"überprüfen Sie die Konfiguration Ihres Programms."
+msgstr "Eines Ihrer Programme hat versucht eine Verbindung durch Tor zu %1 herzustellen, was Tor nicht als gültigen Hostnamen erkannt hat. Bitte überprüfen Sie die Konfiguration Ihres Programms."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
@@ -3494,10 +3257,7 @@ msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"Tor hat festgestellt, dass die öffentliche IP Adresse Ihres Relays momentan "
-"%1%2 ist. Falls dies nicht korrekt ist, erwägen Sie die \"Adress\"-Option in"
-" Ihrer Relay-Konfiguration zu setzten."
+msgstr "Tor hat festgestellt, dass die öffentliche IP Adresse Ihres Relays momentan %1%2 ist. Falls dies nicht korrekt ist, erwägen Sie die \"Adress\"-Option in Ihrer Relay-Konfiguration zu setzten."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
@@ -3508,21 +3268,14 @@ msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für nicht "
-"existierende Domains liefert. Einige ISPs und DNS-Provider, wie z.B. "
-"OpenDNS, sind dafür bekannt dies zu tun um ihre eigenen Such- oder Werbe- "
-"seiten anzuzeigen."
+msgstr "Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für nicht existierende Domains liefert. Einige ISPs und DNS-Provider, wie z.B. OpenDNS, sind dafür bekannt dies zu tun um ihre eigenen Such- oder Werbe- seiten anzuzeigen."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für wohlbekannte "
-"Domains liefert. Da Tor auf akkurate DNS Antworten angewiesen ist, wird Ihr "
-"Relay nicht als Exit verwendet."
+msgstr "Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für wohlbekannte Domains liefert. Da Tor auf akkurate DNS Antworten angewiesen ist, wird Ihr Relay nicht als Exit verwendet."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3533,10 +3286,7 @@ msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"Tor versucht festzustellen, ob Ihr Relay-Server Port durch das Tor-Netzwerk "
-"erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige"
-" Minuten dauern."
+msgstr "Tor versucht festzustellen, ob Ihr Relay-Server Port durch das Tor-Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige Minuten dauern."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
@@ -3556,12 +3306,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"Ihr Relay-Server Port ist für andere Tor-Clients nicht erreichbar. Dies kann"
-" passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies "
-"erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. Ihrer "
-"Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Server Port "
-"sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
+msgstr "Ihr Relay-Server Port ist für andere Tor-Clients nicht erreichbar. Dies kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Server Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
@@ -3572,10 +3317,7 @@ msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor versucht festzustellen, ob Ihr Relay-Verzeichnis Port durch das Tor-"
-"Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies "
-"könnte einige Minuten dauern."
+msgstr "Tor versucht festzustellen, ob Ihr Relay-Verzeichnis Port durch das Tor-Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige Minuten dauern."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
@@ -3595,12 +3337,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"Ihr Relay-Verzeichnis Port ist für andere Tor-Clients nicht erreichbar. Dies"
-" kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. "
-"Dies erfordert Port-Weiterleitung in der Konfiguration Ihres Routers bzw. "
-"Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr "
-"Verzeichnis Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
+msgstr "Ihr Relay-Verzeichnis Port ist für andere Tor-Clients nicht erreichbar. Dies kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Verzeichnis Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
@@ -3610,9 +3347,7 @@ msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Ihr Relay Identifikator, der Clients ermöglicht sich zu Ihrem Relay zu "
-"verbinden, wurde vom Verzeichnis-Server %1:%2 abgewiesen. Der Grund war: %3"
+msgstr "Ihr Relay Identifikator, der Clients ermöglicht sich zu Ihrem Relay zu verbinden, wurde vom Verzeichnis-Server %1:%2 abgewiesen. Der Grund war: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
@@ -3624,11 +3359,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"Ihr Relay ist nun Online und kann von Tor-Clients verwendet werden. Sie "
-"sollten innerhalb weniger Stunden, während mehr Clients Ihr Relay "
-"\"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. "
-"Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
+msgstr "Ihr Relay ist nun Online und kann von Tor-Clients verwendet werden. Sie sollten innerhalb weniger Stunden, während mehr Clients Ihr Relay \"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Nachrichten-Log"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Tor-Status"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Zeige beim Systemstart"
msgctxt "Stream"
msgid "New"
@@ -3666,6 +3413,12 @@ 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 "Vidalia hat Tor nicht gestartet. Du musst Tor mit den Interface stoppen, mit dem du es gestartet hast."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Prozess %1 wurde nicht gestoppt. [%2]"
@@ -3690,9 +3443,7 @@ msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Einstellungen speichern. Falls nicht ausgewählt werden die Einstellungen nur"
-" auf die aktuelle Tor-Instanz angewandt."
+msgstr "Einstellungen speichern. Falls nicht ausgewählt werden die Einstellungen nur auf die aktuelle Tor-Instanz angewandt."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3732,9 +3483,7 @@ msgstr "Fehler beim Verbinden zu Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Auswahl ist leer. Bitte wählen Sie einen Text aus oder verwenden Sie \"Alles"
-" anwenden\""
+msgstr "Auswahl ist leer. Bitte wählen Sie einen Text aus oder verwenden Sie \"Alles anwenden\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3748,6 +3497,30 @@ 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 "Strg+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Strg+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Strg+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Strg+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Strg+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Strg+A"
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Erfolgreich"
@@ -3808,17 +3581,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia konnte nicht nach verfügbaren Updates suchen, da '%1' nicht gefunden"
-" werden konnte."
+msgstr "Vidalia konnte nicht nach verfügbaren Updates suchen, da '%1' nicht gefunden werden konnte."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia konnte nicht nach verfügbaren Updates suchen, da der Updateprozess "
-"unerwartet unterbrochen wurde."
+msgstr "Vidalia konnte nicht nach verfügbaren Updates suchen, da der Updateprozess unerwartet unterbrochen wurde."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3870,9 +3639,7 @@ msgstr "Installieren"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Folgend Softwarepakete wurden aktualisiert und stehen zur Installation "
-"bereit:"
+msgstr "Folgend Softwarepakete wurden aktualisiert und stehen zur Installation bereit:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3882,6 +3649,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Version"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Lade Absturzmeldung hoch"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Kann Report nicht senden: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3975,10 +3750,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Konnte Nachrichtendatei nicht öffnen '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Wert benötigt für Parameter:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Ungültiger Sprachcode festgestellt:"
@@ -3995,10 +3766,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Evtl. läuft schon ein anderer Vidalia-Prozess. Sollte wirklich kein anderer Prozess laufen, kannst du fortfahren.\n"
-"\n"
-"Möchtest du Vidalia starten?"
+msgstr "Evtl. läuft schon ein anderer Vidalia-Prozess. Sollte wirklich kein anderer Prozess laufen, kannst du fortfahren.\n\nMöchtest du Vidalia starten?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -4031,5 +3799,3 @@ 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 9928779..24c54be 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 d61f97d..3cefc2a 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/el/qt_el.po b/src/vidalia/i18n/po/el/qt_el.po
index f51b4aa..d39d8fa 100644
--- a/src/vidalia/i18n/po/el/qt_el.po
+++ b/src/vidalia/i18n/po/el/qt_el.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
-# Γιάννης <yannanth at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-22 16:13+0000\n"
-"Last-Translator: Γιάννης <yannanth at gmail.com>\n"
+"PO-Revision-Date: 2011-03-14 23:27+0000\n"
+"Last-Translator: Evropi <yannanth at gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -445,5 +442,3 @@ msgstr "%1 κιλομπάιτ (1024 bytes)"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 μπάιτ (8 bits)"
-
-
diff --git a/src/vidalia/i18n/po/el/vidalia_el.po b/src/vidalia/i18n/po/el/vidalia_el.po
index b02e9ee..0a9ae82 100755
--- a/src/vidalia/i18n/po/el/vidalia_el.po
+++ b/src/vidalia/i18n/po/el/vidalia_el.po
@@ -1,16 +1,13 @@
#
# Translators:
-# <fragos.george at hotmail.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <smartmediagr at gmail.com>, 2011.
-# Γιάννης <yannanth at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-07 13:05+0000\n"
-"Last-Translator: anvo <fragos.george at hotmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -142,81 +139,66 @@ msgstr "Επιλέξτε τον φάκελο για την αποθήκευση
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Έλεγχος Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Χρήση σύνδεσης TCP (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Διαδρομή:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Χρήση υποδοχέα τύπου Unix domain (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Επεξεργασία του τρέχοντος αρχείου torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "ΣΗΜΕΙΩΣΗ: θα γίνει επεξεργασία του χρησιμοποιούμενου torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "Η διαδρομή ControlSocket δεν υπάρχει."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
-"Η τοποθεσία του αρχείου ρυθμίσεων Tor που δόθηκε περιέχει χαρακτήρες οι "
-"οποίοι δεν μπορούν να εμφανιστούν στην τρέχουσα 8-μπιτ κωδικοποίηση "
-"χαρακτήρων του συστήματός σας."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
-"Η τοποθεσία καταλόγου δεδομένων του Tor που δόθηκε περιέχει χαρακτήρες οι "
-"οποίοι δεν μπορούν να εμφανιστούν στην τρέχουσα 8-μπιτ κωδικοποίηση "
-"χαρακτήρων του συστήματός σας."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Προειδοποίηση"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Η διαδρομή του αρχείου torrc άλλαξε. Θέλετε να επανεκκινήσει το Tor;"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Αρχείο Ρυθμίσεων Tor(torrc);;Όλα τα Αρχεία(*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
msgstr ""
-"Επιλέξτε ένα αρχείο που θα χρησιοποιηθεί ως διαδρομή για τον υποδοχέα του "
-"Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Αυτόματη ρύθμιση του ControlPort"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Το Vidalia απέτυχε στη διαγραφή της υπηρεσίας Tor.\n"
-"\n"
-"Μπορεί να χρειαστεί χειροκίνητη διαγραφή."
+msgstr "Το Vidalia απέτυχε στη διαγραφή της υπηρεσίας Tor.\n\nΜπορεί να χρειαστεί χειροκίνητη διαγραφή."
msgctxt "AppearancePage"
msgid "Language"
@@ -251,10 +233,6 @@ msgid "Show Settings"
msgstr "Εμφάνιση ρυθμίσεων"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Χρήση Ευρούς Ζώνης Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Μηδενισμός"
@@ -294,9 +272,13 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Άκυρο"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Εκκίνηση HTTPS αιτήματος γεφυρών..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -304,23 +286,23 @@ msgstr "Σύνδεση με το %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Αποστολή HTTPS αιτήματος για γέφυρες..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Λήψη λίστας γεφυρών..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Γίνεται λήψη γεφυρών"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Αδυναμία λήψης γεφυρών: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Επανάληψη αιτήματος γεφυρών..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -328,21 +310,19 @@ msgstr "Χώρα"
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Πελάτες"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
msgstr ""
-"Πελάτες από τις ακόλουθες χώρες χρησιμοποιήσαν τον αναμεταδότη σας από την "
-"%1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Σύνοψη Χρήσης της Γέφυρας"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Σύνοψη Πελάτου"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -449,20 +429,27 @@ msgid "Control socket is not connected."
msgstr "Η υποδοχή ελέγχου δεν είναι συνδεδεμένη."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Απαιτείται κωδικός"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Απομνημόνευση Κωδικού"
+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 ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Το Vidalia συνδέθηκε σε μια ενεργή διαδικασία Tor η οποία απαιτεί κωδικό. "
-"Εισάγετε τον κωδικό σας ελέγχου:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -474,9 +461,7 @@ msgstr "Αποτυχία αποστολής εντολής ελεγχου. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Κατά την προσπάθεια ανάγνωσης μιας γραμμής δεδομένων αποσυνδέθηκε η υποδοχή "
-"(socket)."
+msgstr "Κατά την προσπάθεια ανάγνωσης μιας γραμμής δεδομένων αποσυνδέθηκε η υποδοχή (socket)."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
@@ -1180,7 +1165,7 @@ msgstr "Ζιμπάμπουε"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
@@ -1280,62 +1265,59 @@ msgstr "Ταϊβάν"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Υποβολή αναφοράς κατάρρευσης"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Το Vidalia εντόπισε ένα σφάλμα και πρέπει να κλείσει"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Επανεκκίνηση του Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Να μην γίνει επανεκκίνηση"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Αδυναμία επανεκκίνσης του Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
-"Αδυναμία αυτόματης επανεκκίνησης του Vidalia. Παρακαλώ επανεκκινήστε το "
-"Vidalia χειροκίνητα."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Συμπληρώστε το εισητήριο:"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
msgstr ""
-"Δημιουργήθηκε μια αναφορά κατάρρευσης την οποία μπορείτε να αποστείλετε "
-"στους προγραμματιστές του Vidalia ώστε να εντοπίσουν και να διορθώσουν το "
-"πρόβλημα. Η υποβληθείσα αναφορά δεν περιλαμβάνει οποιαδήποτε προσωπικά "
-"στοιχεία."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
-"με μια περιγραφή των ενεργειών σας πριν την κατάρρευση της εφαρμογής, μαζί "
-"με τα ακόλουθα αρχεία που σχετίζονται με την αναφορά κατάρρευσης:"
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1362,10 +1344,6 @@ msgid "Browse"
msgstr "Περιήγηση"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Εκκίνηση του λογισμικού Tor όταν εκκινεί το Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1375,8 +1353,7 @@ msgstr "Εφαρμογή Πληρεξούσιου (Proxy) (προεραιτικ
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr ""
-"Εκκίνηση μιας εφαρμογής πληρεξούσιου διακομιστή (proxy) όταν εκκινεί το Tor"
+msgstr "Εκκίνηση μιας εφαρμογής πληρεξούσιου διακομιστή (proxy) όταν εκκινεί το Tor"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
@@ -1394,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Έλεγχος Τώρα"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1412,11 +1393,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Παραλήθφηκαν:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Απεστάλησαν:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1544,7 +1525,7 @@ msgstr "Βρέθηκαν Έγγραφα"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Σφάλμα κατά την φόρτωση των περιεχομένων της Βοήθειας:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1555,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Το Vidalia μπορεί να ανοίξει τον σύνδεσμο που επιλέξατε στον αρχικό "
-"περιηγητή σας Ιστού. Αν ο περιηγητής δεν είναι ήδη ρυθμισμένος ώστε να "
-"χρησιμοποιεί το Tor, τότε το αίτημα δεν θα είναι ανώνυμο."
+msgstr "Το Vidalia μπορεί να ανοίξει τον σύνδεσμο που επιλέξατε στον αρχικό περιηγητή σας Ιστού. Αν ο περιηγητής δεν είναι ήδη ρυθμισμένος ώστε να χρησιμοποιεί το Tor, τότε το αίτημα δεν θα είναι ανώνυμο."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1572,14 +1550,11 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Το Vidalia δεν μπόρεσε να ανοίξει τον σύνδεσμο που επιλέξατε στον περιηγητή "
-"Ιστού. Μπορείτε να αντιγράψετε το URL και να το επικολλήσετε στον περιηγητή "
-"σας."
+msgstr "Το Vidalia δεν μπόρεσε να ανοίξει τον σύνδεσμο που επιλέξατε στον περιηγητή Ιστού. Μπορείτε να αντιγράψετε το URL και να το επικολλήσετε στον περιηγητή σας."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Σφάλμα κατά το άνοιγμα του αρχείου βοηθείας:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1619,27 +1594,27 @@ msgstr "Άγνωστο"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Αποσφαλμάτωση"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Πληροφορίες"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Σημείωση"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Προειδοποίηση"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Σφάλμα"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Άγνωστο/ος"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1682,34 +1657,6 @@ 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"
@@ -1718,10 +1665,6 @@ msgid "View"
msgstr "Εμφάνιση"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Βοήθεια για το Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Σφάλμα κατά την εκκίνηση του περιηγητή ιστού"
@@ -1735,8 +1678,7 @@ msgstr "Σφάλμα κατά την εκκίνηση του προγράμμα
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-"Το Vidalia δεν μπόρεσε να εκκινήσει το ρυθμισμένο πρόγραμμα Άμεσων Μηνυμάτων"
+msgstr "Το Vidalia δεν μπόρεσε να εκκινήσει το ρυθμισμένο πρόγραμμα Άμεσων Μηνυμάτων"
msgctxt "MainWindow"
msgid "Error starting proxy server"
@@ -1744,9 +1686,7 @@ msgstr "Σφάλμα κατά την εκκίνηση του διακομιστ
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-"Το Vidalia δεν μπόρεσε να εκκινήσει τον ρυθμισμένο πληρεξούσιο διακομιστή "
-"(proxy server)"
+msgstr "Το Vidalia δεν μπόρεσε να εκκινήσει τον ρυθμισμένο πληρεξούσιο διακομιστή (proxy server)"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
@@ -1837,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr "Το Tor τερματίζει"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Διακοπή του Tor Τώρα"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Διακοπή Tor"
@@ -1860,9 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Το Vidalia δεν μπόρεσε να ξεκινήσει το Tor. Ελέγξτε τις ρυθμίσεις σας και "
-"βεβαιωθείτε ότι δηλώσατε το σωστό όνομα για το εκτελέσιμο του Tor."
+msgstr "Το Vidalia δεν μπόρεσε να ξεκινήσει το Tor. Ελέγξτε τις ρυθμίσεις σας και βεβαιωθείτε ότι δηλώσατε το σωστό όνομα για το εκτελέσιμο του Tor."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1900,9 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Το λογισμικό Tor απαιτεί από το Vidalia να στείλει το περιεχόμενο ενός "
-"cookie επαλήθευσης, αλλά το Vidalia δεν μπόρεσε να το βρει."
+msgstr "Το λογισμικό Tor απαιτεί από το Vidalia να στείλει το περιεχόμενο ενός cookie επαλήθευσης, αλλά το Vidalia δεν μπόρεσε να το βρει."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1924,21 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Το Vidalia δεν μπόρεσε να καταχωρήσει κάποια συμβάντα. Πολλές λειτουργίες "
-"του Vidalia ίσως δεν είναι διαθέσιμες."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Σφάλμα Επαλήθευσης"
-
-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 "Ελέγξτε τις ρυθμίσεις ελέγχου της θύρα εξακρίβωσης."
+msgstr "Το Vidalia δεν μπόρεσε να καταχωρήσει κάποια συμβάντα. Πολλές λειτουργίες του Vidalia ίσως δεν είναι διαθέσιμες."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1948,10 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Η τρέχουσα εγκατεστημένη έκδοση του Tor είναι παρωχημένη ή δεν συνίσταται "
-"πλέον. Επισκεφθείτε τον ιστότοπο του Tor για να παραλάβετε την πιο πρόσφατη "
-"έκδοση."
+msgstr "Η τρέχουσα εγκατεστημένη έκδοση του Tor είναι παρωχημένη ή δεν συνίσταται πλέον. Επισκεφθείτε τον ιστότοπο του Tor για να παραλάβετε την πιο πρόσφατη έκδοση."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1961,8 +1876,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Όλες οι επόμενες συνδέσεις σας θα φαίνονται διαφορετικές από τις παλαιές."
+msgstr "Όλες οι επόμενες συνδέσεις σας θα φαίνονται διαφορετικές από τις παλαιές."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1985,107 +1899,29 @@ 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 είναι ξεπερασμένη ή δεν συνιστάται πλέον."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
msgstr ""
-"Θέλετε να γίνει έλεγχος για νεότερα διαθέσιμα πακέτα προς εγκατάσταση;"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Πιθανόν μη ασφαλής σύνδεση"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"Το Tor έκλεισε αυτόματα την σύνδεσή σας ώστε να προστατευθεί η ανωνυμία σας."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2093,14 +1929,13 @@ msgstr "Η Ενημέρωση Απέτυχε"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Το λογισμικό σας είναι ενημερωμένο"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"Δεν υπάρχουν αυτή τη στιγμή νεότερα πακέτα Tor για τον υπολογιστή σας."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2112,7 +1947,13 @@ msgstr "Το Vidalia δεν μπόρεσε να εγκαταστήσει τις
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Έγινε το ακόλουθο σφάλμα:"
+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 ""
@@ -2120,25 +1961,34 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"Ο,τιδήποτε σταλεί μέσω αυτής της σύνδεσης μπορεί να ανασχεθεί. Ελέγξτε τις "
-"ρυθμίσεις της εφαρμογής σας και χρησιμοποιή(σ)τε μόνον κρυπτογραφημένα "
-"πρωτόκολα, όπως SSL, αν είναι εφικτό."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "απέτυχε (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"Ο αναμεταδότης σας πρόκειται να κλείσει.\n"
-"Πατήστε 'Stop' ξανά για να διακόψετε τον αναμεταδότη σας τώρα."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ρύθμιση του torrc για εκκίνηση από %1 σε %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2146,8 +1996,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Αυτή τη στιγμή εκτελείτε έναν αναμεταδότη. Ο τερματισμός του αναμεταδότη σας θα διακόψει κάθε ανοικτή επικοινωνία από άλλα προγράμματα.\n"
-"Θέλετε η διακοπή να γίνει ομαλά ώστε να δοθεί χρόνος στα προγράμματα-πελάτες για να βρουν νέο αναμεταδότη;"
msgctxt "MainWindow"
msgid ""
@@ -2155,24 +2003,38 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Το Vidalia διαπίστωσε ότι το Tor τερμάτισε αναπάντεχα.\n"
-"Ελέγξτε τα μηνύματα καταγραφής για πρόσφατες προειδοποιήσεις και μηνύματα σφάλματος."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(πιθανόν Telnet)"
+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 "(probably an email client)"
-msgstr "(πιθανόν κάποιο πρόγραμμα ηλεκτρονικής αλληλογραφίας)"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 ""
-"Κάποια από τις εφαρμογές σας %1 φαίνεται ότι πραγματοποιεί πιθανόν μη "
-"κρυπτογραφημένες και ανασφαλείς συνδέσεις στην θήρα %2."
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2180,9 +2042,7 @@ msgstr "Φίλτρο Ρύθμισης Λαθών"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
-"Το Vidalia δεν ήταν ικανό να καταχωρήσει τα δεδομένα σχετικά με το αρχείο "
-"καταγραφής του Tor."
+msgstr "Το Vidalia δεν ήταν ικανό να καταχωρήσει τα δεδομένα σχετικά με το αρχείο καταγραφής του Tor."
msgctxt "MessageLog"
msgid "Error Opening Log File"
@@ -2190,8 +2050,7 @@ msgstr "Λάθος κατά το άνοιγμα του αρχείου καταγ
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr ""
-"Το Vidalia δεν ήταν ικανό να ανοίξει το συγκεκριμένο αρχείο καταγραφής."
+msgstr "Το Vidalia δεν ήταν ικανό να ανοίξει το συγκεκριμένο αρχείο καταγραφής."
msgctxt "MessageLog"
msgid "Log Filename Required"
@@ -2199,9 +2058,7 @@ msgstr "Απαιτείται ένα όνομα για το αρχείο κατα
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Πρέπει να εισάγεις ένα όνομα αρχείου ώστε να μπορείτε να αποθηκεύσετε ένα "
-"αρχείο καταγραφής."
+msgstr "Πρέπει να εισάγεις ένα όνομα αρχείου ώστε να μπορείτε να αποθηκεύσετε ένα αρχείο καταγραφής."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2261,8 +2118,7 @@ msgstr "Εκκαθάριση"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
-"Εκκαθάριση όλων των μηνυμάτων απο το αρχείο καταγραφής μηνυμάτων (Ctrl + E)"
+msgstr "Εκκαθάριση όλων των μηνυμάτων απο το αρχείο καταγραφής μηνυμάτων (Ctrl + E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2350,8 +2206,7 @@ msgstr "Εύρεση"
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr ""
-"Εύρεση όλων των μηνυμάτων που περιέχουν το προς αναζήτηση κείμενο (Ctrl+F)"
+msgstr "Εύρεση όλων των μηνυμάτων που περιέχουν το προς αναζήτηση κείμενο (Ctrl+F)"
msgctxt "MessageLog"
msgid "Ctrl+F"
@@ -2415,9 +2270,7 @@ msgstr "Ιστορικό αρχείου καταγραφής μηνυμάτων"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr ""
-"Αριθμός μηνυμάτων προς εμφάνιση στο παράθυρο του αρχείου καταγραφής "
-"μηνυμάτων"
+msgstr "Αριθμός μηνυμάτων προς εμφάνιση στο παράθυρο του αρχείου καταγραφής μηνυμάτων"
msgctxt "MessageLog"
msgid "messages"
@@ -2429,45 +2282,31 @@ msgstr "Πλοήγηση"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Ενεργοποίση αυτόματης αποθήκευσης όλων των νέων μηνυμάτων καταγραφής σε "
-"αρχείο"
+msgstr "Ενεργοποίση αυτόματης αποθήκευσης όλων των νέων μηνυμάτων καταγραφής σε αρχείο"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
msgstr "Αυτόματη αποθήκευση νέων μηνυμάτων καταγραφής σε αρχείο"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Βασικά"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Κατάσταση Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Προχωρημένες"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Πάντα να αποθηκεύεις τα νέα αρχεία καταγραφής μηνυμάτων"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Μηνύματα που εμφανίζονται όταν συμβαίνει κάτι\n"
-"πολύ σοβαρό και το Tor δεν μπορεί να προχωρήσει."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Μηνύματα που εμφανίζονται μόνον όταν\n"
-"κάτι σοβαρό συμβαίνει με το Tor."
msgctxt "MessageLog"
msgid ""
@@ -2476,25 +2315,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Μηνύματα που εμφανίζονται σπάνια\n"
-"στην διάρκεια φυσιολογικών λειτουργιών του Tor και δεν\n"
-"θεωρούνται σφάλματα, αλλά που θα πρέπει να τα ελέγξετε."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Μηνύματα που εμφανίζονται συχνά\n"
-"στη διάρκεια φυσιολογικών λειτουργιών του Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Υπερφλύαρα μηνύματα που κυρίως\n"
-"αφορούν στους προγραμματιστές του Tor."
msgctxt "MessageLog"
msgid ""
@@ -2502,13 +2334,6 @@ msgid ""
"\n"
"%2."
msgstr ""
-"Αδυναμία εγγραφής του αρχείου %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Χάρτης δικτύου Tor"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2588,15 +2413,15 @@ msgstr "Ctrl+Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Δεν βρέθηκε αναμεταδότης"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Δεν είναι διαθέσιμες οι λεπτομέρειες για τον επιλεγμένο αναμεταδότη."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Άγνωστο"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
@@ -2604,12 +2429,28 @@ msgstr "Μέγιστη Οθόνη"
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Εμφάνιση του δικτυακού χάρτη σε προβολή πλήρους οθόνης"
+msgstr ""
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 "Μη έγκυρη γέφυρα"
@@ -2626,18 +2467,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Πρέπει να καθορίσετε μία διεύθυνση IP ή ένα όνομα υπολογιστή και μία θύρα "
-"συστήματος για να ρυθμίσετε το Tor να χρησιμοποιεί διακομιστή μεσολάβησης "
-"(proxy server) για πρόσβαση στο διαδίκτυο."
+msgstr "Πρέπει να καθορίσετε μία διεύθυνση IP ή ένα όνομα υπολογιστή και μία θύρα συστήματος για να ρυθμίσετε το Tor να χρησιμοποιεί διακομιστή μεσολάβησης (proxy server) για πρόσβαση στο διαδίκτυο."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Πρέπει να καθορίσετε μία ή και περισσότερες θύρες συστήματος στις οποίες το "
-"τείχος προστασίας σας επιτρέπει συνδέσεις."
+msgstr "Πρέπει να καθορίσετε μία ή και περισσότερες θύρες συστήματος στις οποίες το τείχος προστασίας σας επιτρέπει συνδέσεις."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2645,15 +2481,11 @@ msgstr "%1 δεν είναι έγκυρος αριθμός θύρας συστή
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Επέλεξε εδώ αν το τοπικό σου δίκτυο απαιτεί διακομιστή μεσολάβησης (proxy "
-"server) για να έχετε πρόσβαση στο διαδίκτυο"
+msgstr "Επέλεξε εδώ αν το τοπικό σου δίκτυο απαιτεί διακομιστή μεσολάβησης (proxy server) για να έχετε πρόσβαση στο διαδίκτυο"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr ""
-"Χρησιμοποιώ ένα διακομιστή μεσολάβησης (proxy server) για πρόσβαση στο "
-"διαδίκτυο"
+msgstr "Χρησιμοποιώ ένα διακομιστή μεσολάβησης (proxy server) για πρόσβαση στο διαδίκτυο"
msgctxt "NetworkPage"
msgid "Proxy Settings"
@@ -2673,15 +2505,11 @@ msgstr "Θύρα συστήματος:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Επιλέξτε εδώ για να συνδέεστε μόνο με σταθμούς επιτρεπόμενους από το τείχος"
-" προστασίας θυρών συστήματος"
+msgstr "Επιλέξτε εδώ για να συνδέεστε μόνο με σταθμούς επιτρεπόμενους από το τείχος προστασίας θυρών συστήματος"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr ""
-"Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες "
-"συστήματος"
+msgstr "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"
msgctxt "NetworkPage"
msgid "Firewall Settings"
@@ -2699,10 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Επιλέξτε εδώ ώστε να κρυπτογραφείτε τις αιτήσεις καταλόγου και, επιλεκτικά, "
-"να χρησιμοποιητε σταθμούς με συνδέσεις γέφυρας για να φτάσετε το δίκτυο του "
-"Tor"
+msgstr "Επιλέξτε εδώ ώστε να κρυπτογραφείτε τις αιτήσεις καταλόγου και, επιλεκτικά, να χρησιμοποιητε σταθμούς με συνδέσεις γέφυρας για να φτάσετε το δίκτυο του Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2726,56 +2551,53 @@ msgstr "Αντιγραφή επιλεγμένων συνδέσεων γέφυρ
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Αναζήτηση Γεφυρών Τώρα"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Με ποιόν άλλο τρόπο μπορώ να βρω γέφυρες;</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Πώς μπορώ να βρω γέφυρες;</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Δεν υπάρχουν διαθέσιμες γέφυρες αυτή τη στιγμή. Μπορείτε είτε να περιμένετε "
-"για λίγο και να προσπαθήσετε εκ νέου, είτε να δοκιμάσετε διαφορετική μέθοδο "
-"αναζήτησης νέων γεφυρών."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Πατήστε Help για να δείτε άλλους τρόπους αναζήτησης νέων γεφυρών."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Διεύθυνση:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Τύπος:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Πρέπει να επιλέξετε τον τύπο του πληρεξούσιου διακομηστή."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2839,11 +2661,11 @@ msgstr "Αποσυνδεδεμένο"
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Άγνωστο"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Λεπτομέρειες αναμεταδότη"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
@@ -2867,19 +2689,19 @@ msgstr "Διεύθυνση IP:"
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Πλατφόρμα:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Εύρος ζώνης:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Χρόνος λειτουργίας:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Επαφές:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
@@ -2887,7 +2709,7 @@ msgstr "Τελευταία Ενημέρωση:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Περιγραφή:"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2933,18 +2755,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Έχετε ρυθμίσει το Tor να δρα σαν σταθμός με συνδέσεις γέφυρας για τους "
-"''απαγορευμένους'' χρήστες, αλλά η έκδοση του Tor που έχετε εγκατεστημένη "
-"δεν υποστηρίζει συνδέσεις γέφυρας."
+msgstr "Έχετε ρυθμίσει το Tor να δρα σαν σταθμός με συνδέσεις γέφυρας για τους ''απαγορευμένους'' χρήστες, αλλά η έκδοση του Tor που έχετε εγκατεστημένη δεν υποστηρίζει συνδέσεις γέφυρας."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Παρακαλούμε αναβαθμίστε το λογισμικό Tor, ή ρυθμίστε το να δρα μόνο σαν "
-"κανονικός σταθμός. "
+msgstr "Παρακαλούμε αναβαθμίστε το λογισμικό Tor, ή ρυθμίστε το να δρα μόνο σαν κανονικός σταθμός. "
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2959,10 +2776,6 @@ msgid "Run as a client only"
msgstr "Εκτέλεση μόνο σαν πελάτης"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Αναμετάδωσε κίνηση για το δίκτυο του Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Θύρα σταθμού:"
@@ -3000,8 +2813,7 @@ msgstr "Όνομα του σταθμού σας"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Θύρα στην οποία χρήστες και άλλοι σταθμοί επικοινωνούν με το σταθμό σου"
+msgstr "Θύρα στην οποία χρήστες και άλλοι σταθμοί επικοινωνούν με το σταθμό σου"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -3015,9 +2827,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Για συνέσεις με γρήγορο download αλλά χαμηλό upload, παρακαλούμε αναφέρετε "
-"την ταχύτητα upload εδω."
+msgstr "Για συνέσεις με γρήγορο download αλλά χαμηλό upload, παρακαλούμε αναφέρετε την ταχύτητα upload εδω."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3045,9 +2855,7 @@ msgstr "Προσαρμοσμένο"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Επέλεξε την καταχώρηση η οποία αντιπροσωπεύει καλύτερα την σύνδεση σου στο "
-"διαδίκτυο"
+msgstr "Επέλεξε την καταχώρηση η οποία αντιπροσωπεύει καλύτερα την σύνδεση σου στο διαδίκτυο"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3077,10 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Ο μέγιστος ρυθμός σου εύρους ζώνης πρέπει να είναι μεγαλύτερος ή ίσος απο το"
-" μέσο όρο του ρυθμού έυρους ζώνης. Και οι δύο τιμές πρέπει να είναι "
-"τουλάχιστο 20 KB/s."
+msgstr "Ο μέγιστος ρυθμός σου εύρους ζώνης πρέπει να είναι μεγαλύτερος ή ίσος απο το μέσο όρο του ρυθμού έυρους ζώνης. Και οι δύο τιμές πρέπει να είναι τουλάχιστο 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3141,18 +2946,13 @@ msgstr "Εμφάνηση περιεχομένου βοήθειας σχετικ
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Σε τι είδους υπηρεσίες Internet θα μπορούν οι χρήστες να έχουν πρόσβαση απο "
-"το σταθμό σου;"
+msgstr "Σε τι είδους υπηρεσίες Internet θα μπορούν οι χρήστες να έχουν πρόσβαση απο το σταθμό σου;"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Το Tor από προεπιλογή θα μπλοκάρει μερικά εξερχόμενα e-mail και κάποιες "
-"εφαρμογές διαμοιρασμού αρχείων για να ελαττώσει το spam και άλλες "
-"ενοχλήσεις. (που θα προκαλούσαν άσκοπη φόρτωση του δικτύου)"
+msgstr "Το Tor από προεπιλογή θα μπλοκάρει μερικά εξερχόμενα e-mail και κάποιες εφαρμογές διαμοιρασμού αρχείων για να ελαττώσει το spam και άλλες ενοχλήσεις. (που θα προκαλούσαν άσκοπη φόρτωση του δικτύου)"
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3160,101 +2960,92 @@ msgstr "Πολιτικές Εξόδου"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Επιτρέψτε σε άλλους χρήστες να έχουν πρόσβαση στη δικιά σου σύνδεση γέφυρας,"
-" δίνοντάς τους αυτή τη γραμμή:"
+msgstr "Επιτρέψτε σε άλλους χρήστες να έχουν πρόσβαση στη δικιά σου σύνδεση γέφυρας, δίνοντάς τους αυτή τη γραμμή:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Αυτή είναι η ταυτότητα της σύνδεσης γέφυρας του σταθμού σου, την οποία "
-"μπορείς να δώσεις σε άλλους ανθρώπους"
+msgstr "Αυτή είναι η ταυτότητα της σύνδεσης γέφυρας του σταθμού σου, την οποία μπορείς να δώσεις σε άλλους ανθρώπους"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
-"Αντιγράψτε τη ταυτότητα της σύνδεσης γέφυρας του σταθμού σου στο πρόχειρο "
+msgstr "Αντιγράψτε τη ταυτότητα της σύνδεσης γέφυρας του σταθμού σου στο πρόχειρο "
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Δεν υπάρχει πρόσφατη χρήση"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
msgstr ""
-"Δεν υπάρχουν προγράμματα-πελάτες που χρησιμοποίησαν πρόσφατα τον αναμεταδότη"
-" σας."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Αφήστε τον αναμεταδότη σας να εκτελείται συνεχώς, ώστε τα προγράμματα-"
-"πελάτες να έχουν την ευκαιρία να τον εντοπίσουν και να τον χρησιμοποιήσουν."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Ιστορικό Γεφυρών"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Το Vidalia δεν μπόρεσε να ανακτήσει το ιστορικό σας χρήσης γεφυρών."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Το Tor επέστρεψε μια απάντηση σε ακατάλληλη μορφή, όταν το Vidalia απέστηλε "
-"αίτημα για το ιστορικό σας χρήσης γεφυρών."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Η απάντηση που επιστράφηκε ήταν: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Βοηθείστε λογοκριμένους χρήστες να συνδεθούν στο δίκτυο Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Ποιός έχει χρησιμοποιήσει την γέφυρά μου;</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Τι είναι αυτό;</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Αυτόματη διανομή της διεύθυνσης του αναμεταδότη μου"
+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 "Αντικατοπτρίστε τον Κατάλογο Αναμεταδόσεων"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Η ηλεκτρονική διεύθυνσή σας για επικοινωνία σε περίπτωση που υπάρξει\n"
-"πρόβλημα με την αναμετάδοσή σας. Μπορείτε να συμπεριλάβετε και τα αποτυπώματα σας PGP ή GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
-"Κάποιο λάθος παρουσιάστηκε στην προσπάθεια απενεργοποίησης των υπηρεσιών"
+msgstr "Κάποιο λάθος παρουσιάστηκε στην προσπάθεια απενεργοποίησης των υπηρεσιών"
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Παρακαλούμε ρυθμίστε τουλάχιστον ένα κατάλογο υπηρεσίας και μία εικονική "
-"πόρτα συστήματος για κάθε μία υπηρεσία που θέλετε να αποθηκεύσετε. Διαγράψτε"
-" τα υπόλοιπα."
+msgstr "Παρακαλούμε ρυθμίστε τουλάχιστον ένα κατάλογο υπηρεσίας και μία εικονική πόρτα συστήματος για κάθε μία υπηρεσία που θέλετε να αποθηκεύσετε. Διαγράψτε τα υπόλοιπα."
msgctxt "ServicePage"
msgid "Error"
@@ -3270,25 +3061,17 @@ msgstr "Επιλογή Καταλόγου Υπηρεσίας"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Οι εικονικές πόρτες συστήματος μπορούν να περιέχουν μόνο έγκυρους αριθμούς "
-"πορτών συστήματος, από 1 έως 65535."
+msgstr "Οι εικονικές πόρτες συστήματος μπορούν να περιέχουν μόνο έγκυρους αριθμούς πορτών συστήματος, από 1 έως 65535."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"Ο στόχος μπορεί να περιέχει τα εξής στο πεδίο διεύθυνσης:πόρτα συστήματος, "
-"διεύθυνση ή πόρτα συστήματος."
+msgstr "Ο στόχος μπορεί να περιέχει τα εξής στο πεδίο διεύθυνσης:πόρτα συστήματος, διεύθυνση ή πόρτα συστήματος."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr "Ο φάκελος χρησιμοποιήτε ήδη από άλλη υπηρεσία."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Φόρμα"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Παρεχόμενες κρυφές υπηρεσίες"
@@ -3322,15 +3105,11 @@ msgstr "Απομάκρυνση της επιλεγμένης υπηρεσίας
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr ""
-"Αντιγραφή της ''διεύθυνσης κρεμμυδιού'' (masked IP) της επιλεγμένης "
-"υπηρεσίας στο πρόχειρο"
+msgstr "Αντιγραφή της ''διεύθυνσης κρεμμυδιού'' (masked IP) της επιλεγμένης υπηρεσίας στο πρόχειρο"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Περιήγηση στο τοπικό σύστημα αρχείων και επιλογή καταλόγου για την "
-"επιλεγμένη υπηρεσία."
+msgstr "Περιήγηση στο τοπικό σύστημα αρχείων και επιλογή καταλόγου για την επιλεγμένη υπηρεσία."
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3338,19 +3117,19 @@ msgstr "Δημιουργήθηκε από το Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Αντιγραφή στο πρόχειρο"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Το Λογισμικό Tor εκτελείται"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Αυτή τη στιγμή εκτελείτε την έκδοση \"%1\" του προγράμματος Tor."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Το πρόγραμμα Tor δεν εκτελείται"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3358,9 +3137,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"Πατήστε \"Start Tor\" στον Πίνακα Ελέγχου του Vidalia για να επανεκκινήσετε "
-"το Tor. Αν το Tor τερματίστηκε αναπάντεχα, επιλέξτε το tab \"Advanced\" για "
-"λεπτομέρειες για πιθανά σφάλματα."
msgctxt "StatusEventWidget"
msgid ""
@@ -3369,9 +3145,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"Αυτή τη στιγμή εκτελείτε την έκδοση \"%1\" του Tor, η οποία δεν είναι πλέον "
-"η συνιστώμενη. Αναβαθμίστε το πρόγραμμα στην πιο πρόσφατη έκδοσή του η οποία"
-" ίσως περιέχει σημαντικές βελτιώσεις ασφαλείας, αξιοπιστίας και επιδόσεων."
msgctxt "StatusEventWidget"
msgid ""
@@ -3380,39 +3153,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"Αυτή τη στιγμή εκτελείτε την έκδοση \"%1\" του Tor, η οποία ίσως δεν "
-"λειτουργεί με το τρέχον δίκτυο Tor. Αναβαθμίστε το πρόγραμμα στην πιο "
-"πρόσφατη έκδοσή του η οποία ίσως περιέχει σημαντικές βελτιώσεις ασφαλείας, "
-"αξιοπιστίας και επιδόσεων."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Το Λογισμικό σας δεν είναι ενημερωμένο"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Συνδέθηκε στο δίκτυο Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"Η σύνδεση με το δίκτυο Tor αποκαταστάθηκε με επιτυχία. Μπορείτε τώρα να "
-"ρυθμίσετε τις εφαρμογές σας ώστε να χρησιμοποιούν το Διαδίκτυο ανώνυμα."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Σφάλμα Λογισμικού Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"Το πρόγραμμα Tor έχει κάποιο εσωτερικό σφάλμα. Παρακαλούμε, αναφέρετε το "
-"μήνυμα σφάλματος που ακολουθεί στους προγραμματιστές του Tor, στην διεύθυνση"
-" bugs.torproject.org: \"%1\"."
msgctxt "StatusEventWidget"
msgid ""
@@ -3421,10 +3185,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"To Tor διαπίστωσε ότι το ρολόι του υπολογιστή σας είναι ρυθμισμένο πάει πίσω"
-" %1 δευτερολέπτα ως προς τον ρυθμιστικό υπολογιστή \"%2\". Αν το ρολόι του "
-"υπολογιστή σας δεν είναι σωστό, το Tor δεν θα μπορέσει να λειτουργήσει. "
-"Επιβεβαιώστε ότι ο υπολογιστής σας εμφανίζει την σωστή ώρα."
msgctxt "StatusEventWidget"
msgid ""
@@ -3433,14 +3193,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Το Tor διαπίστωσε ότι το ρολόι του υπολογιστή σας είνα ρυθμισμένο πάει "
-"μπροστά %1 δευτερόλεπτα ως προς τον ρυθμιστικό υπολογιστή \"%2\". Αν το "
-"ρολόι του υπολογιστή σς δεν είναι σωστό, το Tor δεν θα μπορέσει να "
-"λειτουργήσει. Επιβεβαιώστε ότι ο υπολογιστής σας εμφανίζει την σωστή ώρα."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Το ρολόϊ του Υπολογιστή σας είναι δυνητικά λανθασμένο"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3449,10 +3205,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"Κάποια εφαρμογή του υπολογιστή σας ίσως προσπάθησε να συνδεθεί χωρίς "
-"κρυπτογράφηση μέσω του Tor στην θύρα %1. Η αποστολή μη κρυπτογραφημένων "
-"πληροφοριών μέσω του δικτύου Tor είναι επικίνδυνη και δεν συνιστάται. Για "
-"την δική σας προστασία το Tor έκλεισε την σύνδεση αυτή."
msgctxt "StatusEventWidget"
msgid ""
@@ -3460,13 +3212,10 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"Κάποια εφαρμογή του υπολογιστή σας ίσως προσπάθησε να συνδεθεί χωρίς "
-"κρυπτογράφηση μέσω του Tor στην θύρα %1. Η αποστολή μη κρυπτογραφημένων "
-"πληροφοριών μέσω του δικτύου Tor είναι επικίνδυνη και δεν συνιστάται."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Πιθανά Επικίνδυνη Σύνδεση!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3475,15 +3224,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"Κάποια από τις εφαρμογές σας πραγματοποίησε σύνδεση μέσω του Tor στον/στην "
-"\"%1\" χρησιμοποιώντας ένα πρωτόκολο που μπορεί να διοχετεύει πληροφορίες "
-"σχετικές με τον προορισμό της. Βεβαιωθείτε ότι έχετε ρυθμίσει τις εφαρμογές "
-"σας ώστε να χρησιμοποιούν μόνον SOCKS4a ή SOCKS5 για την ανάλυση των "
-"ονομάτων των απομακρυσμένων υπολογιστών."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Άγνωστο Πρωτόκολο SOCKS"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3491,14 +3235,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"Κάποια από τις εφαρμογές σας πραγματοποίησε σύνδεση μέσω του Tor "
-"χρησιμοποιώντας πρωτόκολο που το Tor δεν καταλαβαίνει. Βεβαιωθείτε ότι έχετε"
-" ρυθμίσει τις εφαρμογές σας ώστε να χρησιμοποιούν μόνον SOCKS4a ή SOCKS5 για"
-" την ανάλυση των ονομάτων των απομακρυσμένων υπολογιστών."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Το Όνομα του υπολογιστή Προορισμού δεν είναι έγκυρο."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3506,13 +3246,10 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"Κάποια από τις εφαρμογές σας πραγματοποίησε σύνδεση μέσω του Tor στον "
-"\"%1\", τον οποίο το Tor δεν αναγνωρίζει ως έγκυρο όνομα υπολογιστή. Ελέγξτε"
-" τις ρυθμίσεις της εφαρμογής σας."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Η εξωτερική διεύθυνση ΙΡ άλλαξε"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3520,13 +3257,10 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
-"Το Tor διαπίστωσε ότι η δημόσια διεύθυνση ΙΡ του αναμεταδότη σας αυτή τη "
-"στιγμή είναι %1%2. Αν αυτό δεν είναι σωστό, προσαρμόστε κατάλληλα την "
-"επιλογή 'Address' στις ρυθμίσεις του αναμεταδότη σας."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Ανυχνεύθηκε Παραβίαση του DNS"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3534,10 +3268,6 @@ 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 εντόπισε ότι ο πάροχος DNS παρέχει εσφαλμένα μηνύματα για περιοχές "
-"που δεν υπάρχουν. Μερικοί ISP και άλλοι πάροχοι DNS, όπως η OpenDNS, είναι "
-"γνωστό ότι αυτό το κάνουν για να προβάλουν τις δικές τους σελίδες αναζήτησης"
-" ή διαφήμισης."
msgctxt "StatusEventWidget"
msgid ""
@@ -3545,14 +3275,10 @@ 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 εντόπισε ότι ο πάροχος DNS παρέχει εσφαλμένα μηνύματα για γνωστές "
-"περιοχές. Εφόσον τα προγράμματα-πελάτες βασίζονται στους ανεμεταδότες Tor "
-"για την διαβίβαση ακριβών μηνυμάτων DNS, ο αναμεταδότης σας δεν θα ρυθμιστεί"
-" ως αναμεταδότης εξόδου."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Έλεγχος της Προσεγγιστικότητας των Θυρών του Διακομηστή"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3560,22 +3286,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"Το Tor προσπαθεί να προσδιορίσει αν η θυρα διακομηστή του αναμεταδότη σας "
-"μπορεί να προσεγγιστεί από το δίκτυο Tor, συνδεόμενος στους υπολογιστές %1 "
-"%2. Αυτό μπορεί να διαρκέσει πολλά λεπτά."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Ο έλεγχος προσεγγιστικότητας της θύρας το διακομηστή ήταν επιτυχής!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
msgstr ""
-"Η θύρα διακομηστή του αναμεταδότη σας είναι προσβάσιμη από το δίκτυο Tor!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Ο έλεγχος προσεγγιστικότητας της θύρας του διακομηστή απέτυχε!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3584,15 +3306,10 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
-"Η θύρα διακομηστή του αναμεταδότη σας δεν είναι προσεγγίσημη από άλλα "
-"προγράμματα-πελάτες Tor. Αυτό μπορεί να συμβεί όταν συνδέεστε μέσω "
-"δρομολογητή ή τείχους προστασίας που απαιτούν ρυθμίσεις προώθησης θύρας. Αν "
-"η διεύθυνση %1:%2 δεν είναι η σωστή διεύθυνση ΙΡ και θύρα, ελέγξτε τις "
-"ρυθμίσεις του αναμεταδότη σας."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Έλεγχος Προσεγγιστικότητας της Θύρας Καταλόγου"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3600,22 +3317,18 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
-"Το Tor προσπαθεί να προσδιορίσει αν η θύρα καταλόγου του αναμεταδότη σας "
-"είναι προσεγγίσιμη από το δίκτυο Tor συνδεόμενο στον υπολογιστή %1:%2. Ο "
-"έλεγχος αυτός ίσως διαρκέσει πολλά λεπτά."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Ο Έλεγχος Προσεγγιστικότητας της Θύρας Καταλόγου ήταν επιτυχής!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
msgstr ""
-"Η θύρα καταλόγου του αναμεταδότη σας είναι προσβάσιμη από το δίκτυο Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Ο Έλεγχος Προσσεγιστικότητας της Θύρας Καταλόγου απέτυχε!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3624,28 +3337,20 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
-"Η θύρα καταλόγου του αναμεταδότη σας δεν είναι προσβάσιμη από άλλα "
-"προγράμματα-πελάτες Tor. Αυτό μπορεί να συμβαίνει αν συνδέεστε μέσω "
-"δρομολογητή ή τείχους προστασίας τα οποία απαιτούν ρυθμίσεις προώθησης "
-"θύρας. Αν η διεύθυνση %1:%2 δεν είναι η σωστή διεύθυνση ΙΡ και θύρα, ελέγξτε"
-" τις ρυθμίσεις του αναμεταδότη σας."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "O Περιγραφέας του Αναμεταδότη Απορρίφθηκε"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"Ο περιγραφέας του αναμεταδότη σας ο οποίος συνδέει προγράμματα-πελάτες στον "
-"αναμεταδότη σας, απορρίφθηκε από τον διακομηστή καταλόγου %1:%2. Η αιτία που"
-" δίδεται είναι: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Ο Αναμεταδότης σας είναι Συνδεδεμένος"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3654,11 +3359,22 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-"Ο αναμεταδότης σας είναι συνδεδεμένος και διαθέσιμος προς χρήση από "
-"προγράμματα Tor. Θα δείτε μια αύξηση στην κίνηση του δικτύου, μέσω του "
-"Γραφήματος Εύρους Ζώνης, μέσα στις επόμενες λίγες ώρες, όσο περισσότερα "
-"προγράμματα-πελάτες μαθαίνουν για τον αναμεταδότη σας. Ευχαριστούμε για την "
-"συνεισφορά σας στο δίκτο Tor!"
+
+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"
@@ -3696,6 +3412,12 @@ 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]"
@@ -3714,69 +3436,89 @@ msgstr "Αποτυχία ''ανακατώματος'' του κωδικού ελ
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Επεξεργασία του torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
-"Αποθήκευση ρυθμίσεων. Αν δεν επιλεχθεί, οι ρυθμίσεις θα εφαρμοσθούν μόνον "
-"για την τρέχουσα συνεδρία του Tor."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Αποκοπή"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Αντιγραφή"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Επικόλληση"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Ακύρωση"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Επανάληψη"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Επιλογή όλων"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Εφαρμογή όλων"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Εφαρμογή μόνο της επιλογής"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Σφάλμα κατά την σύνδεση στο Tor"
+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 "Λάθος στη γραμμή %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Λάθος"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Παρουσιάστηκε σφάλμα κατά το άνοιγμα του torrc αρχείου"
+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"
@@ -3788,9 +3530,7 @@ msgstr "Δεν βρέθηκαν συσκευές που να υποστηρίζ
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Δεν βρέθηκαν έγκυρες συσκευές Internet gateway (μόντεμ) που υποστηρίζουν "
-"UPnP"
+msgstr "Δεν βρέθηκαν έγκυρες συσκευές Internet gateway (μόντεμ) που υποστηρίζουν UPnP"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3841,16 +3581,12 @@ msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Το Vidalia δεν μπόρεσε να ελέγξει για διαθέσιμες ενημερώσεις λογισμικού, "
-"διότι δεν βρήκε τον '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Το Vidalia δεν μπόρεσε να ελέγξει για διαθέσιμες ενημερώσεις λογισμικού, "
-"διότι η διεργασία ενημέρωσης του Tor τερματίστηκε αναπάντεχα."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3894,7 +3630,7 @@ msgstr "Υπάρχουν Ενημερώσεις Λογισμικού"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Υπενθύμιση για αργότερα"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3903,7 +3639,6 @@ msgstr "Εγκατάσταση"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
msgstr ""
-"Τα ακόλουθα ενημερωμένα πακέτα λογισμικού είναι έτοιμα για εγκατάσταση:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3913,6 +3648,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Έκδοση"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "ΟΚ"
@@ -3971,14 +3714,11 @@ msgstr "Εμφανίζει αυτό το μύνημα χρήσης και προ
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr ""
-"Επαναφέρει στην αρχική τους μορφή ΟΛΕΣ τις αποθηκευμένες ρυθμίσεις του "
-"Vidalia."
+msgstr "Επαναφέρει στην αρχική τους μορφή ΟΛΕΣ τις αποθηκευμένες ρυθμίσεις του Vidalia."
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
-"Θέτει τον κατάλογο όπου το Vidalia χρησιμοποιεί για τα αρχεία δεδομένων."
+msgstr "Θέτει τον κατάλογο όπου το Vidalia χρησιμοποιεί για τα αρχεία δεδομένων."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
@@ -4009,30 +3749,23 @@ msgid "Unable to open log file '%1': %2"
msgstr "Δεν ήταν δυνατό να ανοίξει το αρχείο καταγραφής '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Απαιτείται κάποια τιμή για την παράμετρο:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Δόθηκε μη έγκυρος κώδικας για την γλώσσα:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Δόθηκε μη έγκυρο είδος GUI:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Δόθηκε μη έγκυρο επίπεδο καταγραφών:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Μια διεργασία του Vidalia μπορεί να εκτελείται ήδη. Αν πραγματικά δεν υπάρχει άλλη μια διεργασία του Vidalia σε εκτέλεση, μπορείτε να διαλέξετε να συνεχίσετε ούτε σι άλλος.\n"
-"\n"
-"Θέλετε να συνεχίσετε την εκκίνηση του Vidalia;"
+msgstr "Μια διεργασία του Vidalia μπορεί να εκτελείται ήδη. Αν πραγματικά δεν υπάρχει άλλη μια διεργασία του Vidalia σε εκτέλεση, μπορείτε να διαλέξετε να συνεχίσετε ούτε σι άλλος.\n\nΘέλετε να συνεχίσετε την εκκίνηση του Vidalia;"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -4065,5 +3798,3 @@ msgstr "%1 ώρες"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 λεπτά"
-
-
diff --git a/src/vidalia/i18n/po/eo/qt_eo.po b/src/vidalia/i18n/po/eo/qt_eo.po
index 9b127dd..249083c 100644
--- a/src/vidalia/i18n/po/eo/qt_eo.po
+++ b/src/vidalia/i18n/po/eo/qt_eo.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# identity <eeemsi at googlemail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-22 16:13+0000\n"
+"PO-Revision-Date: 2011-03-04 18:50+0000\n"
"Last-Translator: identity <eeemsi at googlemail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bajtoj"
-
-
diff --git a/src/vidalia/i18n/po/eo/vidalia_eo.po b/src/vidalia/i18n/po/eo/vidalia_eo.po
index 1f641af..0f67fe2 100644
--- a/src/vidalia/i18n/po/eo/vidalia_eo.po
+++ b/src/vidalia/i18n/po/eo/vidalia_eo.po
@@ -1,12 +1,13 @@
#
-# identity <eeemsi at googlemail.com>, 2011.
+# Translators:
+# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
-"Last-Translator: identity <eeemsi at googlemail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -197,10 +198,7 @@ msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia ne povis forigi Tor-servon.\n"
-"\n"
-"Eble vi devas forigi ĝin permane. "
+msgstr "Vidalia ne povis forigi Tor-servon.\n\nEble vi devas forigi ĝin permane. "
msgctxt "AppearancePage"
msgid "Language"
@@ -235,10 +233,6 @@ msgid "Show Settings"
msgstr "Montri agordojn "
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor-bendlarĝuzado"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Rekomencigo"
@@ -278,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Rezigni"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Lanĉante HTTPS-pontopeto..."
@@ -431,20 +429,27 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Pasvorto nepras"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Memori mian pasvorton"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
-"Vidalia konektis al Tor-proceso kiu bezonas pasvorton.\n"
-"Bonvolu entajpi vian stirpasvorton:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1339,10 +1344,6 @@ 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"
@@ -1370,6 +1371,10 @@ 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"
@@ -1531,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia povas malfermi la ligilon kiun vi selektis en via defaŭlta "
-"foliumilo. Se via foliumilo nuntempe ne estas agordita por Tor-uzado, via "
-"peto ne estos anonima."
+msgstr "Vidalia povas malfermi la ligilon kiun vi selektis en via defaŭlta foliumilo. Se via foliumilo nuntempe ne estas agordita por Tor-uzado, via peto ne estos anonima."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1548,9 +1550,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ne povis malfermi la selektitan ligilon en via foliumilo. Ĉiukaze vi"
-" povas kopii la URL-on kaj ĝin alglui en via foliumilo."
+msgstr "Vidalia ne povis malfermi la selektitan ligilon en via foliumilo. Ĉiukaze vi povas kopii la URL-on kaj ĝin alglui en via foliumilo."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1657,34 +1657,6 @@ 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"
@@ -1693,10 +1665,6 @@ msgid "View"
msgstr "Rigardi"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Helpo"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Eraro lanĉante foliumilon"
@@ -1809,10 +1777,6 @@ 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"
@@ -1832,9 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia ne povis lanĉi Tor-n. Kontrolu viajn agordojn por certiĝi ke korekta"
-" nomo kaj loko de via Tor plenumebla dosiero estas specifita."
+msgstr "Vidalia ne povis lanĉi Tor-n. Kontrolu viajn agordojn por certiĝi ke korekta nomo kaj loko de via Tor plenumebla dosiero estas specifita."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1872,9 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor-programaro bezonas ke Vidalia sendu la enhavojn de aŭtentiga kuketo, sed"
-" Vidalia ne povis trovi ajn."
+msgstr "Tor-programaro bezonas ke Vidalia sendu la enhavojn de aŭtentiga kuketo, sed Vidalia ne povis trovi ajn."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1896,21 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia ne povis registri por kelkaj eventoj. Multe da trajtoj de Vidalia "
-"povas esti neuzeblaj."
-
-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 ""
+msgstr "Vidalia ne povis registri por kelkaj eventoj. Multe da trajtoj de Vidalia povas esti neuzeblaj."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1953,82 +1899,11 @@ 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 ""
@@ -2088,13 +1963,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fiaskis (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2112,6 +2005,16 @@ 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,"
@@ -2119,6 +2022,20 @@ 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"
@@ -2372,19 +2289,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2427,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2530,6 +2435,22 @@ 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 ""
@@ -2855,10 +2776,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3103,6 +3020,14 @@ 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 ""
@@ -3147,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3439,6 +3360,22 @@ 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 ""
@@ -3475,6 +3412,12 @@ 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 ""
@@ -3553,6 +3496,30 @@ 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 ""
@@ -3831,5 +3798,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/es/qt_es.po b/src/vidalia/i18n/po/es/qt_es.po
index a8ed761..57ed646 100644
--- a/src/vidalia/i18n/po/es/qt_es.po
+++ b/src/vidalia/i18n/po/es/qt_es.po
@@ -1,14 +1,12 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
"Last-Translator: Automatically generated\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
+"Language-Team: Spanish (Castilian) <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -441,5 +439,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/es/vidalia_es.po b/src/vidalia/i18n/po/es/vidalia_es.po
index 2cedd62..43569da 100644
--- a/src/vidalia/i18n/po/es/vidalia_es.po
+++ b/src/vidalia/i18n/po/es/vidalia_es.po
@@ -1,17 +1,16 @@
#
# Translators:
-# Daniel Franganillo <dfranganillo at gmail.com>, 2011.
-# <lenazun at gmail.com>, 2011.
+# <gioyik at gmail.com>, 2011.
+# <josua.falken at gmail.com>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <santiagotorresarias at hotmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-22 19:54+0000\n"
-"Last-Translator: lenazun <lenazun at gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: JosuaFalken <josua.falken at gmail.com>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -46,9 +45,7 @@ msgstr "'%1' no es una dirección IP válida."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Ha seleccionado autenticación por 'Contraseña', pero no ha especificado "
-"ninguna."
+msgstr "Ha seleccionado autenticación por 'Contraseña', pero no ha especificado ninguna."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -148,75 +145,62 @@ msgstr "Control de Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Utilizar una conexión TCP (ControlPort)"
+msgstr "Uso de la conexión TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Dirección:"
+msgstr "Ruta de acceso:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Utilizar un socket de dominio de Unix (ControlSocket)"
+msgstr "Usar socket de dominio Unix (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Editar el torrc actual"
+msgstr "Editar actual torrc"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTA: esto editará el torrc cargado en este momento"
+msgstr "NOTA: esto será editado mientras torrc se carga"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "No existe la dirección de ControlSocket"
+msgstr "La ruta de ControlSocket de no 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 ""
-"La ubicación del archivo de configuración de tor contiene caracteres que no "
-"pueden ser representados en la codificación de caracteres de 8 bits "
-"utilizada por tu sistema."
+msgstr "La ubicación especificada del archivo de configuración de Tor contiene caracteres que no se puede representar en la codificación de caracteres actual de su sistema 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 ""
-"La ubicacion de la carpeta de datos de Tor contiene caracteres que no pueden"
-" ser representados en la codificación de caracteres de 8 bits utilizada por "
-"tu sistema."
+msgstr "La ubicación especificada del directorio contiene caracteres que no se puede representar en la codificación de caracteres actual de su sistema de 8 bits."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Adveretencia"
+msgstr "Advertencia"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Has camiado la dirección de torrc ¿deseas reiniciar Tor?"
+msgstr "Ha cambiado la ruta de torrc, ¿le gustaría reiniciar Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Archivo de configuración de Tor (torrc);; Todos los Archivos(*)"
+msgstr "Archivo de configuración Tor (torrc);;todos los archivos (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Elige un archivo para utilizar como dirección de Tor socket"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configurar ControlPort automáticamente"
+msgstr "Selecciona un archivo para su uso vía la ruta del Tor socket"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia no fue capaz de eliminar el servicio de Tor.\n"
-"\n"
-"Puede que necesite eliminarlo de manera manual."
+msgstr "Vidalia no fue capaz de eliminar el servicio de Tor.\n\nPuede que necesite eliminarlo de manera manual."
msgctxt "AppearancePage"
msgid "Language"
@@ -251,10 +235,6 @@ 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"
@@ -294,6 +274,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Ancho de banda gráfico"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Iniciando la solicitud de puente HTTPS."
@@ -447,20 +431,27 @@ msgid "Control socket is not connected."
msgstr "Conector de Control no está conectado."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Contraseña requerida"
+msgid "Problem connecting to Tor"
+msgstr "Error de conexión con Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Recordar mi contraseña"
+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 "Tor se está ejecutando, pero Vidalia no puede conectarse a él. \n\nEsto puede ocurrir cuando alguna otra cosa (como otro activo proceso de Vidalia, o un proceso de Vidalia que se colgó) lanzado Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia se ha conectado a un proceso Tor en funcionamiento que requiere una "
-"contraseña. Introduzca su contraseña de control:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Usted tendrá que detener el proceso antes de Tor Vidalia puede iniciar uno nuevo."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia puede intentar reiniciar Tor por usted. Si lo hace, se cerrarán todas las conexiones activas a través de su proceso de Tor."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -472,8 +463,7 @@ msgstr "Error enviando comando de control. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Conexión desconectada mientras se trataba de leer una línea de información."
+msgstr "Conexión desconectada mientras se trataba de leer una línea de información."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
@@ -1277,15 +1267,33 @@ msgstr "Taiwán"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Enviar un reporte de fallo"
+msgstr "Presentar un informe de error"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia encontro un error y debió cerrarse"
+msgstr "Vidalia ha encontrado un error y es necesario para cerrar"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Un reporte de error se ha creado que puede enviar automáticamente a los desarrolladores de Vidalia para ayudar a identificar y solucionar el problema. El informe presentado no contiene ninguna información de identificación personal, pero su conexión con el servidor de informes de accidente no pueden ser anónimas."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Por favor, describa lo que estaba haciendo antes de que la aplicación fallara (opcional):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Enviar mi informe de errores a los desarrolladores de Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Reiniciar vidalia"
+msgstr "Reiniciar Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
@@ -1293,47 +1301,25 @@ msgstr "No reiniciar"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "No ha sido posible reiniciar Vidalia"
+msgstr "No se puede 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"
+msgstr "No hemos podido reiniciar automáticamente Vidalia. Por favor, reinicia manualmente."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Por favor envíe un reporte:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Conectando ..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Enviando informe de errores ..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Un reporte del cierre forzoso de la aplicación se ha creado para que usted "
-"pueda enviarlo a los desarrolladores de Vidalia y así ayudar a identificar "
-"una solución al problema. El reporte enviado no contiene ninguna información"
-" personal identificable."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"con una descripción de lo que estaba haciendo antes del cierre forzoso de la"
-" aplicación, junto con los siguientes archivos que corresponden al reporte "
-"del cierre forzoso:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Recibiendo respuesta ..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1360,10 +1346,6 @@ 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"
@@ -1391,6 +1373,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Revisar ahora"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Conectarse a Tor automáticamente"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1552,10 +1538,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia puede abrir el enlace seleccionado en su Navegador predeterminado. "
-"Si su Navegador no está configurado actualmente para usar el Tor, la "
-"solicitud no será anónima."
+msgstr "Vidalia puede abrir el enlace seleccionado en su Navegador predeterminado. Si su Navegador no está configurado actualmente para usar el Tor, la solicitud no será anónima."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1569,9 +1552,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. "
-"Puede intentarlo copiando el URL y pegándolo en su navegador."
+msgstr "Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. Puede intentarlo copiando el URL y pegándolo en su navegador."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1619,7 +1600,7 @@ msgstr "Depurar"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr "Informacion"
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1678,34 +1659,6 @@ 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"
@@ -1714,10 +1667,6 @@ 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"
@@ -1830,10 +1779,6 @@ 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"
@@ -1853,9 +1798,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia no pudo iniciar Tor. Verifique sus preferencias para asegurar que "
-"estén especificados el nombre correcto y la localización del ejecutable Tor."
+msgstr "Vidalia no pudo iniciar Tor. Verifique sus preferencias para asegurar que estén especificados el nombre correcto y la localización del ejecutable Tor."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1893,15 +1836,11 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor requiere que Vidalia envíe el contenido de una cookie de autenticación, "
-"pero Vidalia no pudo encontrar ninguna."
+msgstr "Tor requiere que Vidalia envíe el contenido de una cookie de autenticación, pero Vidalia no pudo encontrar ninguna."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"¿Le gustaría examinar usted mismo para encontrar el archivo "
-"'control_auth_cookie'?"
+msgstr "¿Le gustaría examinar usted mismo para encontrar el archivo 'control_auth_cookie'?"
msgctxt "MainWindow"
msgid "Data Directory"
@@ -1919,23 +1858,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia no pudo registrar algunos eventos. Muchas de las características de "
-"Vidalia pueden no estar disponibles."
-
-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."
+msgstr "Vidalia no pudo registrar algunos eventos. Muchas de las características de Vidalia pueden no estar disponibles."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1945,10 +1868,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"La versión actualmente instalada de Tor está desactualizada o no se "
-"recomiendo su uso. Por favor, visite el sitio web de Tor y descargue la "
-"versión más reciente."
+msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomiendo su uso. Por favor, visite el sitio web de Tor y descargue la versión más reciente."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1958,9 +1878,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Todas las conexiones subsecuentes parecerán diferentes que sus conexiones "
-"antiguas."
+msgstr "Todas las conexiones subsecuentes parecerán diferentes que sus conexiones antiguas."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1983,97 +1901,19 @@ 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 ""
-"La versión actualmente instalada de Tor está desactualizada o no se "
-"recomiendo su uso."
+msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomiendo su uso."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
-"¿Le gustaría verificar si hay un nuevo paquete disponible para su "
-"instalación?"
+msgstr "¿Le gustaría verificar si hay un nuevo paquete disponible para su instalación?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
@@ -2083,8 +1923,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor ha cerrado automáticamente su conexión para proteger su anonimato."
+msgstr "Tor ha cerrado automáticamente su conexión para proteger su anonimato."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2098,9 +1937,7 @@ msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"En este momento no hay paquetes de software Tor disponibles para su "
-"computadora."
+msgstr "En este momento no hay paquetes de software Tor disponibles para su computadora."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2116,39 +1953,51 @@ msgstr "Ocurrió el siguiente error:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Una de sus aplicaciones %1a puede estar haciendo una conexión sin encriptar y potencialmente peligrosa por el puerto %2."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Cualquier cosa enviada a través de esta conexión puede ser monitoreada. Por "
-"favor cheque la configuración de su aplicación e utilize protocolos "
-"encriptados, como SSL, si es posible"
+msgstr "Todo lo que envie a través de esta conexión podría ser monitorizado y supervisado. Por favor, revise la configuración de la aplicación y use sólamente protocolos encriptados, tales como SSL, si es posible."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "falló (%1)"
+msgid "toolBar"
+msgstr "Barra de Herramientas"
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."
+msgid "Start"
+msgstr "Iniciar"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Parar"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Recargar la configuración de Tor"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Acciones"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Desencadenando torrc de %1 a %2"
+msgstr "inicio independiente de torrc desde %1 a %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Actualmente está ejecutando un repetidor. La detención del mismo interrumpiría cualesquiera conexiones que tengan abiertas los clientes.\n"
-"\n"
-"¿Podría darle tiempo a los clientes de encontrar un nuevo repetidor?"
+msgstr "Actualmente está ejecutando un repetidor. La detención del mismo interrumpiría cualesquiera conexiones que tengan abiertas los clientes.\n\n¿Podría darle tiempo a los clientes de encontrar un nuevo repetidor?"
msgctxt "MainWindow"
msgid ""
@@ -2158,20 +2007,36 @@ msgid ""
msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablemente Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia trató de reiniciar Tor, pero no pudo. Por favor, consulte el Administrador de tareas para asegurar que no haya otros procesos de Tor iniciados."
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probablemente un cliente de correo electrónico)"
+msgid "failed (%1)"
+msgstr "falló (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "probablemente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probablemente un cliente de correo electrónico,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Una de sus aplicaciones %1 parece estar estableciendo una conexión "
-"potencialmente no cifrada e insegura al puerto %2."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Su repetidor se está deteniendo.\nHaga clic de nuevo en “Detener” para detener ahora su repetidor."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Error recargando configuracion"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia no pudo recargar la configuración de Tor."
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2195,9 +2060,7 @@ msgstr "Nombre de Archivo de Registro requerido"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Debe escribir un nombre de archivo para poder guardar en él los mensajes de "
-"registro."
+msgstr "Debe escribir un nombre de archivo para poder guardar en él los mensajes de registro."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2409,8 +2272,7 @@ msgstr "Historial del Registro de Mensajes"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr ""
-"Cantidad de mensajes que aparecerán en la ventana del registro de mensajes"
+msgstr "Cantidad de mensajes que aparecerán en la ventana del registro de mensajes"
msgctxt "MessageLog"
msgid "messages"
@@ -2422,44 +2284,31 @@ msgstr "Examinar"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Habilitar el guardado automático en un archivo de todos los mensajes nuevos"
+msgstr "Habilitar el guardado automático en un archivo de todos los mensajes nuevos"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
msgstr "Guardar automáticamente a un archivo los nuevos mensajes del registro"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Basico"
-
-msgctxt "MessageLog"
-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 "toolbar"
+msgstr "Barra de Herramientas"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Mensajes que aparecen cuando algo ha \n"
-"ido muy mal y Tor no puede continuar."
+msgstr "Mensajes que aparecen cuando algo ha \nido muy mal y Tor no puede continuar."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Mensajes que aparecen solamente cuando \n"
-"algo ha ido mal con Tor."
+msgstr "Mensajes que aparecen solamente cuando \nalgo ha ido mal con Tor."
msgctxt "MessageLog"
msgid ""
@@ -2467,40 +2316,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Mensajes que aparecen raramente \n"
-"durante la operación normal de Tor y no \n"
-"se consideran errores, pero de los que es posible que"
+msgstr "Mensajes que aparecen raramente \ndurante la operación normal de Tor y no \nse consideran errores, pero de los que es posible que"
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Mensajes que aparecen frecuentemente \n"
-"durante la operación normal de Tor."
+msgstr "Mensajes que aparecen frecuentemente \ndurante la operación normal de Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Mensajes muy especializados principalmente para \n"
-"uso de los desarrolladores de Tor."
+msgstr "Mensajes muy especializados principalmente para \nuso de los desarrolladores de Tor."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"No se puede escribir el archivo %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa de Red de Tor"
+msgstr "No se puede escribir el archivo %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2602,6 +2437,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Mapa de Red"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Repetidor"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Estado"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Puente no válido"
@@ -2618,17 +2469,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Debe especificar una dirección IP o nombre del equipo y un número de puerto "
-"para configurar Tor para usar un proxy para acceder a Internet."
+msgstr "Debe especificar una dirección IP o nombre del equipo y un número de puerto para configurar Tor para usar un proxy para acceder a Internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Debe especificar uno o más puertos a los que su cortafuegos le permita "
-"conectarse."
+msgstr "Debe especificar uno o más puertos a los que su cortafuegos le permita conectarse."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2660,9 +2507,7 @@ msgstr "Puerto:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Active para conectarse solamente con repetidores que usen puertos permitidos"
-" por la configuración de su cortafuegos"
+msgstr "Active para conectarse solamente con repetidores que usen puertos permitidos por la configuración de su cortafuegos"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2684,9 +2529,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Active para peticiones de directorios encriptadas y opcionalmente, usar "
-"puentes repetidores para acceder a la red Tor"
+msgstr "Active para peticiones de directorios encriptadas y opcionalmente, usar puentes repetidores para acceder a la red Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2724,18 +2567,15 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e "
-"intentar de nuevo o probar con otro método para encontrar nuevos puentes."
+msgstr "Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e intentar de nuevo o probar con otro método para encontrar nuevos puentes."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puentes"
+msgstr "Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puentes"
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Dirección"
+msgstr "Dirección:"
msgctxt "NetworkPage"
msgid "Type:"
@@ -2743,7 +2583,7 @@ msgstr "Tipo:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Debes seleccionar un tipo de proxy"
+msgstr "Debe seleccionar el tipo de proxy."
msgctxt "NetworkPage"
msgid "SOCKS 4"
@@ -2759,7 +2599,7 @@ msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP/HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2917,17 +2757,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Ha configurado Tor para actuar como repetidor de puente para usuarios "
-"censurados, pero su versión de Tor no soporta puentes."
+msgstr "Ha configurado Tor para actuar como repetidor de puente para usuarios censurados, pero su versión de Tor no soporta puentes."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Por favor, mejore su versión de Tor o configúrelo para actuar como un "
-"repetidor regular."
+msgstr "Por favor, mejore su versión de Tor o configúrelo para actuar como un repetidor regular."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2942,10 +2778,6 @@ msgid "Run as a client only"
msgstr "Ejecutar como sólo cliente"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Repetidor de tráfico para la red Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Puerto repetidor:"
@@ -2983,9 +2815,7 @@ msgstr "Nombre de su repetidor"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Puerto por el que los usuarios y otros repetidores pueden comunicarse con su"
-" repetidor"
+msgstr "Puerto por el que los usuarios y otros repetidores pueden comunicarse con su repetidor"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2999,9 +2829,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Para conexiones de internet con velocidades de descarga rápida pero subida "
-"lenta, por favor escriba su velocidad de subida aquí."
+msgstr "Para conexiones de internet con velocidades de descarga rápida pero subida lenta, por favor escriba su velocidad de subida aquí."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3059,9 +2887,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"La tasa máxima de su ancho de banda debe ser mayor o igual que su tasa de "
-"ancho de banda promedio. Ambos valores deben ser al menos 20KB/s."
+msgstr "La tasa máxima de su ancho de banda debe ser mayor o igual que su tasa de ancho de banda promedio. Ambos valores deben ser al menos 20KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3122,18 +2948,13 @@ msgstr "Mostrar ayuda acerca de las políticas de salida"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"¿A cuáles recursos de Internet podrán acceder los usuarios conectados a su "
-"repetidor?"
+msgstr "¿A cuáles recursos de Internet podrán acceder los usuarios conectados a su repetidor?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor seguirá bloqueando algún correo saliente y aplicaciones de compartir "
-"archivos de manera predeterminada para reducir el correo basura y otros "
-"abusos."
+msgstr "Tor seguirá bloqueando algún correo saliente y aplicaciones de compartir archivos de manera predeterminada para reducir el correo basura y otros abusos."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3146,9 +2967,7 @@ msgstr "Permitir a otros acceder a su puente dándoles esta línea:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Este es el identificador de su puente repetidor que puede ofrecer a otras "
-"personas"
+msgstr "Este es el identificador de su puente repetidor que puede ofrecer a otras personas"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3166,9 +2985,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Permita que su repetidor siga ejecutándose para que los clientes tengan más "
-"oportunidades de encontrarlo y usarlo"
+msgstr "Permita que su repetidor siga ejecutándose para que los clientes tengan más oportunidades de encontrarlo y usarlo"
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3182,9 +2999,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor devolvió una respuesta con formato incorrecto cuando Vidalia solicitó el"
-" historial de utilización de sus puentes."
+msgstr "Tor devolvió una respuesta con formato incorrecto cuando Vidalia solicitó el historial de utilización de sus puentes."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3200,11 +3015,19 @@ msgstr "<a href=\"#bridgeUsage\">¿Quién ha utilizado mi puente?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">¿Que es esto?</a>"
+msgstr "<a href=\"#bridgeHelp\">¿Qué es esto?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Distribuir mi dirección de puente automaticamente"
+msgstr "Distribuir automáticamente mi dirección de puente (bridge)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Repetidor de tráfico dentro de la red de Tor (Nodo Intermedio)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Repetidor de Tráfico para la red de Tor (Nodo de salida)"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
@@ -3214,9 +3037,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Dirección de correo electrónico en la cual podría localizársele si hubiera un\n"
-"problema con su repetidor. Pudiera incluir también su huella PGP o GPG."
+msgstr "Dirección de correo electrónico en la cual podría localizársele si hubiera un\nproblema con su repetidor. Pudiera incluir también su huella PGP o GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3226,9 +3047,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Por favor, configure al menos un servidor de directorios y un puerto virtual"
-" por cada servicio que quiera guardar. Elimine los otros."
+msgstr "Por favor, configure al menos un servidor de directorios y un puerto virtual por cada servicio que quiera guardar. Elimine los otros."
msgctxt "ServicePage"
msgid "Error"
@@ -3255,10 +3074,6 @@ 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"
@@ -3296,8 +3111,7 @@ msgstr "Copiar dirección onion del servicio seleccionado al portapapeles"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Explorar sus archivos y elegir un directorio para servicios seleccionados"
+msgstr "Explorar sus archivos y elegir un directorio para servicios seleccionados"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3309,25 +3123,22 @@ msgstr "Copiar al portapapeles"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor está corriendo"
+msgstr "El software de Tor se está ejecutando"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Usted esta ejecutando las version \"%1\" de Tor"
+msgstr "Que se está ejecutando la versión \"%1\" de la aplicacion Tor."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor no está corriendo"
+msgstr "La aplicacion Tor no se está ejecutando"
msgctxt "StatusEventWidget"
msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Seleccione \"Iniciar Tor\" en el panel de control de Vidalia para reiniciar "
-"Tor. Si tor se cerró sin inesperadamente, seleccione la pestaña de "
-"\"Avanzado\" para obtener detalles de cualquier error encontrado."
+msgstr "Haga clic en \"Iniciar Tor\" en el Panel de Control de Vidalia para reiniciar el software Tor. Si Tor se cerro inesperadamente, seleccione la pestaña superior \"Avanzado\" para más detalles acerca de los errores encontrados."
msgctxt "StatusEventWidget"
msgid ""
@@ -3335,11 +3146,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"Actualmente está ejecutando la versión \"%1\" del software Tor, la cuál ya "
-"no es recomendada. Por favor actualice a la versión más reciente del "
-"software, la cuál podría contener mejoras importantes de seguridad, "
-"confiabilidad y desempeño."
+msgstr "Se está ejecutando la versión \"%1\" de la aplicacion Tor, que ya no se recomienda por obsoleta. Por favor, actualize a la versión más reciente del software, que contienen importantes mejoras de seguridad, fiabilidad y ajustes de rendimiento."
msgctxt "StatusEventWidget"
msgid ""
@@ -3347,15 +3154,11 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"Actualmente está ejecutando la versión \"%1\" del software Tor, la cuál ya "
-"podría no funcionar con la red Tor. Por favor actualice a la versión más "
-"reciente del software, la cuál podría contener mejoras importantes de "
-"seguridad, confiabilidad y desempeño."
+msgstr "Se está ejecutando la versión \"%1\" de la aplicacion Tor, lo que puede no funcionar con la red actual Tor. Por favor, actualize a la versión más reciente del software, que pueden contener importantes de seguridad, fiabilidad y ajustes de rendimiento."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Su software Tor está desactualizado"
+msgstr "Su software de Tor está obsoleto"
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
@@ -3365,22 +3168,17 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Hemos establecido una conexión exitosa con la red Tor. Ahora puede "
-"configurar sus aplicaciones para usar la Internet de forma anónima."
+msgstr "Ha sido establecida la conexión a la red Tor, con exito. Ahora puede configurar sus aplicaciones para utilizar Internet de forma anónima."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Error del Software Tor"
+msgstr "Tor error de Aplicacion"
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"El software Tor ha encontrado un fallo interno. Por favor reporte el "
-"siguiente mensaje de error a los desarrolladores de Tor en "
-"bugs.torproject.org: \"%1\""
+msgstr "La aplicacion Tor ha detectado un error interno. Por favor, informe del siguiente mensaje de error a los desarrolladores de Tor en bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3388,11 +3186,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor ha determinado que el reloj de su ordenador podría estar configurado %1"
-" segundos en el pasado, comparado con la fuente \"%2\". Si su reloj no está "
-"configurado correctamente, Tor no podrá funcionar. Por favor verifique que "
-"su ordenador está mostrando la hora correcta."
+msgstr "Tor ha determinado que el reloj del equipo puede estar configurado con%1 segundos de retraso en comparación con la fuente \"%2\". Si la hora de su equipo no es correcta, Tor no funcionara correctamente. Por favor, verifique que equipo tiene configurada la hora correcta."
msgctxt "StatusEventWidget"
msgid ""
@@ -3400,15 +3194,11 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor ha determinado que el reloj de su ordenador podría estar configurado %1"
-" segundos en el futuro, comparado con la fuente \"%2\". Si su reloj no está "
-"configurado correctamente, Tor no podrá funcionar. Por favor verifique que "
-"su ordenador está mostrando la hora correcta."
+msgstr "Tor ha determinado que el reloj del equipo puede estar configurado con%1 segundos de adelanto en comparación con la fuente \"%2\". Si la hora de su equipo no es correcta, Tor no funcionara correctamente. Por favor, verifique que equipo tiene configurada la hora correcta."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "El reloj de su ordenador está potencialmente incorrecto"
+msgstr "La hora configurada en su equipo es totalmente incorrecta"
msgctxt "StatusEventWidget"
msgid ""
@@ -3416,25 +3206,18 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"Una de las aplicaciones en su ordenador podría haber intentado establecer "
-"una conexión no cifrada a través de Tor al puerto %1. Enviar información no"
-" cifrada por la red Tor es peligroso y es recomendado. Para su protección, "
-"Tor ha cerrado esta conexión automáticamente."
+msgstr "Una de las aplicaciones de su equipo puede haber tratado de hacer una conexión sin cifrar a través del puerto%1. El envío de esta información sin encriptar sobre la red Tor es peligroso y no se recomienda. Para su protección, Tor cerrara automáticamente esta conexión."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Una de las aplicaciones en su ordenador podría haber intentado establecer "
-"una conexión no cifrada a través de Tor al puerto %1. Enviar información no"
-" cifrada por la red Tor es peligroso y es recomendado. "
+msgstr "Una de las aplicaciones de su equipo puede haber tratado de hacer una conexión sin cifrar a través del puerto%1. El envío de esta información sin encriptar sobre la red Tor es peligroso y no se recomienda."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "¡Conexión potencialmente peligrosa!"
+msgstr "Conexión potencialmente peligrosa!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3442,108 +3225,81 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Una de sus aplicaciones ha establecido una conexión a través de Tor a \"%1\""
-" usando un protocolo que podría filtrar información sobre su destino. Por "
-"favor asegúrese de configurar sus aplicaciones utilizando solamente SOCKS4a "
-"o SOCKS5 con resolución remota del nombre del host."
+msgstr "Una de las aplicaciones ha establecido una conexión a través de Tor a traves de \"%1\" con un protocolo que puede revelar información sensible sobre su destino. Por favor asegúrese que configura sus aplicaciones para uso exclusivo con SOCKS4 o SOCKS5 con resolución de nombres remoto."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocolo SOCKS desconocido"
+msgstr "SOCKS: Protocolo desconocido"
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Una de sus aplicaciones ha tratado de establecer una conexión a través de "
-"Tor usando un protocolo que Tor no reconoce. Por favor asegúrese de "
-"configurar sus aplicaciones utilizando solamente SOCKS4a o SOCKS5 con "
-"resolución remota del nombre del host."
+msgstr "Una de las aplicaciones ha tratado de establecer una conexión a través de Tor usando un protocolo que Tor no entiende. Por favor asegúrese que configurar sus aplicaciones para uso exclusivo con SOCKS4 o SOCKS5 con resolución de nombres remoto."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Nombre del Host de Destino inválido"
+msgstr "Nombre de servidor no valido"
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Una de sus aplicaciones ha tratado de establecer una conexión a través de "
-"Tor a \"%1\", el cuál no es reconocido por Tor como un nombre de host "
-"válido. Por favor revise la configuración de su aplicación."
+msgstr "Una de las aplicaciones ha tratado de establecer una conexión a través de Tor para \"%1\", Tor no reconoce como válido el nombre de servidor, proporcionado. Por favor, revise la configuración de la aplicación."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Dirección IP Externa Cambiada"
+msgstr "Dirección IP externa cambiada"
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"Tor ha determinado que la dirección IP pública de su retransmisión es "
-"actualmente %1%2. Si esto no es correcto, por favor considere establecer "
-"la opción \"Dirección\" en la configuración de su retransmisión. "
+msgstr "Tor ha determinado que su dirección IP pública, de nodo es actualmente%1%2. Si esto no es correcto, por favor configure la opción 'Dirección' en la configuración de retransmision (configuracion de relay)."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Manipulación del DNS Detectada"
+msgstr "Secuestro de DNS detectado"
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor ha detectado que su proveedor de DNS está dando respuestas falsas para "
-"dominios que no existen. Algunos proveedores de servicios de Internet y "
-"otros proveedores de DNS como OpenDNS, son conocidos por hacer esto para "
-"mostrar su propia página de búsqueda o páginas de publicidad."
+msgstr "Tor ha detectado que su proveedor de DNS proporciona respuestas falsas para las peticiones a dominios que no existen. Algunos ISP y otros proveedores de DNS, como OpenDNS, son conocidos por hacer esto con el fin de mostrar su propio motor de búsqueda o páginas de publicidad."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor ha detectado que su proveedor de DNS está dando respuestas falsas para "
-"dominios conocidos. Ya que los clientes dependen de la red de "
-"retransmisiones de Tor para obtener respuestas de DNS precisas, su "
-"retransmisión no podrá ser configurada como una retransmisión de salida."
+msgstr "Tor detectado que su proveedor de DNS proporciona respuestas falsas para dominios conocidos. Ya que los clientes confían en los nodos transmisores de la red Tor, para proporcionar información detallada de las respuestas DNS, su servidor no se configura como un nodo de salida."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Verificando el alcance del Puerto de Servidor"
+msgstr "Comprobación de la Accesibilidad al puerto del servidor"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"Tor está tratando de terminar si el puerto del servidor de su retransmisión "
-"puede ser alcanzado por la red Tor, conectándose a si mismo en %1:%2. Esto "
-"puede tomar varios minutos."
+msgstr "Tor está tratando de determinar si el puerto de retransmisión del servidor es accesible desde la red Tor conectándose a sí mismo en%1:%2. Esta prueba puede tardar varios minutos."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "La prueba de alcance del Puerto del Servidor ha sido exitosa"
+msgstr "Prueba de acceso al Puerto del Servidor realizada con éxito!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-"¡El puerto del servidor de su retransmisión puede ser alcanzado por la red "
-"Tor!"
+msgstr "El puerto de retransmisión del servidor esta accesible desde la red Tor!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "La prueba de alcance del Puerto del Servidor ha fallado"
+msgstr "Prueba de acceso al Puerto del Servidor ha fallado!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3551,40 +3307,30 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"El puerto del servidor de su retransmisión no puede ser alcanzado por otros "
-"clientes de Tor. Esto puede suceder si se encuentra detrás de un router o un"
-" firewall que requiere configurar la redirección de puertos. Si %1:%2 i no "
-"es su dirección IP correcta y su puerto del servidor, por favor revise la "
-"configuración de su retransmisión."
+msgstr "El puerto de retransmision del servidor no es accesible por otros clientes de Tor. Esto puede suceder si estás detrás de un router o firewall que requiere configurar el redireccionamiento de puertos. Si%1:%2 no es su dirección IP correcta, ni tampoco lo es el puerto del servidor, por favor, compruebe la configuración del nodo retransmisor."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Verificando el alcance del Puerto de Directorio"
+msgstr "Comprobación de Acceso al Puerto de Directorios"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor está tratando de terminar si el puerto de directorio de su retransmisión"
-" puede ser alcanzado por la red Tor, conectándose a si mismo en %1:%2. Esto "
-"puede tomar varios minutos."
+msgstr "Tor está tratando de determinar si el puerto de su publicador de directorios es accesible desde la red Tor conectándose a sí mismo en%1:%2. Esta prueba puede tardar varios minutos."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "La prueba de alcance del Puerto de Directorio ha sido exitosa"
+msgstr "Prueba de acceso al puerto del Servidor de Directorio realizada con exito!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-"¡El puerto del directorio de su retransmisión puede ser alcanzado por la red"
-" Tor!"
+msgstr "Puerto de su servidor de directorio es accesible desde la red Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "La prueba de alcance del Puerto de Directorio ha fallado"
+msgstr "Prueba de acceso al puerto del Servidor de Directorio ha fallado!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3592,29 +3338,21 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"El puerto del directorio de su retransmisión no puede ser alcanzado por "
-"otros clientes de Tor. Esto puede suceder si se encuentra detrás de un "
-"router o un firewall que requiere configurar la redirección de puertos. Si "
-"%1:%2 i no es su dirección IP correcta y su puerto del directorio, por favor"
-" revise la configuración de su retransmisión."
+msgstr "El Puerto de su Servidor de Directorio no es accesible por otros clientes de Tor. Esto puede suceder si está detrás de un router o firewall que requiere configurar el redireccionamiento de puertos. Si%1:%2 no es su dirección IP correcta ni tampoco lo es el puerto de Servidor de directorios, por favor, compruebe la configuración de nodo retransmisor."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Descriptor de retransmisión rechazado"
+msgstr "nodo transmisor de Descriptores Rechazado"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"El descriptor de su retransmisión, el cuál permite a otros clientes "
-"conectarse a su retransmisión, fue rechazado por el servidor del directorio "
-"a las %1:%2. La razón fue: %3"
+msgstr "Su nodo transmisor de Descriptores, que permite a los clientes conectarse a su servidor, fue rechazado por el servidor de directorio en%1:%2. La razón aducida fue: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Su retransmisión está en línea"
+msgstr "Su nodo transmisor está en línea"
msgctxt "StatusEventWidget"
msgid ""
@@ -3622,12 +3360,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"Su retransmisión está en línea y disponible para su uso por otros clientes "
-"de Tor. Usted debería ver un aumento en el tráfico de la red, que se muestra"
-" en el Gráfico de Ancho de Banda, en unas cuantas horas en cuanto otros "
-"clientes conocen de la existencia de su retransmisión. ¡Gracias por "
-"contribuir a la red Tor!"
+msgstr "Su nodo ya está en línea y disponible para usar por los clientes de la red Tor. Deberia de ver un aumento en el tráfico de red que se muestra en la gráfica de ancho de banda que se ira incrementando a las pocas horas a medida que más clientes registren su nodo como repetidor de la red Tor. ¡Gracias por contribuir a la red Tor!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Estado"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Registro de mensajes"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Estado de Tor"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Mostrar en el inicio"
msgctxt "Stream"
msgid "New"
@@ -3665,6 +3414,12 @@ 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 "Vidalia no ha iniciado Tor. Tiene que parar el proceso activo Tor a través de la interfaz con la que lo inició."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Proceso %1 no pudo detener [%2]"
@@ -3683,15 +3438,13 @@ msgstr "Falló al obtener hash de la contraseña de control."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Editando torrc"
+msgstr "Edición de torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Guardar configuración. Si no se marca, aplicará la configuración a la "
-"instancia actual de Tor."
+msgstr "Guardar la configuración. Si no marca el checklist sólo se aplicarán los cambios al proceso activo,actual de Tor."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3719,21 +3472,19 @@ msgstr "Seleccionar todo"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Aplicar a todos"
+msgstr "Aplicar a todo"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Aplicar a la selección"
+msgstr "Aplicar solo a lo seleccionado"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Error conectando a Tor"
+msgstr "Error de conexión a Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"La selección está vacía. Por favor seleccione algún texto, o seleccione "
-"\"Aplicar a todos\""
+msgstr "La selección está vacía. Por favor, seleccione un texto, o consulte \"Aplicar a todo\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3745,7 +3496,31 @@ msgstr "Error"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Ha ocurrido un error abriendo el archivo torrc"
+msgstr "Se produjo un error al abrir el archivo torrc"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl + X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl + C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl + V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl + Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl + Mayús + Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl + A"
msgctxt "UPNPControl"
msgid "Success"
@@ -3757,8 +3532,7 @@ msgstr "No se encontraron dispositivos UpnP habilitados"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"No se encontraron dispositivos UPnP de puertas de enlace de Internet válidos"
+msgstr "No se encontraron dispositivos UPnP de puertas de enlace de Internet válidos"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3808,17 +3582,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia no pudo verificar la existencia de actualizaciones de software "
-"disponibles porque no pudo encontrar '%1'. "
+msgstr "Vidalia no pudo verificar la existencia de actualizaciones de software disponibles porque no pudo encontrar '%1'. "
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia no pudo verificar si hay actualizaciones de software disponibles "
-"porque el proceso de actualización de Tor terminó inesperadamente."
+msgstr "Vidalia no pudo verificar si hay actualizaciones de software disponibles porque el proceso de actualización de Tor terminó inesperadamente."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3870,9 +3640,7 @@ msgstr "Instalar"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Los siguientes paquetes de software actualizados están listos para su "
-"instalación:"
+msgstr "Los siguientes paquetes de software actualizados están listos para su instalación:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3882,6 +3650,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Versión"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Subir Informe de Errores"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "No se puede enviar el informe: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "Aceptar"
@@ -3948,13 +3724,11 @@ msgstr "Establece el directorio de Vidalia para archivos de información."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
-"Establece el nombre y la ubicación del archivo de procesos de Vidalia."
+msgstr "Establece el nombre y la ubicación del archivo de procesos de Vidalia."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
-"Establece el nombre y la ubicación del archivo de registro de Vidalia."
+msgstr "Establece el nombre y la ubicación del archivo de registro de Vidalia."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
@@ -3977,10 +3751,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "No se puede abrir el archivo de registro '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Valor requerido para el parámetro :"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Código de idioma especificado no válido:"
@@ -3997,10 +3767,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Posiblemente ya se esté ejecutando otro proceso de Vidalia. Si realmente no hay otro proceso de Vidalia ejecutándose, puede optar por continuar de todos modos.\n"
-"\n"
-"Quiere continuar con el inicio de Vidalia?"
+msgstr "Posiblemente ya se esté ejecutando otro proceso de Vidalia. Si realmente no hay otro proceso de Vidalia ejecutándose, puede optar por continuar de todos modos.\n\nQuiere continuar con el inicio de Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -4033,5 +3800,3 @@ 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 270d9d3..baa2cee 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/eu/qt_eu.po b/src/vidalia/i18n/po/eu/qt_eu.po
index 480643b..a9e3a0a 100644
--- a/src/vidalia/i18n/po/eu/qt_eu.po
+++ b/src/vidalia/i18n/po/eu/qt_eu.po
@@ -1,13 +1,11 @@
#
-# Translators:
-# <baldarra at euskalerria.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: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-11-14 14:31+0000\n"
-"Last-Translator: baldarra <baldarra at euskalerria.org>\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,182 +17,182 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "Gaitu"
+msgstr ""
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "'%1' exekutagarriak Qt %2 behar du, Qt %3 aurkitua."
+msgstr ""
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Qt Liburutegi Bateraezin arazoa"
+msgstr ""
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr "QT_LAYOUT_DIRECTION"
+msgstr ""
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "Aplikazioaren lehio nagusia aktibatzen du"
+msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr "Ados"
+msgstr ""
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "Gorde"
+msgstr ""
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr "Ireki"
+msgstr ""
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr "Utzi"
+msgstr ""
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr "Itxi"
+msgstr ""
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr "Aplikatu"
+msgstr ""
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "Berrabiarazi"
+msgstr ""
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr "Laguntza"
+msgstr ""
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "Ez gorde"
+msgstr ""
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "Ezeztatu"
+msgstr ""
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "&Bai"
+msgstr ""
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr "Denari bai"
+msgstr ""
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr "&Ez"
+msgstr ""
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "Denari ez"
+msgstr ""
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr "Gorde dena"
+msgstr ""
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr "Bertan behera utzi"
+msgstr ""
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr "Berriro saiatu"
+msgstr ""
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr "Kasurik ez"
+msgstr ""
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr "Berrezarri lehenetsiak"
+msgstr ""
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr "Itxi gorde gabe"
+msgstr ""
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr "&Ados"
+msgstr ""
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr "Izena"
+msgstr ""
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr "Tamaina"
+msgstr ""
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "Mota"
+msgstr ""
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr "Mota"
+msgstr ""
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr "Data aldatuta"
+msgstr ""
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr "Fitxategi guztiak (*)"
+msgstr ""
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "Direktorioak"
+msgstr ""
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr "&Ireki"
+msgstr ""
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr "&Gorde"
+msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr "Ireki"
+msgstr ""
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
@@ -202,8 +200,6 @@ msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
msgstr ""
-"%1 existitzen da jada.\n"
-"Ordeztu nahi al duzu?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -212,59 +208,56 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
-"Fitxategia ez da aurkitu.\n"
-"Mesedez zihurtatu fitxategi izen zuzena eman duzula."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "Nire ordenagailua"
+msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "&Berrizendatu"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Ezabatu"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "Erakutsi izkutatutako fitxategiak"
+msgstr ""
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr "Atzera"
+msgstr ""
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "Goiko direkotorioa"
+msgstr ""
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "Zerrendan ikusi"
+msgstr ""
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "Xehetasun ikuspegia"
+msgstr ""
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr "Fitxategi mota:"
+msgstr ""
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "Direktorioa:"
+msgstr ""
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
@@ -273,9 +266,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"Fitxategia ez da aurkitu.\n"
-"Zihurtatu direktorio izen zuzena eman duzula."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -283,98 +273,96 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' idatz babesturik dago.\n"
-"Ezabatu nahi al duzu hala ere?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Zihur al zaude '%1' ezabatu nahi duzula?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Ezin izan da direktorioa ezabatu."
+msgstr ""
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr "Fitxategi Guztiak (*.*)"
+msgstr ""
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "Gorde honela"
+msgstr ""
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "Gidatu"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr "Fitxategia"
+msgstr ""
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr "Ezezaguna"
+msgstr ""
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Direktorioa bilatu"
+msgstr ""
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "Erakutsi"
+msgstr ""
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Aurrera"
+msgstr ""
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr "Karpeta berria"
+msgstr ""
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "&Karpeta berria"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "Hautatu"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "Ezabatu"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "Fitxategi &izena:"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Hemen begiratu:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "Karpeta berria sortu"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Izen baliogabea"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -382,67 +370,63 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>\"%1\" izena ezin da erabili.</b><p>Saiatu beste izen bat erabiltzen, "
-"karaktere gutxiagorekin edo puntu markarik gabe."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr "Izena"
+msgstr ""
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr "Tamaina"
+msgstr ""
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Mota"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr "Mota"
+msgstr ""
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr "Data aldatua"
+msgstr ""
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "Nire ordenagailua"
+msgstr ""
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr "Ordenagailua"
+msgstr ""
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr "%1 TB"
+msgstr ""
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/eu/vidalia_eu.po b/src/vidalia/i18n/po/eu/vidalia_eu.po
index 733d34c..ea01fd2 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fa/qt_fa.po b/src/vidalia/i18n/po/fa/qt_fa.po
index 90e34f4..9d8c998 100644
--- a/src/vidalia/i18n/po/fa/qt_fa.po
+++ b/src/vidalia/i18n/po/fa/qt_fa.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 كيلو بايت"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 بايت"
-
-
diff --git a/src/vidalia/i18n/po/fa/vidalia_fa.po b/src/vidalia/i18n/po/fa/vidalia_fa.po
index 0ef8084..cb3ac7a 100644
--- a/src/vidalia/i18n/po/fa/vidalia_fa.po
+++ b/src/vidalia/i18n/po/fa/vidalia_fa.po
@@ -1,15 +1,13 @@
#
# Translators:
-# Ardeshir <ardeshir at redteam.io>, 2011, 2012.
-# <green.dove1388 at gmail.com>, 2011.
-# martin luther king <sabztunnel at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
+# Ardeshir <ardeshir at redteam.io>, 2012.
+# <behravanhamed at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-03 10:08+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
"Last-Translator: Ardeshir <ardeshir at redteam.io>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -21,7 +19,7 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "درباره ویدالیا"
+msgstr "درباره ویدالیا"
msgctxt "AboutDialog"
msgid "License"
@@ -46,8 +44,7 @@ msgstr "'%1' یک آدرس IP معتبر نیست"
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"شما احراز هویت بر اساس اسم رمز را انتخاب کردید، اما اسم رمز را مشخص نکردید."
+msgstr "شما احراز هویت بر اساس اسم رمز را انتخاب کردید، اما اسم رمز را مشخص نکردید."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -95,7 +92,7 @@ msgstr "آدرس:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "هيچكدام"
+msgstr "هیچکدام"
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -135,55 +132,51 @@ msgstr "دایرکتوری داده ها"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "ذخیره کردن داده ها برای نرم افزار تور در فهرست ذیل"
+msgstr "داده های نرم افزار تور را در دایرکتوری زیر دخیره کن"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "انتخاب کردن فهرست جهت ذخیره داده ها برای نرم افزار تُر"
+msgstr "دایرکتوری که برای ذخیره داده های نرم افزار تور استفاده شده است را انتخاب کنید"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "کنترل پنل تُر"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Use TCP connection (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "مسیر :"
+msgstr "مسیر"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Use Unix domain socket (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "torrc فعلی را ویرایش کنید"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "توجه : این torrc بارگذاری شده فعلی را ویرایش میکند"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket path doesn't exist."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
-"تعیین محل دایرکتوری Tor را داده شامل کاراکتر است که می تواند در سیستم خود "
-"رمزگذاری کاراکتر در حال حاضر 8 - بیت نشان داده نمیشود."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -191,29 +184,22 @@ msgstr "هشدار"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "شما مسیر torrc تغییر داده اید، آیا می خواهید تُر را ریستارت کنید؟"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "انتخاب فایل به مسیر سوکت از Tor استفاده کنید"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "پورتِ کنترل را بصورت خودکار پیکربندی کن"
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"ویدالیا نتوانست سرویس تور را حذف کند.⏎\n"
-"⏎\n"
-"شاید لازم باشد به طور دستی آن را حذف کنید"
+msgstr "ویدالیا نتوانست سرویس تور را حذف کند.⏎\n⏎\nشاید لازم باشد به طور دستی آن را حذف کنید"
msgctxt "AppearancePage"
msgid "Language"
@@ -233,25 +219,21 @@ msgstr "نوع واسط کاربر ویدالیا را انتخاب کن"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "ویدالیا قادر به بارگذاری زبان انتخاب شده نبود"
+msgstr "ویدالیا قادر به بارگذاری زبان انتخاب شده نبود."
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "از زمان:"
+msgstr "از:"
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "تنظیمات را مخفی کن"
+msgstr "تنظیمات را پنهان کن"
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr "نمایش تنظیمات"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "مصرف پهنای باند تور"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "تنظیم مجدد"
@@ -291,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "لغو"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "نمودار پهنای باند"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr " شروع به درخواست پل های HTTPS"
@@ -305,7 +291,7 @@ msgstr "ارسال یک درخواست HTTPS برای پل ها"
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "بارگذاری یک ليست از پل ها"
+msgstr "بارگذاری فهرستی از پل ها..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
@@ -313,7 +299,7 @@ msgstr "بارگذاری پل ها"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "ناتوان در بارگذاری پل ها:%1"
+msgstr "ناتوان در بارگذاری پل ها: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
@@ -321,25 +307,23 @@ msgstr "تلاش دوباره برای درخواست پل..."
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "كشور"
+msgstr "کشور"
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# کلاینت ها"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-"از تاریخ %1 کلاینت هایی از کشورهای زیر از بازپخش کننده شما استفاده "
-"کردهاند"
+msgstr "از تاریخ %1 کلاینت هایی از کشورهای زیر از بازپخش کننده شما استفاده کردهاند"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "گزارش استفاده از پل ها"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "گزارش کلاینتها"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -347,7 +331,7 @@ msgstr "جدید"
msgctxt "Circuit"
msgid "Open"
-msgstr "باز کن"
+msgstr "بازکن"
msgctxt "Circuit"
msgid "Building"
@@ -355,11 +339,11 @@ msgstr "درحال ساختن"
msgctxt "Circuit"
msgid "Failed"
-msgstr "ناموفق"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "بسته شده"
+msgstr "بسته شد"
msgctxt "Circuit"
msgid "Unknown"
@@ -367,1181 +351,1186 @@ msgstr "ناشناخته"
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<مسیر خالی>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "اتصال"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "وضعیت"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "بزرگنمایی روی جریان"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "بستن مدار (Del)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "بستن جریان (Del)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "کلی"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "شبکه"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "اشتراک"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "سرویس ها"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "ظاهر"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "پیشرفته"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "راهنما"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "خطا در هنگام ذخیره تنظیمات"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "ویدالیا نتوانست تنظیمات %1 شما را ذخیره کند."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "خطا در هنگام اعمال تنظیمات"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "ویدالیا نتوانست تنظیمات %1 شما را برای تور اعمال کند."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "تنظیمات"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "ویدالیا نتوانست به تور وصل شود. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "سوکت کنترل وصل نیست"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "رمز عبور مورد نياز است"
+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 "Remember my password"
-msgstr "رمز عبور مرا به ياد داشته باش"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"ويداليا به یک تور که هم اکنون درحال اجراست و به رمز عبور نیاز دارد متصل شده "
-"است. لطفن رمز عبور را وارد كنيد"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "سوکت کنترل وصل نیست"
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "خطا در ارسال دستورات کنترل"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "در حین تلاش برای خواندن یک خط از دادهها سوکت قطع شد"
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "پاسخ کنترلی نامعتبر. [%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "افغانستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "آندورا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "آنگولا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "آنتيگوآ وباربودا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "آرژانتين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "ارمنستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "درباره ویدالیا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "آذربايجان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "باهاما"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "بنگلادش"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "باربادوس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "بلاروس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "بلژیک"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "بليز"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "بوتان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "بولیوی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "بوسنی و هرزگوين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "بوتساوانا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "برزيل"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "برونئی داروالسلام"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "بلغارستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "بوركينافاسو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "بوروندی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "كامبوج"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "كامرون"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "كانادا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "كيپ ورد"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "جمهوری آفریقای مرکزی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "چاد"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "شيلی"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "چين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "كلمبيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "كومور"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "جمهوری دموكراتيک كنگو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "كنگو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "كاستاريكا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "ساحل عاج"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "كرواسی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "كوبا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "قبرس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "جمهوری چک"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "دانمارک"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "جیبوتی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "دومنيكن"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "جمهوری دومنيكن"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "اكوادور"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "مصر"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "السالوادور"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "گینه استوایی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "اريتره"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "استونی"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "فرانسه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "گابن"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "گامبيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "گرجستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "آلمان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "غنا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "گرنادا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "گواتمالا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "گینه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "گينه بيسائو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "گينه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "هنگ كنگ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "هایتی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "هندوراس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "اسرائيل"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "ايتاليا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "جامايكا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "ژاپن"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "اردن"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "قزاقستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "كنيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "کيريباتی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "كويت"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "قرقيزستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "لائوس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "لتونی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "لبنان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "لسوتو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "ليبی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "لیختن اشتاین"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "لتونی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "لوكزامبورگ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "مقدونيه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "ماداگاسكار"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "مالاوی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "مالزی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "مالی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "جزیره مالت"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "جزاير مارشال"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "موريتانی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "موريس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "جزاير ميكرونزی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "مولداوی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "موناكو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "مغولستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "مونته نگرو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "مراكش"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "موزامبيک"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "نامبيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "نائورو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "نپال"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "هلند"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "نیوزلند"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "نيكاراگوئه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "نيجر"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "نيجريه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "نروژ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "عمان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "پاكستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "پالائو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "فلسطين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "پاناما"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "پاپوآ گينه نو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "پاراگوئه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "پرو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "فيليپين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "لهستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "پرتغال"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "قطر"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "رومانی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "روسيه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "روآندا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "سنت کيتس و نويس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "سنت لوسيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "سنت وينست و گرنادين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "ساموآ"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "سن مارينو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "سائوتومه و پرنسيپ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "عربستان سعودی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "سنگال"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "صربستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "سيشل"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "سيرالئون"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "سنگاپور"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "اسلواكی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "اسلوونی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "جزاير سليمان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "سومالی"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "افریقای جنوبی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "اسپانیا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "سريلانكا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "سودان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "سورينام"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "سوییس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "سوئد"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "سوئيس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "سوريه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "تاجيكستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "تانزانيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "تايلند"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "تيمور شرقی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "توگو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "تونگا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "ترينيداد و توباگو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "تونس"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "تركيه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "تركمنستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "توالو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "اوگاندا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "اوكراين"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "امارات متحده عربی"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "انگلستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "ايالات متحده آمريكا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "اوروگوئه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "ازبكستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "وانوتائو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "واتيكان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "ونزوئلا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "ويتنام"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "صحراي غربی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "يمن"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "زامبيا"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "زيمباوه"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "زئیر"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "آلباني"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "الجزيره"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "اتريش"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "بحرين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "بنين"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "اتيوپی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "فيجی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "فنلاند"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "يونان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "گوام"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "مجارستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "ايسلند"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "هندوستان"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "اندونزی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "ايران"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "عراق"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "ايرلند"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "كره شمالی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "كره جنوبی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "ليبی"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "مالديو"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "مكزيك"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "ميانمار"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "تايوان"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "ارسال گزارش تصادف"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "ویدالیا با خطایی مواجه شد و باید بسته شود"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "راه اندازی مجدد ویدالیا"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "ریستارت نکنید"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "راه اندازی مجدد ویدالیا امکان پذیر نیست"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
-"ما نتوانستیم به طور خودکار ویدالیا راه اندازی مجدد کنیم. لطفا ویدالیا به "
-"صورت دستی ریستارت کنید."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "لطفن در این آدرس یک تیکت پر کنید:"
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
msgstr ""
-"گزارش از کار افتادن نرم افزار آماده شده و شما میتوانید آن را برای کمک به "
-"شناسایی و حل مشکل به توسعه دهندگان ویدالیا ارسال کنید. گزارش ثبت شده حاوی "
-"هیچگونه اطلاعات هویتی شخصی نیست."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
-"با شرحی از آنچه قبل ازکار افتادن نرم افزار انجام میدادید، بهمراه فایلهای "
-"مربوط به گزارش از کار افتادن:"
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "فایل اجرایی (.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "مسیر تور را انتخاب کن"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "فایل اجرایی پروکسی را انتخاب کنید"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "باید نام فایل اجرایی تور را مشخص کنید"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "آغاز ویدالیا هنگام راه اندازی سیستم"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "انتخاب فایل"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "آغاز نرم افزار تور هنگام راه اندازی ویدالیا"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "تور"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "برنامه پروکسی (اختیاری)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "آغاز یک برنامه پروکسی هنگام راه اندازی تور"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "برهان برنامه پروکسی"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "به روز رسانی نرم افزار"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "بررسی خودکار برای به روز رسانیهای جدید"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "الان چک کن"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 کیلوبایت در ثانیه"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 کیلو بایت"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 مگابایت"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 گیگابایت"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "دريافت شده:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "ارسال شده:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "فایل اکسامال داده شده یک سند قابل پردازش نیست."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "جستجو به انتهای مطالب رسید"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "حستجو به ابتدای مطالب رسید"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "متن مورد نظر پیدا نشد"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "%1 نتیجه پیدا شد"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "راهنمای ویدالیا"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "قبلی"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "حرکت به صفحه قبلی (Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "جلو"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "حرکت به صفحهی بعدی (Shift+Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "خانه"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "به خانه برو (Crtl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "کنترل + H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "پیدا کن"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "جستجو برای کلمه یا عبارتی در صفحهی فعلی (Crtl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Crtl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "ببند"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "راهنمای ویدالیا را ببند"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "انصراف"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "پیدا کن"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "قبلی را پیداکن"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "بعدی را پیدا کن"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "حساسیت به بزرگی و کوچکی حروف"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "جستجو برای کلمات کامل"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "سرفصلهای راهنما"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "مطالب"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "جستجو"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "در حال جستجو برای:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "اسناد پیدا شده"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "خطا در بارگذاری مطالب راهنما:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "بازکردن پیوند بیرونی"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1549,555 +1538,423 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"ویدالیا می تواند پیوندی را که انتخاب کردید در مرورگر پیش فرض تان بازکند. اگر"
-" مرورگرتان برای استفاده از تور پیکربندی نشده، هویتتان در هنگام درخواست مخفی "
-"نخواهد بود."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "آیا می خواهید ویدالیا پیوند را در مرورگر وب تان را باز کند؟"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "ناتوان در بازکردن پیوند"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"ویدالیا نتوانست پیوند انتخاب شده را در مرورگر وب بازکند. شما می توانید نشانی"
-" وب را کپی کرده و آن را در مرورگرتان بچسبانید."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "خطا در بازكردن فايل راهنما:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "اطلاعات مجوز"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "مجوز"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "اعتبارات"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "اشکالیابی"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "اطلاعرسانی"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "توجه"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "هشدار"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "خطا"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "ناشناخته"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "اطلاعات"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Notice"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "هشدار"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "راه اندازی تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "خروج"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "نمودار پهنایباند"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "گزارش پیامها"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "نقشهی شبکه"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "تابلوی کنترل"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "تنظیمات"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "درباره"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "راهنما"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "هویت جدید"
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Crtl+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"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "تور"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "نمایش"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "راهنمای ویدالیا"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "خطا در هنگام راه اندازی مرورگر وب"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "ویدالیا قادر به راه اندازی مرورگر وب پیکربتدی شده نبود"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "خطای راه اندازی کلاینت IM"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "ویدالیا نتوانست کاربر IM پیکربندی شده را راه اندازی کند"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "خطا در هنگام راه اندازی سرور پروکسی"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "ویدالیا قادر به راه اندازی پیشکار پیکربندی شده نبود"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "اتصال به یک فهرست بازپخش"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "برپایی یک اتصال فهرست رمزبندی شده"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "بازیابی وضعیت شبکه"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "بارگذاری وضعیت شبکه"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "بارگذاری مجوزها"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "درخواست اطلاعات بازپخش"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "بارگذاری اطلاعات بازپخش"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "در حال اتصال به شبکه تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "برپایی یک جریان تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "وصل شده به شبکه تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "وضعیت آغاز نامشخص"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "گوناگون"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "عدم تطبیق هویت"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "انجام شده"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "اتصال ردشد"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "اتمام وقت اتصال"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "خطای خواندن/نوشتن"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "نبود مسیر به میزبان"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "منابع ناکافی"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "ناشناخته"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "تور درحال اجرا نمیباشد"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "تور درحال بسته شدن است"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "همین حالا تور را متوقف کن"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "تور را متوقف کن"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "راه اندازی نرم افزار تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "راه اندازی تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "خطا در راهاندازی تور"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"ویدالیا نتوانست تور را راهاندازی کند. تنظیمات خود را دوباره بررسی کنید تا "
-"مطمین شوید مسیر فایل اجرایی تر را درست مشخص کردهاید."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "اتصال به تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "خطای اتصال"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "بازپخش فعال میباشد"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "خطا بسته شدن"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "ویدالیا نتوانست نرم افزار تور را متوقف کند."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "خطای غیرمنتظره"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "احرازهویت در تور"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "احراز هویت کوکی موردنیاز است"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"نرم افزار تور نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد "
-"اما ویدالیا نتوانست آن را پیدا کند."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "آیا می خواهید خودتان انتخاب فایل 'control_auth_cookie' را انجام دهید؟"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "فهرست داده ها"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "کوکی کنترل (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "خطا در هنگام ثبت رویدادها"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"ویدالیا نتوانست خود را برای برخی از رویدادها ثبت کند. بسیاری از خصوصیات "
-"ویدالیا ممکن است که فعال نباشند."
-
-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 "به روز رسانی برای تور موجود است"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"نسخه نصب شده تور قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تور "
-"رفته و آخرین نسخه را بارگذاری کنید."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "وب سایت تور: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
-"تمام اتصالات بعدی به صورت متفاوت از اتصالات قبلی نمایش داده خواهند شد."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "ایجاد هویت جدید به شکست انجامید"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "ارسال درگاه شکست خورد"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "ویدالیا نتوانست ارسال درگاه خودکار را پیکربندی کند."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "تابلوی کنترل ویدالیا"
+msgstr ""
msgctxt "MainWindow"
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 "پنهان کردن این پنجره"
+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 ""
-"ويداليا در حال تلاش برای تعويض کلمه عبور تر است ، اما قادر به راه اندازی "
-"مجدد نرم افزار تر نيست.لطفا نوار وظيفه(Task manager)راچك كنيد تا هيچ برنامه "
-"تُر در حال اجرا نباشد."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"نسخه نصب شده تُر قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تُر "
-"رفته و نهایی ترین نسخه آن را بارگذاری کنید."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "آيا مي خواهيد بررسي كنم نسخه جديد نر افزار تر براي نصب موجود است؟"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "اتصلات نا امن"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "تُر به صورت خودكار اتصال شما را بست تا در برابر شناسايي امن بمانيد."
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "به روز رسانی تُر موجود می باشد"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "نرم افزار شما به روز است."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "در حال حاضر نسخه اي از تُر براي كامپيوتر شما وجود ندارد."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "نصب ناموفق بود"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "ویدالیا نتوانست نرم افزار تُر را متوقف کند."
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "خطا هاي زير رخ داد:"
+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 ""
@@ -2105,23 +1962,34 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"هرآنچه بوسیله این ارتباط فرستاده شود می تواند مانیتور شود. لطفا بتنظیمات "
-"برنامه را بررسی کنید و تنها از پروتکل های رمزگذاری شده، از قبیل SSL، در صورت"
-" امکان استفاده کنید."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "ناموفق(%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "باز ژخش شما متوقف شده است./n"
+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 ""
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "راه اندازی torrc از %1 به %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2129,9 +1997,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"شما در حال حاضر يك بازپخش داريد.پايان دادن به اين بازپخش ميتواند اتصالات "
-"كاربران را متوقف كند./n/nآيا مي خواهيد به تدريج بازپخش بسته شود و به كاربران"
-" فرصت دهيد تا يك بازپخش جديد بيابند؟"
msgctxt "MainWindow"
msgid ""
@@ -2139,306 +2004,310 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"ويداليا يك نسخه از تُر را شناسايي كرده است./n/nلطفا پيغامها را براي خاطاها "
-"بررسي كنيد."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(شاید تِلنت)"
+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 "(probably an email client)"
-msgstr "(شاید یک برنامه ایمیل)"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 ""
-"به نظر میرسد یکی از برنامههای شما %1 در حال برقراری ارتباطی رمزگذاری نشده "
-"و ناامن به پورت %2 است"
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "خطا در تنظیم فیلتر"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "ویدالیا نتوانست برای دریافت گزارشات تُر ثبتنام کند"
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "خطا در بازکردن فایل گزارش"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "ویدالیا نتوانست فایل مشخص شده را باز کند"
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "نام فایل گزارش الزامی است"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "برای دخیرهی گزارش پیامها باید نام یک فایل را مشخص کنید"
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "فایل گزارش را انتخاب کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "پیامهای گزارش را ذخیره کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "فایلهای متنی"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "ویدالیا"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "جستجو در گزارش پیامها"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "پیدا کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "پیدا نشد"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "جستجو نتیجهای دربر نداشت"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "گزارش پیامها"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "فیلترهای پیام ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "تنظیم فیلترهای پیام"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "اندازهی تاریخچه ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "تعیین حداکثر تعداد پیامهای قابل نمایش"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "پاک کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "تمام پیامهای گزارش را پاک کن (کنترل + E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "کنترل + E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "کپی کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "پیامهای انتخاب شده را به دفترچه یادداشت رایانه کپی کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "کنترل + E"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "همه را انتخاب کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "تمام پیامها را انتخاب کن (کنترل + E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "کنترل + A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "همه را ذخیره کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "تمام پیامها را در یک فایل ذخیره کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "انتخاب شدهها را ذخیره کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "پیامهای انتخاب شده را در یک فایل ذخیره کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "تنظیمات"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "تنظیمات گزارش پیامها را تنظیم کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "کنترل + T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "راهنما"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "مرورگر راهنما را نمایش بده"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "ببند"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "گزارش پیام را ببند"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "انصراف"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "پیدا کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "تمام پیامهای حاوی متن جستجو را پیدا کن (کنترل + F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "کنترل + F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "زمان"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "نوع"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "پیام"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "تنظیمات فعلی گزارش پیام را ذخیره میکند"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "ذخیرهی تنظیمات"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "تغییرات تنظیمات را لغو میکند"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "لغو کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "فیلتر پیامها"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "خطا"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "هشدار"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "توجه"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "اطلاع"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "اشکالیابی"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "تاریخچهی گزارش پیامها"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "تعداد پیامهایی که در پنچرهی گزارش پیام نمایش داده میشوند."
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "پیامها"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "انتخاب فایل"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "ذخیرهی خودکار تمام گزارشهای پیام را در یک فایل قعال کن"
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "به صورت خودکار کزارش پیامها را در یک فایل ذخیره کن"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "اساسی"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "وضعیت تُر"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "پیشرفته"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "همیشه پیامهای جدید را ذخیره کن"
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr "اين پيغام زماني ظاهر مي شود /nكه تُر نتواند اتفاقات را پردازش كند."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
msgctxt "MessageLog"
msgid ""
@@ -2447,26 +2316,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Messages that appear infrequently \n"
-"during normal Tor operation and are \n"
-"not considered errors, but you may \n"
-"care about."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
msgctxt "MessageLog"
msgid ""
@@ -2474,831 +2335,802 @@ msgid ""
"\n"
"%2."
msgstr ""
-"Cannot write file %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "نقشه شبکه تُر"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "بازنمایی"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "بازآوری لیست بازپخش ها و اتصالات تُر"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "کنترل + R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "راهنما"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "راهنمای نقشهی شبکه را نشان بده"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "راهنمای نقشهی شبکه را نشان بده"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "ببند"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "نقشهی شبکه را ببند"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "انصراف"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "بزرگتر کن"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "نقشهی شبکه را بزرگ کن"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "کوچکتر کن"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "نقشهی شبکه را کوچک کن"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "به اندازهی صفحهی نمایش بزرگکن"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "بزرگنمایی کافی برای نمایش تمام مدارها نمایشدادهشده فعلی"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "کنترل + Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "فایل مورد نظر پیدا نشد"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "هيچ جزئياتي درباره ي بازپخش انتخاب شده موجود نيست."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "ناشناخته"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "تمام صفحه"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "مشاهده نقشه شبکه به صورت يك پنجره تمام صفحه"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "کنترل + 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 "پل نامعتبر"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "شناسه پل مشخص شده معتبر نمیباشد."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "کپی کردن (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"شما میبایست یک آدرس آی پی یا یک نام میزبان و یک شماره درگاه برای پیکربندی "
-"تُر مشخص کنید جهت استفاده ار یک پیشکار برای دسترسی به اینترنت."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"شما میبایست یک یا چند درگاه که بارو اجازه دسترسی به آنها را میدهد مشخص کنید."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "شماره درگاه '%1' معتبر نمیباشد."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
-"نشان بگذارید اگر شبکه محلی شما نیاز به یک پیشکار برای دسترسی به اینترنت دارد"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "برای دسترسی به اینترنت از یک پیشکار استفاده می کنم"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "تنظیمات پیشکار"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "نام کاربری:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "اسم رمز:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "درگاه:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"نشان بگذارید جهت متصل شدن به بازپخش هایی که تنها درگاه های مجاز بدست بارو را"
-" استفاده میکنند"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "بارو به من تنها اجازه دسترسی به برخی از درگاه ها را میدهد"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "تنظیمات بارو"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "درگاه های مجاز:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "۱۰۰ {80, 443?}"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"نشان بگذارید برای رمزبندی درخواست های فهرست و, اختیاری, از پلهای بازپخش برای"
-" دسترسی به شبکه تُر استفاده کنید"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
-"ارایه کننده خدمات دسترسی به اینترنت اتصالات به شبکه تُر را مسدود می کند"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "تنظیمات پل"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "افزودن یک پل:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "حذف کردن پل های منتخب از لیست"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "کپی کردن پل های منتخب در تخته یادداشت"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "پيدا كردن پل ها"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">چگونه می توانيد پل ديگری پيدا کنم؟?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">چگونه می توان پل پیدا کنم؟?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"پلِ جديدي در دسترس نيست.شما مي توانيد صبر كنيد و مجدداً سعي كنيد،يا روش "
-"ديگري امتحان كنيد براي پيدا كردن پل هاي جديد."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "بر روي راهنما كليك كنيد تا ديگر روشها را ببينيد."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Address:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Type:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "You must select the proxy type."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "قبول"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "رد"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "آنلاین"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "به خواب رفتن"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "آفلاین"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "موقعیت:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "آدرس آیپی"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "پلتفرم"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "پهنای باند"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "رمان فعالیت بدونوقفه"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "آخرین بهروزرسانی:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "کپی کن"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "به خواب رفتن"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "آنلاین"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "آفلاین"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "ناشناخته"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "اطلاعات بازپخش"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "خلاصه"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "لقب:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "وضعیت"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "موقعیت:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "آدرس آیپی"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "پلتفرم"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "پهنای باند"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "رمان فعالیت بدونوقفه"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "مشخصات تماس:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "آخرین بهروزرسانی:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "توضيحات"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "آفلاین"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "بهخواب رفتن"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 کلیوبایت"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "بازپخش"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "بزرگ نمایی بازپخش"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 بازپخش های آنلاین"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "کپی کن"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Nickname"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "اثر انگشت"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "پشتیبانی پل موجود نیست"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"شما تُر را به گونه ای پیکربندی کردید که مانند یک پل بازپخش برای کاربران "
-"سانسورشده کارکند, اما نسخه تُر شما پل ها را پشتیبانی نمی کند."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"خواهشمند است نرم افزار تُر را بروزرسانی کنید یا تُر را به گونه ای پیکربندی "
-"کنید که مانند یک بازپخش تُر نرمال کارکند."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "پل بازپخش شما در حال اجرا نمی باشد."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "شما میبایست دست کم یک لقب بازپخش و درگاه را مشخص کنید."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "اجراکردن تنها مانند یک کاربر"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "ترافیک بازپخش شده برای شبکهی تُر"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "درگاه بازپخش:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "آینه ای کردن فهرست بازپخش"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "تلاش برای پیکربندی خودکار ارسال درگاه"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "تست"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "نمایش سرفصل کمک برای ارسال درگاه"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "درگاه دارکتوری"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "شمارهی درگاه دایرکتوری"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "مشخصات تماس:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "نام بازپخش شما"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"درگاهی که کاربران و بازپخش های دیگر می توانند بوسیله آن با بازپخش شما ارتباط"
-" برقرار کنند"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "لقب:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "تنظیمات اولیه"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"برای ارتباطات اینترنتی با نرخ بارگیری (دانلود) سریع ولی نرخ بارگذاری (آپلود)"
-" کند، لطفا سرعت بارگذاری خود را اینجا مشخص کنید."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "کابل یا DSL ۲۵۶ کیلوبیت بر ثانیه"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "کابل یا DSL ۵۱۲ کیلوبیت بر ثانیه"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "کابل یا DSL ۷۶۸ کیلوبیت بر ثانیه"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1 یا کابل یا DSL ۱.۵ مگابیت بر ثانیه"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "بیش از ۱.۵ مگابیت بر ثانیه"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "خودت تغیین کن"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
-"گزینهای را که از همه بیشتر به نوع ارتباط اینترنت شما شبیه است انتخاب کنید"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "نمایش موضوعات راهنما در مورد محدودیتهای پهنای باند"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "ترخ متوسط"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "محدودهی میانگین بلندمدت پهنایباند"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "کیلوبایت بر ثانیه"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "نرخ حداکثر"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "محدودیت در حداکثر پیک پهنای باند"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"بیشترین میزان پهنای باند شما می بایست بزرگتر یا مساوی با میزان پهنای باند "
-"متوسط شما باشد. کوچکترین مقدار هردو میبایست 20 کیلوبایت در ثانیه باشد."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "محدودیتهای پهنای باند"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "درگاههای ۶۶۶۰ تا ۶۶۶۹ و ۶۶۹۷"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "چت بازپخش اینترنتی (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "درگاههای ۱۱۰، ۱۴۳، ۹۹۳ و ۹۹۵"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "دریافت ایمیل (POP , IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "درگاههایی که توسط دیگر گزینهها انتخاب نشدهاند"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "سروریسهای دیگر"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
msgstr ""
-"درگاههای ۷۰۶، ۱۸۶۳، ۵۰۵۰، ۵۲۲۲، ۸۳۰۰ و ۸۸۸۸ {706, 1863, 5050, 5190, 5222, "
-"5223, 8300 ?} {8888?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "پیام کوتاه (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "درگاه ۴۴۳"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "وبسایتهای امن (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "درگاه ۸۰"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "وبسایتها"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "موضوع راهنما در مورد سیاستهای خروج را نمایش بده"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr "به چه منابع اینترنتی کاربران قادر به دسترسی خواهند بود از بازپخش شما؟"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"تُر همچنان بعضي از ايميل ها و فايلهاي اشتراك گذاري شده ارسالي را به صورت "
-"پيشفرض مسدود كرده براي جلوگيري از اسپمينگ و استفاده هاي نادرست."
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "سیاستهای خروج"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
msgstr ""
-"بگذارید دیگران به پل شما دسترسی پیدا کنند با بیان کردن این خط به آنها:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "این هویت پل بازپخش شما می باشد که میتوانید آن را به افراد دیگر بدهید"
+msgstr ""
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "کپی کردن هویت پل بازپخش شما در تخته یادداشت"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "اخيراً استفاده نشده"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "هيچ كاربري اخيراً از بازپخش شما استفاده نكرده است."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"اجازه دهيد بازپخش شما ادامه پيدا كند اينطور كاربران شانس بيشتري دارند تا آن "
-"را پيدا كنند."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "تنظیمات پل"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "ویدالیا نتوانست تنظیمات %1 را ذخیره کند."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "The returned response was: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
msgstr ""
-"کمک به کاربران سانسورشده برای دستیابی به شبکه تُر (تُر 0.2.0.8-alpha یا "
-"جدیدتر)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"bridges.finding\">چطور می توانم یک پل را پیدا کنم؟</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">این چیست؟</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "بطور خودکار آدرس پل من را پخش کن"
+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 "لينكهاي بازپخش فهرست"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"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."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "خطا هنگام غیر منتشر کردن همه سرویس ها"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"خواهشمند است حداقل یک سرویس فهرست و یک درگاه مجازی برای هریک از سرویس هایی "
-"که مایل به ذخیره آن هستید پیکربندی کنید. بقیه ها را خذف کن."
msgctxt "ServicePage"
msgid "Error"
-msgstr "خطا"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "خواهشمند است یک سرویس انتخاب کنید."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "انتخاب فهرست سرویس"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
-"درگاه های مجازی تنها می توانند شامل شماره درگاه های معتبر باشند [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "هدف تنها می تواند شامل آدرس:درگاه, آدرس, یا درگاه باشد."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "فهرست در استفاده یک سرویس دیگر است."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "فرم"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "سرویس های پنهان فراهم شده"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "آدرس پیاز"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "درگاه مجازی"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "هدف"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "مسیر فهرست"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "فعال"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "افزودن سرویس جدید به لیست"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "برداشتن سرویس انتخاب شده از لیست"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "کپی کردن آدرس پیاز سرویس انتخاب شده در تخته یادداشت"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "مرور در سیستم فایل و برگزیدن فهرست برای سرویس انتخاب شده"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "طراحي شده توسط تُر"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "کپی به کلیپ برد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "نرم افزار تور در حال اجراست"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "شما هم اکنون در حال اجرای نسخه \"%1\" نرم افزار تور هستید "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "نرم افزار تور در حال اجرا نیست"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3306,10 +3138,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"بر روی گزینهٔ \"Start Tor\" در داخل Vidalia کنترل پانل کلیک کنید، تا نرم "
-"افزار TOR اجرا شود. اگر که TOR به صورت غیر منتظره از کار ایستاد و خارج شد، "
-"تاب بالایی \"Advanced\" را انتخاب کنید تا از جزئیات مشکل پیش آماده مطلع "
-"شوید."
msgctxt "StatusEventWidget"
msgid ""
@@ -3318,9 +3146,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که دیگر توصیه "
-"نمی شود. لطفن به آخرین نسخه از نرم افزار به روز کنید. این بروزرسانی ممکن است"
-" شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد"
msgctxt "StatusEventWidget"
msgid ""
@@ -3329,37 +3154,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که ممکن است "
-"دیگر با شبکه فعلی تور کار نکند. لطفن به آخرین نسخه از نرم افزار به روز کنید."
-" این بروزرسانی ممکن است شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد"
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "نرم افزار تور شما از رده خارج شده است"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "به شبکه تور وصل شده است"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"اتصال به شبکهٔ TOR موفقیت آمیز بود. حال میتوانید برنامههای خود را تنظیم "
-"کنید تا بتوانید به طور ناشناس از اینترنت استفاده کنید. "
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "خطای نرم افزار تور"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"نرم افزار تور با یک اشکال داخلی مواجه شد. لطفن پیام خطای زیر را برای سازندگان تور به آدرس زیر ارسال کنید:\n"
-"bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3368,9 +3186,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 "
-"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. "
-"لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد"
msgctxt "StatusEventWidget"
msgid ""
@@ -3379,13 +3194,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 "
-"ثانیه در آینده تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. "
-"لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد"
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "ساعت کامپیوتر شما اشتباه است"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3394,10 +3206,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده "
-"از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق "
-"شبکه تور، خطرناک است و توصیه نمی شود. برای محافظت از شما، تور این ارتباط را "
-"بصورت خودکار بست."
msgctxt "StatusEventWidget"
msgid ""
@@ -3405,13 +3213,10 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده "
-"از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق "
-"شبکه تور، خطرناک است و توصیه نمی شود."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "پتانسیل ارتباط خطرناک!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3420,14 +3225,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"یکی از اپلیکیشن های شما از طریق تور و پروتکلی که ممکن است اطلاعاتی از مقصد "
-"نهایی شما را فاش سازد به \"%1\" برقرار ساخته. لطفن مطمین شوید اپلیکیشن خود "
-"را بنحوی تنظیم میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname "
-"resolution استفاده کند."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "پروتوکل SOCKS ناشناخته"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3435,14 +3236,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"یکی از اپلیکیشن های شما تلاش کرده است که به توسط تور و از پروتکلی که تور آن "
-"را نمیفهمد ارتباطی برقرار کند. لطفن مطمین شوید اپلیکیشن خود را بنحوی تنظیم "
-"میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname resolution استفاده"
-" کند."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "نام میزبان مقصد نامعتبر"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3450,13 +3247,10 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"یکی از برنامههای شما سعی داشت تا از طریق شبکهٔ TOR به \"%1\" دست رسی "
-"پیدا کند، در حالی که TOR این \"hostname\" یا نام میزبان را به رسمیت "
-"نمیشناسد. لطفا تنظیمات برنامه خود را مجدداً چک کنید."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "آی پی آدرس خارجی تغییر کرد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3464,12 +3258,10 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
-"تور تشخیص داده که آدرس IP شما در حال حاضر %1%2 است. اگر درست نیست، لطفن "
-"تنظیم 'Address' را در پیکربندی بازپخش کننده خود در نظر داشته باشید."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "ربوده شدن DNS "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3477,9 +3269,6 @@ 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 تشخیص داده است که ارائه دهندهٔ DNS شما پاسخهای نادرستی به دامینهایی که"
-" موجود نیستند میدهد. بعضی ISPها و ارایه دهندگان DNS, مثل OpenDNS, به طور "
-"مشخص این کار را انجام داده تا نتایج جستجوی خود و یا تبلیغات را نمایش دهند."
msgctxt "StatusEventWidget"
msgid ""
@@ -3487,13 +3276,10 @@ 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 تشخیص داده است که ارائه دهندهٔ DNS شما پاسخهای نادرستی به دامینهایی "
-"شناخته شده میدهد. از آنجا که کامپیوتر کاربر برای دریافت پاسخ DNS به رلههای "
-"شبکهٔ TOR اتکا میکند، رله شما به عنوان رله خروجی استفاده نخواهد شد. "
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "چک کردن برای در دسترس بودن پورتِ سرور"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3501,20 +3287,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"TOR در حال تشخیص قابلیت دسترسیِ پورتِ سرور از درون شبکه TOR از طریق اتصال به خود در \"%1:%2\" میباشد. \n"
-"این پروسه چند دقیقه طول میکشد."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "پورتِ سرور قابل دسترسی میببشد!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "پورت سرور رله شما از شبکهٔ TOR قابل دسترسی میباشد."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "پورتِ سرورِ شما از شبکه TOR قابل دسترسی نیست!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3523,14 +3307,10 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
-"پورتِ سرورِ رله شما قابل دسترسی توسط کاربران دیگر نیست. این ممکن از به این "
-"دلیل باشد که کامپیوترِ شما پشت firewall قرار دارد یا اینکه به روتر وصل شده "
-"است که لازم است پورت فرواردینگ کند. اگر \"%1:%2\" آدرسِ آیپی و پورتِ شما "
-"نیست، لطفا تنظیمات رله خود را چک کنید."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "بررسی دسترسی پورتهای دایرکتوری"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3538,20 +3318,18 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
-"تور در حال بررسی دسترسی پورت دایرکتوری بازپخش کننده شما، از داخل شبکه تور، "
-"به وسیله وصل خود در %1:%2 است. این آزمایش ممکن است چند دقیقه طول بکشد."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "آزمایش دسترسی پورت دایرکتوری موفق بود!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "پورت دایرکتوری بازپخش کننده شما از شبکه تور قابل دسترس است!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "آزمایش دسترسی پورت دایرکتوری ناموفق بود"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3560,26 +3338,20 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
-"دایرکتوری پورت بازپخش کننده شما، توسط دیگر کاربران تور قابل دسترس نیست. این "
-"اتفاق زمانی ممکن است بیافتد، که شما پشت روتر یا فایروالی هستید که نیاز به "
-"تنظیم انتقال پورت دارد. اگر %1:%2 آدرس IP و دایرکتوری پورت درست شما نیست، "
-"لطفن پیکربندی بازپخش کننده خود را چک کنید."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "واصف بازپخش کننده رد شد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"واصف بازپخش کننده شما، که کاربران را قادر به اتصال به بازپخش کننده شما "
-"میکند، توسط سرور داده ها در %1:%2 رد شد. علت: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "بازپخش کننده شما آنلاین است"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3588,367 +3360,406 @@ 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 ""
msgctxt "Stream"
msgid "New"
-msgstr "جدید"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "ترجمه"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "اتصال"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "باز"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "ناموفق"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "بسته"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "تلاش مجدد"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "بازنگاشته"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "نامعلوم"
+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]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "سرویس تُر نصب نشده است"
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "ناتوان در راه اندازی سرویس تُر."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "شکست در درهم درآوردن اسم رمز کنترل."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "ویرایش torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
-"تنظیمات را ذخیره کن. اگر علامت نخورده باشد فقط برای نمونه تور فعلی اعمال "
-"میشود."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "بریدن"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "کپی"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "چسباندن"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "اصلاح"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "انجام مجدد"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "انتخاب همه"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "همه را اعمال کن"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "فقط موارد انتخابی را اعمال کن"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "خطا در ارتباط با تور"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
-"محدوده انتخاب خالی است. لطفن مقداری از مت و یا \"همه را اعمال کن\" را انتخاب"
-" کنید"
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "خطا در خط %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "خطا"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "در هنگام باز کردن فایل torrc یک خطا رخ داد"
+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 "موفقیت"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "هیچ دستگاه UPnP پیدا نشد"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "هیچ دستگاه دروازه اینترنت معتبر UPnP پیدا نشد"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup موفق نشد"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "ناموفق در افزودن یک نگاشت درگاه"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "ناموفق در بازیافتن یک نگاشت درگاه"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "ناموفق در برداشتن یک نگاشت درگاه"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "خطای ناشناخته"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "پیداکردن دستگاه های UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "بروز رسانی نگاشت درگاه فهرست"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "بروزرسانی نگاشت درگاه بازپخش"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "تست با موفقیت تمام شد!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "تست پشتیبانی UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "تست پشتیبانی Universal Plug & Play"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"ویدالیا قادر به بررسی به روز رسانی های در دسترس نرم افزار نیست.زیرا نمیتواند"
-" '%1' را پیدا کند."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"ویدالیا قادر به بررسی به روز رسانی های در دسترس نرم افزار نیست، زیرا روند به"
-" روز رسانی تُر غیر منتظره متوقف شده."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "چک کردن برای به روز رسانی های در دسترس..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "پنهان کردن"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "دانلود به روز رسانی..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "راه اندازی نرم افزار تُر"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "انجام شد! نرم افزار شما در حال حاضر به روز است."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "بسیارخوب"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "به روزرسانی نرم افزار"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "چک کردن برای به روز رسانی..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "لغو"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "به روز رسانی تُر موجود می باشد"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "بعدا یادآوری کن"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "نصب"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "بسته های بروزرسانی زیر برای نصب آماده هستند:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "بکسپیس"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "نسخه"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "بسیارخوب"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "لغو"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "بله"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "خیر"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "راهنما"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "تلاش مجدد"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "نمایش گزارش"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "نمایش تنظیمات"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "ادامه"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "خروج"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "انتخاب فایل"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "نشانوند نامعتبر"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "ویدالیا در حال اجرا است"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "این پیام کاربردی را نمایش می دهد و بیرون میرود."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "بازنشانی کردن همه تنظیمات ذخیره شده ویدالیا."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "گذاردن فهرست مورد استفاده توسط ویدالیا برای فایل های داده."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "گذاردن نام و محل فایل شناسه فرآیند ویدالیا."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "گذاردن نام و محل فایل تاریخچه ثبت ویدالیا."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "گذاردن درجه پرحرفی ثبت ویدالیا."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "گذاردن سبک واسط ویدالیا."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "گذاردن زبان ویدالیا."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "اطلاعات درمورد استفاده ویدالیا"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "ناتوان در بازکردن فایل تاریخچه ثبت '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "وجود مقدار برای این پارامتر الزامیست: "
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr " کد زبان نامعتبر مشخص شده :"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Invalid GUI style specified:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Invalid log level specified:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3956,40 +3767,35 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
-"\n"
-"Would you like to continue starting Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 ثانيه"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 کیلوبایت در ثانیه"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 کیلوبایت در ثانیه"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 کیلوبایت در ثانیه"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 کیلوبایت در ثانیه"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 روز"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 ساعت"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 دقیقه"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/fi/qt_fi.po b/src/vidalia/i18n/po/fi/qt_fi.po
index d072686..7d6f710 100644
--- a/src/vidalia/i18n/po/fi/qt_fi.po
+++ b/src/vidalia/i18n/po/fi/qt_fi.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 kt"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 tavua"
-
-
diff --git a/src/vidalia/i18n/po/fi/vidalia_fi.po b/src/vidalia/i18n/po/fi/vidalia_fi.po
index a820f31..12066a3 100644
--- a/src/vidalia/i18n/po/fi/vidalia_fi.po
+++ b/src/vidalia/i18n/po/fi/vidalia_fi.po
@@ -1,22 +1,16 @@
-#
-# Translators:
-# <debris at riseup.net>, 2012.
-# <jukka.mieskonen at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-02 05:59+0000\n"
-"Last-Translator: jukkamieskonen <jukka.mieskonen at gmail.com>\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-08 18:51-0600\n"
+"Last-Translator: AmaliaH <hilkka39 at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
@@ -38,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr "4.4.2"
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versio"
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' ei ole kelvollinen IP-osoite."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr "Valitsit 'Salasana'-kirjautumisen, mutta et määrittänyt salasanaa."
msgctxt "AdvancedPage"
@@ -84,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia epäonnistui Tor-palvelun asennuksessa."
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Ohjausportti"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "Tunnistus:"
@@ -140,72 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr "Valitse kansio, johon Tor-ohjelman tiedot tallennetaan"
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr "Tor:in hallinta"
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "Käytä TCP-yhteyttä (ControlPort)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "Polku:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Käytä Unix domain socketia (ControlSocket)"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "Muokkaa nykyistä torrc:ta"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "HUOM: tämä muuttaa nyt ladattuna olevaa torrc:ta"
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket-polkua ei ole olemassa."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Annettu Tor-asetustiedoston sijainti sisältää merkkejä, joita järjestelmäsi "
-"nykyinen 8-bittinen merkistökoodaus ei voi näyttää."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-"Annettu Tor-datahakemiston sijainti sisältää merkkejä, joita järjestelmäsi "
-"nykyinen 8-bittinen merkistökoodaus ei voi näyttää."
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "Varoitus"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Muutit torrc:n polkua, haluaisitko käynnistää Tor:in uudelleen?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor-asetustiedosto (torrc);;Kaikki tiedostot (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Valitse tiedosto, jota käytetään Tor-socketin polkuna"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -427,8 +375,7 @@ msgstr "Virhe otettaessa käyttöön asetuksia"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr ""
-"Vidalia ei onnistunut ottamaan käyttöön %1 asetuksia Tor-ohjelman kanssa."
+msgstr "Vidalia ei onnistunut ottamaan käyttöön %1 asetuksia Tor-ohjelman kanssa."
msgctxt "ConfigDialog"
msgid "Settings"
@@ -451,9 +398,7 @@ msgid "Remember my password"
msgstr "Muista salasana"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
"Vidalia on yhdistynyt käynnissä olevaan Tor - ohjelmaan, joka vaatii "
"salasanaa. Ole hyvä ja kirjoita ohjaussalasana:"
@@ -1171,10 +1116,6 @@ msgid "Zimbabwe"
msgstr "Zimbabwe"
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "Zaire"
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr "Albania"
@@ -1270,57 +1211,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr "Taiwan"
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "Lähetä kaatumisilmoitus"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia kohtasi ongelman ja oli suljettava"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Käynnistä Vidalia uudelleen"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Älä käynnistä uudelleen"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Vidaliaa ei voi käynnistää uudelleen"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-"Emme onnistuneet käynnistämään Vidaliaa uudelleen automaattisesti. Käynnistä"
-" Vidalia uudelleen manuaalisesti."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr "Suoritettavat (*.exe)"
@@ -1338,6 +1228,10 @@ msgid "You must specify the name of your Tor executable."
msgstr "Tor-ohjelman nimi pitää määrittää."
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Välityspalvelimen määritetyt arvot ovat virheelliset."
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr "Käynnistä Vidalia samalla, kun järjestelmä käynnistyy"
@@ -1534,14 +1428,8 @@ msgid "Opening External Link"
msgstr "Avataan ulkoista linkkiä"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-"Vidalia voi avata valitun linkin oletus Internetselaimessa. Jos selainta ei "
-"ole määritelty käyttämään Tor-verkkoa, niin sivulla oleminen ei ole "
-"anonyymistä."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidalia voi avata valitun linkin oletus Internetselaimessa. Jos selainta ei ole määritelty käyttämään Tor-verkkoa, niin sivulla oleminen ei ole anonyymistä."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1552,12 +1440,8 @@ msgid "Unable to Open Link"
msgstr "Linkin avaaminen epäonnistui"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ei onnistunut avaamaan valittua linkkiä Internetselaimessa. Linkin "
-"voi kuitenkin kopioida ja liittää selaimen osoiteriville."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia ei onnistunut avaamaan valittua linkkiä Internetselaimessa. Linkin voi kuitenkin kopioida ja liittää selaimen osoiteriville."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1599,30 +1483,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr "Tuntematon"
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr "Debug"
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "Tietoa"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "Huomautus"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "Varoitus"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "Virhe"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "Tuntematon"
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr "Käynnistä Tor"
@@ -1836,9 +1696,7 @@ msgid "Error Starting Tor"
msgstr "Virhe Tor-ohjelman käynnistämisessä"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
"Vidalia ei onnistunut käynnistämään Tor-ohjelmaa. Tarkista asetukset ja "
"varmista onko Tor-ohjelman nimi ja sijainti kirjoitettu oikein."
@@ -1876,9 +1734,7 @@ msgid "Cookie Authentication Required"
msgstr "Eväste-kirjautumista vaaditaan"
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
"Tor-ohjelma pyytää Vidaliaa lähettämään kirjautumisevästeen tiedot, mutta "
"Vidalia ei löytänyt kirjautumisevästettä."
@@ -1900,9 +1756,7 @@ msgid "Error Registering for Events"
msgstr "Virhe tapahtumien rekisteröinnissä"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
"Vidalia ei pystynyt rekisteröimään joitakin tapahtumia. Jotkin Vidian "
"ominaisuudet eivät ehkä toimi."
@@ -1924,21 +1778,15 @@ msgid "Tor Update Available"
msgstr "Tor-ohjelmaan on saatavilla päivitys"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään."
-" Ole hyvä ja lataa uusin versio Tor-ohjelman kotisivulta."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään. Ole hyvä ja lataa uusin versio Tor-ohjelman kotisivulta."
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr "Tor-ohjelman kotisivu: %1"
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
"Vaikuttaisi että kaikki seuraavat yhteydet tulevat olemaan erilaiset kuin "
"vanhat yhteydet."
@@ -1953,8 +1801,7 @@ msgstr "Porttien läpivienti epäonnistui"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia ei onnistunut määrittelemään automaattista porttien läpivientiä."
+msgstr "Vidalia ei onnistunut määrittelemään automaattista porttien läpivientiä."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1970,7 +1817,7 @@ msgstr "Vidalian pikatoiminnot"
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "Reitittimen asetukset\n"
+msgstr "Reitittimen asetukset"
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
@@ -2033,10 +1880,7 @@ msgid "Password Reset Failed"
msgstr "Salasanan nollaaminen epäonistui"
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
"Vidalia yritti nollata Tor salasanaa, mutta ei pystynyt käynnistämään "
"uudestaan Tor -ohjelmaa. Tarkista Tehtävienhallinnasta (Task Manager) että "
@@ -2044,15 +1888,12 @@ msgstr ""
"Tehtävienhallinta:Ctrl+Shift+Esc)"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
"Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään."
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr "Haluatko tarkistaa onko uudempaa pakettia saatavana asennettavaksi?"
msgctxt "MainWindow"
@@ -2060,11 +1901,16 @@ msgid "Potentially Unsafe Connection"
msgstr "Mahdollisesti Epäluotettava Yhteys"
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
msgstr ""
-"Tor on automaattisesti sulkenut yhteden suojatakseen anonymiteettiäsi."
+"Jokin sovelluksistasi%1näyttä luoda mahdollisesti epäluotettavaa ja "
+"salatonta yhteyttä porttiin %2. Kaikki tieto lähetetty tämän yhteyden kautta "
+"tulisi valvoa. Ole hyvä ja varmista sovelluksesi kokoonpano ja käytä vain "
+"salattuja protokolleja kuten SSL jos mahdollista."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr "Tor on automaattisesti sulkenut yhteden suojatakseen anonymiteettiäsi."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2075,9 +1921,7 @@ msgid "Your software is up to date"
msgstr "Ohjelmistosi on ajan tasalla"
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
"Uusia Tor-ohjelmiston paketteja ei ole saatavana tietokoneellesi juuri nyt."
@@ -2094,44 +1938,29 @@ msgid "The following error occurred:"
msgstr "Seuraava virhe ilmaantui:"
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 ""
-"Kaikkea tämän yhteyden yli lähetettyä voidaan tarkkailla. Tarkista "
-"sovelluksesi asetukset ja käytä vain kryptattuja protokollia, kuten SSL:ää, "
-"jos mahdollista."
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr "epäonnistui (%1)"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
"Välitypalvelimesi on sulkeutumassa. \n"
"Napsauta 'Pysäytä'-nappia uudelleen sulkeaksesi välityspalvelun heti. "
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Operoit parhaillaan välityspalvelinta. Mikäli sammutat välityspalvelimesi, se katkaisee kaikkien palvelintasi käyttävien yhteydet!\n"
+"Operoit parhaillaan välityspalvelinta. Mikäli sammutat välityspalvelimesi, "
+"se katkaisee kaikkien palvelintasi käyttävien yhteydet!\n"
"\n"
-"Haluaisitko sensijaan sammuttaa sulavasti ja antaa yhteyttäsi käyttäville aikaa löytää uusi yhteys?"
+"Haluaisitko sensijaan sammuttaa sulavasti ja antaa yhteyttäsi käyttäville "
+"aikaa löytää uusi yhteys?"
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
@@ -2140,18 +1969,32 @@ msgstr ""
"Tarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
+msgid ", probably Telnet,"
+msgstr ", varmaankin Telnet-sovellus,"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
+msgid ", probably an email client,"
+msgstr ", varmaankin sähköpostisovellus,"
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Tiedosto"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Tietoja Vidaliasta"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Koti"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Etsi Päivityksiä"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2394,6 +2237,10 @@ msgid "messages"
msgstr "tapahtumat"
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Tallenna aina uudet lokitapahtumat"
+
+msgctxt "MessageLog"
msgid "Browse"
msgstr "Selaa"
@@ -2406,58 +2253,37 @@ msgid "Automatically save new log messages to a file"
msgstr "Tallenna automaattisesti uudet tapahtumat tiedostoon"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Yksinkertainen"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor tila"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Edistynyt"
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Tallenna aina uudet lokitapahtumat"
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
+msgid "Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr "Viestit jotka näytetään virhetilanteissa jolloin Tor ei voi jatkaa."
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr "Viestit jotka näytetään vain virhetilanteissa."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
"Normaalin Tor käytön aikana ilmestyvät ajoittaiset virheviestit \n"
-"jotka eivät ole varsinaisia virhetilanteita, mutta joista on ehkä hyvä tietää."
+"jotka eivät ole varsinaisia virhetilanteita, mutta joista on ehkä hyvä "
+"tietää."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr "Säännöllisesti ilmestyvät virheviestit normaalin Tor ajon aikana."
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr "Lähinnä Tor kehittäjiä kiinnostavat seikkaperäiset viestit."
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2582,20 +2408,14 @@ msgid "Copy (Ctrl+C)"
msgstr "Kopioi (Ctrl+C)"
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
"Joko IP-osoite tai sitten isäntä ja portti numero pitää määrittää, jotta "
"Tor-ohjelma osaa yhdistää välityspalvelimen kautta Internettiin."
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
-msgstr ""
-"Portteja pitää olla määriteltynä vähintään yksi tai useampi, mihin palomuuri"
-" antaa yhdistää."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Portteja pitää olla määriteltynä vähintään yksi tai useampi, mihin palomuuri antaa yhdistää."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2603,8 +2423,7 @@ msgstr "'%1' ei ole kelvollinen porttinumero."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Tarkista, jos paikallinen verkko vaatii välityspalvelimen Internetin pääsyyn"
+msgstr "Tarkista, jos paikallinen verkko vaatii välityspalvelimen Internetin pääsyyn"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2615,10 +2434,18 @@ msgid "Proxy Settings"
msgstr "Välityspalvelinasetukset"
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP-välityspalvelin:"
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr "Käyttäjä:"
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Käytä välityspalvelinta myös HTTPS-yhteyksiin"
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr "Salasana:"
@@ -2628,9 +2455,7 @@ msgstr "Portti:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Rastita yhdistääkseen vain reitittimiin käyttäen palomuurin sallimia "
-"portteja"
+msgstr "Rastita yhdistääkseen vain reitittimiin käyttäen palomuurin sallimia portteja"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2649,9 +2474,7 @@ msgid "80, 443"
msgstr "80, 443"
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
"Rastita suojataksesi hakemistopyynnöt, ja valinnaisesti käytä "
"siltareitittimiä yhdistääksesi Tor-verkkoon."
@@ -2665,10 +2488,18 @@ msgid "Bridge Settings"
msgstr "Silta-asetukset"
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Käytössä oleva Tor-ohjelma ei tue siltoja. <br>Listayhteydet kuitenkin suojataan."
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr "Lisää silta:"
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Miten löydän siltareitittimen?</a>"
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr "Poista valitut sillat listalta"
@@ -2689,9 +2520,7 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr "<a href=\"bridges.finding\">Kuinka voin löytää siltoja?</a>"
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
"Uusia siltoja ei ole juuri nyt saatavana. Voit joko odottaa hetken ja "
"yrittää uudelleen, tai voit kokeilla toista tapaa löytää siltoja."
@@ -2700,34 +2529,6 @@ msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr "Napsauta \"Ohje\"-painiketta nähdäksesi muita tapoja löytää siltoja."
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "Osoite:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "Tyyppi"
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "Sinun on valittava välityspalvelimen tyyppi."
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
-
msgctxt "Policy"
msgid "accept"
msgstr "salli"
@@ -2881,20 +2682,14 @@ msgid "Bridge Support Unavailable"
msgstr "Siltatukea ei ole saatavilla"
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
"Olet määritelly Tor-ohjelmasi toimimaan siltareitittimenä sensuroiduille "
"käyttäjille, mutta käyttämäsi Tor-ohjelman versio ei tue siltoja."
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
-msgstr ""
-"Ole hyvä ja päivitä Tor-ohjelmasi tai säädä Tor-ohjelmasi toimimaan "
-"normaalina Tor-reitittimenä."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Ole hyvä ja päivitä Tor-ohjelmasi tai säädä Tor-ohjelmasi toimimaan normaalina Tor-reitittimenä."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2950,9 +2745,7 @@ msgstr "Reitittimesi nimi"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Portti, jolla käyttäjät ja muut reitittimet kommunikoivat reitittimesi "
-"kanssa"
+msgstr "Portti, jolla käyttäjät ja muut reitittimet kommunikoivat reitittimesi kanssa"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2963,12 +2756,8 @@ msgid "Basic Settings"
msgstr "Perusasetukset"
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
-msgstr ""
-"Yhteydet, joilla on nopea latausnopeus mutta hidas lähetys, valitkaa "
-"listasta alhaalta lähetysnopeutenne."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Yhteydet, joilla on nopea latausnopeus mutta hidas lähetys, valitkaa listasta alhaalta lähetysnopeutenne."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3023,12 +2812,8 @@ msgid "Peak bandwidth rate limit"
msgstr "Suurin sallittu nopeus"
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Enimmäisnopeus pitää olla suurempi tai sama kuin keskimääräinen nopeus. "
-"Molempien lukujen pitäisi olla vähintään 20 kt/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Enimmäisnopeus pitää olla suurempi tai sama kuin keskimääräinen nopeus. Molempien lukujen pitäisi olla vähintään 20 kt/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3087,19 +2872,14 @@ msgid "Show help topic on exit policies"
msgstr "Näytä poistumiskäytännöistä ohje"
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
"Mitä Internet-palveluita käyttäjien pitäisi voida käyttää reitittimesi "
"kautta?"
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
-msgstr ""
-"Tor torjuu joitakin lähteviä sähköposteja sekä tiedostonjako-ohjelmia "
-"vähentääkseen roskapostitusta ja muunlaista hyväksikäyttöä."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor torjuu joitakin lähteviä sähköposteja sekä tiedostonjako-ohjelmia vähentääkseen roskapostitusta ja muunlaista hyväksikäyttöä."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3110,8 +2890,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr "Anna muiden käyttää siltaasi antamalla heille tämä rivi:"
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
"Tämä on siltareitittimesi henkilöllisyys, jonka voi antaa muille käyttäjille"
@@ -3128,9 +2907,7 @@ msgid "No clients have used your relay recently."
msgstr "Kukaan ei ole käyttönyt reititintäsi viimeaikoina"
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
"Jätä reitittimesi päälle niin että käyttäjillä on paremmat mahdollisuudet "
"löytää ja käyttää sitä."
@@ -3144,9 +2921,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr "Vidalia ei onnistunut löytämään oman sillan käyttöhistoriaa."
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr "Torrin Vidialle palauttama käyttöhistoriatieto oli kuralla."
msgctxt "ServerPage"
@@ -3162,23 +2937,15 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr "<a href=\"#bridgeUsage\">Kuka on käyttänyt reititintäni?</a>"
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Mikä tämä on?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Jaa reititin hakemisto"
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Sähköpostiosoite josta sinut voidaan tavoittaa jos reitittimesi kanssa on ongelmia.\n"
+"Sähköpostiosoite josta sinut voidaan tavoittaa jos reitittimesi kanssa on "
+"ongelmia.\n"
"Voit myös lisätä PGP tai GPG tunnuksesi."
msgctxt "ServicePage"
@@ -3186,12 +2953,8 @@ msgid "Error while trying to unpublish all services"
msgstr "Virhe julkaistujen palveluiden julkaisun poistossa"
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-"Ole hyvä ja määritä vähintään palvelun kansio ja virtuaaliportti jokaiselle "
-"halumallesi palvelulle, jonka haluat tallentaa. Muut voi poistaa."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Ole hyvä ja määritä vähintään palvelun kansio ja virtuaaliportti jokaiselle halumallesi palvelulle, jonka haluat tallentaa. Muut voi poistaa."
msgctxt "ServicePage"
msgid "Error"
@@ -3207,8 +2970,7 @@ msgstr "Valitse palvelun kansio"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Virtuaaliportti voi sisältää vain kelvollisia porttinumeroita [1..65535]."
+msgstr "Virtuaaliportti voi sisältää vain kelvollisia porttinumeroita [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
@@ -3260,271 +3022,12 @@ msgstr "Kopioi onion-osoite valitusta palvelusta leikepöydälle"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Selaa paikallista tiedostojärjestelmää ja valitse kansio valitulle "
-"palvelulle"
+msgstr "Selaa paikallista tiedostojärjestelmää ja valitse kansio valitulle palvelulle"
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr "Tor on luonut"
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "Kopioi leikepöydälle"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Tor-ohjelma on käynnissä"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Käytät parhaillaan Tor-ohjelman versiota \"%1\""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr "Tor-ohjelma ei ole käynnissä"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-"Napsauta \"Käynnistä Tor\" Vidalian hallintapaneelissa käynnistääksesi Tor-"
-"ohjelman uudelleen. Jos Tor sulkeutui odottamattomasti, valitse ylhäältä "
-"\"Edistynyt\"-välilehti saadaksesi tietoa mahdollisista virheistä."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-"Käytät parhaillaan Tor-ohjelman versiota \"%1\", jota ei enää suositella. "
-"Päivitäthän ohjelman uusimpaan versioon, joka saattaa sisältää tärkeitä "
-"turvallisuutta, luotettavuutta ja suorituskykyä parantavia korjauksia."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-"Käytät parhaillaan Tor-ohjelman versiota \"%1\", joka ei ehkä enää toimi "
-"nykyisen Tor-verkon kanssa. Päivitäthän ohjelman uusimpaan versioon, joka "
-"saattaa sisältää tärkeitä turvallisuutta, luotettavuutta ja suorituskykyä "
-"parantavia korjauksia."
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr "Tor-ohjelmasi on vanhentunut."
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Yhdistetty Tor-verkkoon."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Onnistuimme luomaan yhteyden Tor-verkkoon. Voit nyt asettaa ohjelmasi "
-"käyttämään Internetiä anonyymisti."
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Tor Ohjelmavirhe"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr "Mahdollisesti vaarallinen yhteys!"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr "Tuntematon SOCKS protokolla"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Uusi"
@@ -3577,68 +3080,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr "Ohjaussalasanan varmistussummaus epäonnistui."
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "torrc:n muokkaus"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "Leikkaa"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "Kopioi"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "Liitä"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "Kumoa"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr "Tee-uudelleen"
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "Valitse kaikki"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Hyväksy kaikki"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Hyväksy vain valinta"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Virhe muodostaessa yhteyttä Tor:iin"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Valinta on tyhjä. Valitse tekstiä, tai valitse \"Hyväksy kaikki\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Virhe rivillä %1: %2\""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "Virhe"
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Onnistui"
@@ -3649,8 +3090,7 @@ msgstr "UPnP-laitteita ei löytynyt"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Yhteensopivia UPnP:tä käyttäviä Internet-yhdyskäytävälaitteita ei löytynyt"
+msgstr "Yhteensopivia UPnP:tä käyttäviä Internet-yhdyskäytävälaitteita ei löytynyt"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3697,17 +3137,13 @@ msgid "Testing Universal Plug & Play Support"
msgstr "Testataan Universal Plug & Play -tukea"
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
"Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska "
"kohdetta '%1' ei löytynyt."
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
"Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska "
"Tor:in päivitysprosessi suljettiin yllättäen."
@@ -3865,10 +3301,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Lokitiedoston'%1': %2 avaaminen epäonnistui"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Virheellinen kielikoodi määritettynä:"
@@ -3881,12 +3313,12 @@ msgid "Invalid log level specified:"
msgstr "Virheellinen lokitiedoston taso määritetty:"
msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Toinen Vidalia prosessi on mahdollisesti jo käynnissä. Jos näin on, voit jatkaa jokatapauksessa.\n"
+"Toinen Vidalia prosessi on mahdollisesti jo käynnissä. Jos näin on, voit "
+"jatkaa jokatapauksessa.\n"
"\n"
"Haluatko jatkaa ja käynnistää Vidalian?"
@@ -3921,5 +3353,3 @@ msgstr "%1 tuntia"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minuuttia"
-
-
diff --git a/src/vidalia/i18n/po/fil/vidalia_fil.po b/src/vidalia/i18n/po/fil/vidalia_fil.po
index 4c01d38..86a1aec 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fr/qt_fr.po b/src/vidalia/i18n/po/fr/qt_fr.po
index c0ce609..88d4099 100644
--- a/src/vidalia/i18n/po/fr/qt_fr.po
+++ b/src/vidalia/i18n/po/fr/qt_fr.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# K Anon <anonymK at hotmail.fr>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-01-24 03:48+0000\n"
-"Last-Translator: K Anon <anonymK at hotmail.fr>\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -445,5 +442,3 @@ msgstr "%1 Ko"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 octets"
-
-
diff --git a/src/vidalia/i18n/po/fr/vidalia_fr.po b/src/vidalia/i18n/po/fr/vidalia_fr.po
index 87b6c4c..8b9da37 100644
--- a/src/vidalia/i18n/po/fr/vidalia_fr.po
+++ b/src/vidalia/i18n/po/fr/vidalia_fr.po
@@ -1,15 +1,16 @@
#
# Translators:
-# mehditaileb <mehditaileb at liberte-info.net>, 2011.
+# arpalord <arpalord at gmail.com>, 2012.
# Pierre Antoine <pierre.antoine at ieee.org>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
+# <pouicpouicpouic at gmail.com>, 2011.
+# Sylvie SEGUI <seguisylvie at yahoo.fr>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-20 11:42+0000\n"
-"Last-Translator: Pierre Antoine <pierre.antoine at ieee.org>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 16:08+0000\n"
+"Last-Translator: arpalord <arpalord at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,13 +46,11 @@ msgstr "'%1' n'est pas une adresse IP valide."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Vous avez choisi une authentification par mot de passe, mais n'avez pas "
-"spécifié de mot de passe."
+msgstr "Vous avez sélectionné une authentification par 'Mot de passe', mais vous n'avez pas spécifié de mot de passe."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Sélectionner le fichier de configuration Tor"
+msgstr "Sélectionnez le Fichier de configuration de Tor"
msgctxt "AdvancedPage"
msgid "File Not Found"
@@ -63,7 +62,7 @@ msgstr "%1 n'existe pas. Voulez-vous le créer ?"
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "La création du fichier a échoué"
+msgstr "Impossible de créer le fichier"
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
@@ -71,15 +70,15 @@ msgstr "Impossible de créer %1 [%2]"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Choisir le dossier utilisé pour enregistrer les données de Tor"
+msgstr "Sélectionnez un répertoire à utiliser pour les données de Tor"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Impossible d'enlever le service Tor"
+msgstr "Impossible de supprimer le service Tor"
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Impossible d'installer le service Tor"
+msgstr "Impossible d'installer le Service Tor"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
@@ -87,11 +86,11 @@ msgstr "Vidalia n'a pas pu installer le service Tor."
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Authentification :"
+msgstr "Authentification:"
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Adresse :"
+msgstr "Adresse:"
msgctxt "AdvancedPage"
msgid "None"
@@ -99,7 +98,7 @@ msgstr "Aucun"
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Témoin (cookie)"
+msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
@@ -107,7 +106,7 @@ msgstr "Mot de passe"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "défini aléatoirement"
+msgstr "Générer aléatoirement"
msgctxt "AdvancedPage"
msgid ":"
@@ -119,12 +118,11 @@ msgstr "Fichier de configuration de Tor"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Lance le logiciel Tor avec le fichier de configuration spécifié (torrc)"
+msgstr "Démarrez le logiciel Tor avec le fichier de configuration défini (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Choisissez le chemin de votre fichier de configuration"
+msgstr "Sélectionnez le chemin de votre fichier de configuration"
msgctxt "AdvancedPage"
msgid "Browse"
@@ -132,24 +130,23 @@ msgstr "Parcourir"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Dossier de données"
+msgstr "Répertoire des données"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Sauver les données du logiciel Tor dans le répertoire suivant"
+msgstr "Stocker les données du logiciel Tor dans le répertoire suivant"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Selectionnez le répertoire utilisé pour sauver les données du logiciel Tor"
+msgstr "Sélectionnez le répertoire utilisé pour stocker les données du logiciel Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Contrôle Tor"
+msgstr "Contrôle de Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Utiliser une connexion TCP (ControlPort)"
+msgstr "Utilisez une connexion TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
@@ -157,66 +154,54 @@ msgstr "Chemin:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Utiliser un socket de domaine Unix (ControlSocket)"
+msgstr "Utilisez une socket de domaine Unix (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Editer le torrc actuel"
+msgstr "Modifier le fichier torrc actuel"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTE: ceci éditera le torrc actuellement chargé"
+msgstr "REMARQUE: ceci va éditer le fichier torrc actuellement actif"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "Le chemin ControlSocket n'existe pas."
+msgstr "Le chemin du ControlSocket n'existe pas."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"L'emplacement du fichier de configuration Tor spécifié contient des "
-"caractères qui ne peuvent pas être affichés avec l'encodage 8 bit de votre "
-"système."
+msgstr "L'emplacement du fichier de configuration de Tor défini contient des caractères qui ne peuvent pas être utilisés avec l'encodage de caractères sur 8 bits de votre système."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"L'emplacement du dossier de données Tor spécifié contient des caractères qui"
-" ne peuvent pas être affichés avec l'encodage 8 bit de votre système."
+msgstr "L'emplacement défini pour le répertoire des données de Tor contient des caractères qui ne peuvent pas être représentés avec l''encodage de caractères sur 8 bits de votre système."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Averstissement"
+msgstr "Attention"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Vous avez changé le chemin de torrc, voulez-vous redémarrer Tor?"
+msgstr "Vous avez changé le chemin du fichier torrc, voulez-vous relancer Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Fichier de configuration Tor (torrc);;Tous les fichiers (*)"
+msgstr "Fichier de configuration de Tor (torrc);; Tous les fichiers (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Sélectionnez un fichier à utiliser pour le chemin le socket Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configurer le port de contrôle automatiquement"
+msgstr "Sélectionnez un fichier à utiliser pour le chemin de la socket de Tor"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia n'a pa pu supprimer le service de Tor.\n"
-"\n"
-"Vous pouvez avoir à le supprimer manuellement."
+msgstr "Vidalia a été incapable de supprimer le service Tor.\n\nVous pourriez avoir besoin de le supprimer manuellement."
msgctxt "AppearancePage"
msgid "Language"
@@ -224,7 +209,7 @@ msgstr "Langue"
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Choisir la langue utilisée par Vidalia"
+msgstr "Choisissez la langue à utiliser dans Vidalia"
msgctxt "AppearancePage"
msgid "Style"
@@ -232,31 +217,27 @@ msgstr "Style"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Choisir le style de l'interface de Vidalia"
+msgstr "Choisissez le style de l'interface pour Vidalia"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia n'a pas pu charger la traduction sélectionnée."
+msgstr "Vidalia n'a pas pu charger la traduction pour la langue sélectionnée."
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Depuis :"
+msgstr "Depuis:"
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Masquer options"
+msgstr "Masquer les paramètres"
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Montrer options"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Bande passante utilisée par Tor"
+msgstr "Afficher les paramètres"
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Remettre à zéro"
+msgstr "Réinitialiser"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
@@ -276,7 +257,7 @@ msgstr "Style"
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Changer le niveau de transparence du graphe de la bande passante"
+msgstr "Modifie la transparence du graphique de la bande passante"
msgctxt "BandwidthGraph"
msgid "100"
@@ -284,7 +265,7 @@ msgstr "100"
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% d'opacité"
+msgstr "Opacité %"
msgctxt "BandwidthGraph"
msgid "Save"
@@ -294,21 +275,25 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annuler"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Graphique de la bande passante"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Lancement de la demande de passerelle HTTPS..."
+msgstr "Démarrage de la demande de passerelle HTTPS ..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Connexion à %1:%2..."
+msgstr "Connexion à %1:%2 ..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Envoi d'une demande HTTPS pour les passerelles..."
+msgstr "Envoi une demande de liste de passerelles HTTPS..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Téléchargement de la liste des passerelles..."
+msgstr "Téléchargement d'une liste de passerelles..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
@@ -316,11 +301,11 @@ msgstr "Téléchargement des passerelles"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Impossible de télécharger les passerelles: %1"
+msgstr "Impossible de télécharger les passerelles : %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Nouvelle demande de passerelle..."
+msgstr "Nouvelle tentative de demande de passerelle ..."
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -332,15 +317,15 @@ msgstr "# Clients"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Les clients des pays suivants ont utilisé votre relais depuis %1"
+msgstr "Les clients des pays suivants ont utilisé votre relai depuis %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Resumé de l'utilisation du pont"
+msgstr "Résumé de l'utilisation de la passerelle"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Résumé client"
+msgstr "Résumé des clients"
msgctxt "Circuit"
msgid "New"
@@ -348,7 +333,7 @@ msgstr "Nouveau"
msgctxt "Circuit"
msgid "Open"
-msgstr "Ouvert"
+msgstr "Ouvrir"
msgctxt "Circuit"
msgid "Building"
@@ -376,7 +361,7 @@ msgstr "Connexion"
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "État"
+msgstr "Etat"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
@@ -384,11 +369,11 @@ msgstr "Zoomer sur le circuit"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Fermer le circuit (suppr)"
+msgstr "Fermer le circuit (Suppr)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Arrêter le flux (Suppr)"
+msgstr "Fermer le flux (Suppr)"
msgctxt "ConfigDialog"
msgid "General"
@@ -408,7 +393,7 @@ msgstr "Services"
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Interface"
+msgstr "Apparence"
msgctxt "ConfigDialog"
msgid "Advanced"
@@ -420,11 +405,11 @@ msgstr "Aide"
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Erreur lors de l'enregistrement des paramètres"
+msgstr "Erreur d'enregistrement des paramètres"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia n'a pas réussi à sauvegarder vos paramètress de %1."
+msgstr "Vidalia n'a pas réussi à sauvegarder vos paramètres de %1."
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
@@ -436,31 +421,38 @@ msgstr "Vidalia n'est pas parvenu à appliquer vos paramètres de %1 pour Tor."
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Paramètres"
+msgstr "Réglages"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia ne peut pas se connecter à Tor. (%1)"
+msgstr "Vidalia n'a pas pu se connecter à Tor. (%1)"
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr "Le socket de contrôle n'est pas connecté."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Mot de passe requis."
+msgid "Problem connecting to Tor"
+msgstr "Problème de connexion à Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Se souvenir du mot de passe"
+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 "Tor est déjà actif, mais Vidalia ne peut s'y connecter.\n\nCela peut survenir lorsque quelque chose d'autre (comme un autre processus Vidalia actif ou un processus Vidalia qui s'est planté) a lancé Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia est connecté à un service Tor qui demande un mot de passe. Merci de "
-"saisir votre mot de passe de contrôle."
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Il sera nécessaire d'arrêter le processus Tor avant que Vidalia puisse en lancer un nouveau."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia peut tenter de relancer Tor pour vous. Cela permettra de fermer toutes les connexions actuellement actives sur le processus Tor."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -468,7 +460,7 @@ msgstr "Le socket de contrôle n'est pas connecté."
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Erreur lors de l'envoi de la commande de contrôle. [%1]"
+msgstr "Erreur dans l'envoi des contrôles de commande. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
@@ -476,7 +468,7 @@ msgstr "Socket déconnecté durant la lecture d'une ligne de données."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Réponse invalide à la commande de contrôle. [%1]"
+msgstr "Réponse du contrôle invalide. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
@@ -492,7 +484,7 @@ msgstr "Angola"
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua et Barbuda"
+msgstr "Antigua & Barbuda"
msgctxt "CountryInfo"
msgid "Argentina"
@@ -520,7 +512,7 @@ msgstr "Bangladesh"
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbades"
+msgstr "Barbade"
msgctxt "CountryInfo"
msgid "Belarus"
@@ -536,7 +528,7 @@ msgstr "Bélize"
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Boutan"
+msgstr "Bhoutan"
msgctxt "CountryInfo"
msgid "Bolivia"
@@ -556,7 +548,7 @@ msgstr "Brésil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei"
+msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
@@ -576,7 +568,7 @@ msgstr "Cambodge"
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Cameroon"
+msgstr "Cameroun"
msgctxt "CountryInfo"
msgid "Canada"
@@ -588,7 +580,7 @@ msgstr "Cap Vert"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centre Afrique"
+msgstr "République Centrafricaine"
msgctxt "CountryInfo"
msgid "Chad"
@@ -608,7 +600,7 @@ msgstr "Colombie"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comores"
+msgstr "Union des Comores"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
@@ -624,7 +616,7 @@ msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Côte d'Ivoire"
+msgstr "Cote d’ivoire"
msgctxt "CountryInfo"
msgid "Croatia"
@@ -640,7 +632,7 @@ msgstr "Chypre"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "République tchèque"
+msgstr "République Tchèque"
msgctxt "CountryInfo"
msgid "Denmark"
@@ -656,7 +648,7 @@ msgstr "Dominique"
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "République dominicaine"
+msgstr "République Dominicaine"
msgctxt "CountryInfo"
msgid "Ecuador"
@@ -664,7 +656,7 @@ msgstr "Equateur"
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egypte"
+msgstr "Égypte"
msgctxt "CountryInfo"
msgid "El Salvador"
@@ -672,11 +664,11 @@ msgstr "Salvador"
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Guinée équatoriale"
+msgstr "Guinée Equatoriale"
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Erytrée"
+msgstr "Erythrée"
msgctxt "CountryInfo"
msgid "Estonia"
@@ -696,7 +688,7 @@ msgstr "Gambie"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgie"
+msgstr "Géorgie"
msgctxt "CountryInfo"
msgid "Germany"
@@ -748,7 +740,7 @@ msgstr "Italie"
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaïque"
+msgstr "Jamaique"
msgctxt "CountryInfo"
msgid "Japan"
@@ -844,7 +836,7 @@ msgstr "Mauritanie"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Ile Maurice"
+msgstr "Maurice"
msgctxt "CountryInfo"
msgid "Micronesia"
@@ -904,7 +896,7 @@ msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigéria"
+msgstr "Nigeria"
msgctxt "CountryInfo"
msgid "Norway"
@@ -920,7 +912,7 @@ msgstr "Pakistan"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palaos"
+msgstr "Les Palaos"
msgctxt "CountryInfo"
msgid "Palestine"
@@ -940,7 +932,7 @@ msgstr "Paraguay"
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Péru"
+msgstr "Pérou"
msgctxt "CountryInfo"
msgid "Philippines"
@@ -972,15 +964,15 @@ msgstr "Rwanda"
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Christophe et Niévès"
+msgstr "Saint-Christophe-et-Niévès"
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Sainte Lucie"
+msgstr "Sainte-Lucie"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent et les Grenadines"
+msgstr "Saint-Vincent-et-les-Grenadines"
msgctxt "CountryInfo"
msgid "Samoa"
@@ -988,11 +980,11 @@ msgstr "Samoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marin"
+msgstr "Saint-Marin"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
+msgstr "Sao Tomé-et-Principe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
@@ -1044,7 +1036,7 @@ msgstr "Espagne"
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr "Sri lanka"
msgctxt "CountryInfo"
msgid "Sudan"
@@ -1052,7 +1044,7 @@ msgstr "Soudan"
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr "Suriname"
msgctxt "CountryInfo"
msgid "Swaziland"
@@ -1072,7 +1064,7 @@ msgstr "Syrie"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadjikistan"
+msgstr "Tajikistan"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1080,11 +1072,11 @@ msgstr "Tanzanie"
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thailande"
+msgstr "Thaïlande"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor Oriental"
+msgstr "Timor oriental"
msgctxt "CountryInfo"
msgid "Togo"
@@ -1096,7 +1088,7 @@ msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinité & Tobago"
+msgstr "Trinité-et-Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
@@ -1132,7 +1124,7 @@ msgstr "Royaume Uni"
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Etats Unis"
+msgstr "Etats Unies"
msgctxt "CountryInfo"
msgid "Uruguay"
@@ -1140,7 +1132,7 @@ msgstr "Uruguay"
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Ouzbékistan"
+msgstr "Uzbekistan"
msgctxt "CountryInfo"
msgid "Vanuatu"
@@ -1148,11 +1140,11 @@ msgstr "Vanuatu"
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Cité du Vatican"
+msgstr "Vatican"
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Vénézuela"
+msgstr "Venezuela"
msgctxt "CountryInfo"
msgid "Vietnam"
@@ -1160,7 +1152,7 @@ msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sahara Occidental"
+msgstr "Sahara occidental"
msgctxt "CountryInfo"
msgid "Yemen"
@@ -1176,7 +1168,7 @@ msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr "Zaïre"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1192,7 +1184,7 @@ msgstr "Autriche"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahreïn"
+msgstr "Bahrain"
msgctxt "CountryInfo"
msgid "Benin"
@@ -1204,7 +1196,7 @@ msgstr "Ethiopie"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fidji"
+msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
@@ -1244,7 +1236,7 @@ msgstr "Irak"
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irelande"
+msgstr "Irlande"
msgctxt "CountryInfo"
msgid "Korea, North"
@@ -1276,11 +1268,29 @@ msgstr "Taïwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Soumettre un rapport d'erreur"
+msgstr "Envoyer un Rapport d'erreur"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia a rencontré une erreur et a dû fermer"
+msgstr "Vidalia a rencontré une erreur et doit fermer"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Un rapport d'erreur a été créé, vous pouvez l'envoyer automatiquement aux développeurs Vidalia pour aider à l'identification et à la résolution du problème. Le rapport soumis ne contient aucune information d'identification personnelle mais votre connexion au serveur de rapport d'erreur peut ne pas être anonyme."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Merci de bien vouloir décrire ce que vous faisiez avant le plantage de l'applicaiton (optionnel):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Envoyer mon rapport d'erreur aux développeurs de Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
@@ -1298,41 +1308,19 @@ msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Nous sommes dans l'impossibilité de redémarrer Vidalia automatiquement. "
-"Merci de redémarrer Vidalia manuellement."
+msgstr "Redémarrage automatique de Vidalia impossible. Merci de redémarrer manuellement."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Merci de soumettre un billet de service à :"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Connexion..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Un rapport de plantage a été créé pour que vous puissiez l'envoyer aux "
-"développeurs de Vidalia pour aider à identifier et corriger le problème. Les"
-" données soumises ne contiennent aucune information d'identification "
-"personnelle."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Envoi du rapport d'erreur..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"avec une description de ce que vous faisiez avant le plantage de "
-"l'application, avec en attachement les fichiers suivants correspondant au "
-"plantage :"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Réception de la réponse..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1340,15 +1328,15 @@ msgstr "Exécutables (*.exe)"
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Choisir le chemin de Tor"
+msgstr "Sélectionner le chemin de Tor"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Selectionnez le fichier exécutable du proxy"
+msgstr "Sélectionner le fichier exécutable du proxy"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Vous devez indiquer le nom de votre exécutable Tor."
+msgstr "Vous devez définir le nom de votre exécutable Tor"
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
@@ -1359,36 +1347,36 @@ msgid "Browse"
msgstr "Parcourir"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Lancer le logiciel Tor au démarrage du système"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Application Proxy (option)"
+msgstr "Application Proxy (optionnel)"
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Démarrer une application proxy lorsque Tor démarre."
+msgstr "Lancer une application proxy lorsque Tor démarre"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Arguments de l'application proxy:"
+msgstr "Arguments de l'application Proxy"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Mises à jour du logiciel"
+msgstr "Mises à jour logicielles"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Vérifier automatiquement les mise à jours logicielles"
+msgstr "Vérifier automatiquement les nouvelles versions du logiciel"
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Vérifier maintenant"
+msgstr "Vérifier Maintenant"
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Se connecter à Tor automatiquement"
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1404,7 +1392,7 @@ msgstr "%1 Mo"
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 Go"
+msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
@@ -1412,7 +1400,7 @@ msgstr "Reçu:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Envoyé:"
+msgstr "Env:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1444,11 +1432,11 @@ msgstr "Retour"
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Page précédente (Retour arrière)"
+msgstr "Retour à la page précédente (Retour Arrière)"
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Retour arrière"
+msgstr "Retour Arrière"
msgctxt "HelpBrowser"
msgid "Forward"
@@ -1456,15 +1444,15 @@ msgstr "Avancer"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Avancer d'une page (Maj+Retour arrière)"
+msgstr "Aller à la page suivante (Shift+Retour arrière)"
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Maj+Retour arrière"
+msgstr "Shift+Retour arrière"
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Page d'accueil"
+msgstr "Accueil"
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
@@ -1476,11 +1464,11 @@ msgstr "Ctrl+H"
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Chercher"
+msgstr "Rechercher"
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Chercher un mot ou une phrase dans cette page (Ctrl+F)"
+msgstr "Chercher un mot ou une phrase sur la page en cours (Ctrl+F)"
msgctxt "HelpBrowser"
msgid "Ctrl+F"
@@ -1496,11 +1484,11 @@ msgstr "Fermer l'aide de Vidalia"
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Échap"
+msgstr "Esc"
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Chercher :"
+msgstr "Rechercher:"
msgctxt "HelpBrowser"
msgid "Find Previous"
@@ -1512,15 +1500,15 @@ msgstr "Trouver le suivant"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Respecter la casse"
+msgstr "Sensible à la casse"
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Mots entiers seulement"
+msgstr "Mots entiers uniquement"
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Rubriques d'aide"
+msgstr "Rubriques d'Aide"
msgctxt "HelpBrowser"
msgid "Contents"
@@ -1528,7 +1516,7 @@ msgstr "Table des matières"
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Chercher"
+msgstr "Recherche"
msgctxt "HelpBrowser"
msgid "Searching for:"
@@ -1551,14 +1539,11 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia peut ouvrir le lien que vous avez sélectionné dans votre navigateur "
-"par défaut. Si votre navigateur n'est pas actuellement configuré pour Tor, "
-"votre requête ne sera pas anonyme."
+msgstr "Vidalia peut ouvrir le lien que vous avez sélectionné dans votre navigateur par défaut. Si votre navigateur n'est pas actuellement configuré pour Tor, votre requête ne sera pas anonyme."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Voulez vous que Vidalia ouvre le lien dans votre navigateur ?"
+msgstr "Voulez-vous que Vidalia ouvre le lien dans votre navigateur Web ?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
@@ -1568,13 +1553,11 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia a été incapable d'ouvrir le lien selectionné dans votre navigateur. "
-"Vous pouvez tout de même copier l'URL et la coller dans votre navigateur."
+msgstr "Vidalia a été incapable d'ouvrir le lien sélectionné dans votre navigateur. Vous pouvez tout de même copier l'URL et la coller dans votre navigateur."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Erreur lors de l'ouverture de l'aide:"
+msgstr "Erreur d'ouverture du fichier d'aide:"
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1582,7 +1565,7 @@ msgstr "Information sur la licence"
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licence"
+msgstr "License"
msgctxt "LicenseDialog"
msgid "Credits"
@@ -1590,31 +1573,31 @@ msgstr "Crédits"
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Débogage"
+msgstr "Debug"
msgctxt "LogEvent"
msgid "Info"
-msgstr "Information"
+msgstr "Info"
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Signalement"
+msgstr "Notice"
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Avertissement"
+msgstr "Warning"
msgctxt "LogEvent"
msgid "Error"
-msgstr "Erreur"
+msgstr "Error"
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Inconnue"
+msgstr "Inconnu"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Débuguer"
+msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
@@ -1622,15 +1605,15 @@ msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Notification"
+msgstr "Notice"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Avertissement"
+msgstr "Warning"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Erreur"
+msgstr "Error"
msgctxt "LogTreeItem"
msgid "Unknown"
@@ -1666,7 +1649,7 @@ msgstr "Paramètres"
msgctxt "MainWindow"
msgid "About"
-msgstr "À propos"
+msgstr "A propos"
msgctxt "MainWindow"
msgid "Help"
@@ -1674,35 +1657,7 @@ msgstr "Aide"
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nouvelle 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"
+msgstr "Nouvelle Identité"
msgctxt "MainWindow"
msgid "Tor"
@@ -1710,15 +1665,11 @@ msgstr "Tor"
msgctxt "MainWindow"
msgid "View"
-msgstr "Aperçu"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Aide de Vidalia"
+msgstr "Voir"
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Erreur lors du démarrage du navigateur Web"
+msgstr "Erreur au lancement du navigateur"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
@@ -1726,20 +1677,19 @@ msgstr "Vidalia n'est pas parvenu à démarrer le navigateur Web configuré"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Erreur au lancement du client MI"
+msgstr "Erreur au lancement du client IM"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia n'a pas pu lancer le client de MI configuré"
+msgstr "Vidalia n'a pas pu lancer le client IM configuré"
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Erreur lors du démarrage du serveur mandataire (proxy)"
+msgstr "Erreur au lancement du serveur proxy"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
-"Vidalia n'est pas parvenu à démarrer le serveur mandataire (proxy) configuré"
+msgstr "Vidalia n'est pas parvenu à démarrer le serveur mandataire (proxy) configuré"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
@@ -1747,11 +1697,11 @@ msgstr "Connexion à un annuaire de relais"
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Etablissement d'une connexion annuaire cryptée"
+msgstr "Etablissement d'une connexion annuaire chiffrée"
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Recherche de l'état du réseau"
+msgstr "Récupération de l'état du réseau"
msgctxt "MainWindow"
msgid "Loading network status"
@@ -1759,11 +1709,11 @@ msgstr "Chargement de l'état du réseau"
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Chargement des certificats des authorités"
+msgstr "Chargement des certificats d'autorité"
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Demande d'informations sur le relais"
+msgstr "Demande d'informations sur le relai"
msgctxt "MainWindow"
msgid "Loading relay information"
@@ -1775,15 +1725,15 @@ msgstr "Connexion au réseau Tor"
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Etablissement d'un circuit Tor"
+msgstr "Réalisation d'un circuit Tor"
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Connecté au réseau Tor !"
+msgstr "Connecté au réseau Tor!"
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Etat de lancement inconnu"
+msgstr "Etat du démarrage inconnu"
msgctxt "MainWindow"
msgid "miscellaneous"
@@ -1830,10 +1780,6 @@ msgid "Tor is shutting down"
msgstr "Tor est en cours d'arrêt"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Arrêter Tor Immédiatement"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Arrêter Tor"
@@ -1847,16 +1793,13 @@ msgstr "Lancement de Tor"
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Erreur lors du démarrage de Tor"
+msgstr "Erreur au lancement de Tor"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia n'est pas parvenu à démarrer Tor. Contrôlez vos options et assurez-"
-"vous que le nom et le chemin de l'exécutable de Tor sont correctement "
-"indiqués."
+msgstr "Vidalia n'a pas pu lancer Tor. Vérifier vos paramètres"
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1864,7 +1807,7 @@ msgstr "Connexion à Tor"
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Erreur de Connexion"
+msgstr "Erreur de connexion"
msgctxt "MainWindow"
msgid "Relaying is Enabled"
@@ -1872,7 +1815,7 @@ msgstr "Le relais est activé"
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Erreur lors de l'arrêt"
+msgstr "Erreur à l'arrêt"
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
@@ -1888,25 +1831,21 @@ msgstr "Authentification à Tor"
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie d'authentification requis"
+msgstr "Authentification par cookie requis"
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Le logiciel Tor demande que Vidalia envoie le contenu d'un cookie "
-"d'authentification, mais Vidalia n'a pas pu le trouver."
+msgstr "Le logiciel Tor demande que Vidalia envoie le contenu d'un cookie d'authentification, mais Vidalia n'a pas pu le trouver."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"Voulez-vous effectuer manuellement la recherche du fichier "
-"'control_auth_cookie' ?"
+msgstr "Voulez-vous effectuer manuellement la recherche du fichier 'control_auth_cookie' ?"
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Répertoire de Données"
+msgstr "Répertoire de données"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
@@ -1914,29 +1853,13 @@ msgstr "Cookie de Contrôle (control_auth_cookie)"
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Erreur lors de l'enregistrement pour les événements"
+msgstr "Erreur lors de l'enregistrement des événements"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia n'a pas pu enregistrer certains évènements. Plusieurs "
-"fonctionnalités de Vidalia peuvent être indisponibles."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Erreur d'authentification"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia n'a pu s'authentifier au logiciel Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Veuillez vérifier les paramètress d'authentification de votre port de "
-"contrôle."
+msgstr "Vidalia n'a pas pu enregistrer certains évènements. Plusieurs fonctionnalités de Vidalia peuvent être indisponibles."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1946,33 +1869,29 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"La version actuellement installée de Tor est obsolète et n'est plus "
-"recommandée. Merci de visiter le site Web de Tor pour télécharger la "
-"dernière version."
+msgstr "La version actuellement installée de Tor est obsolète et n'est plus recommandée. Merci de visiter le site Web de Tor pour télécharger la dernière version."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Site Web de Tor : %1"
+msgstr "Site web de Tor: %1"
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Toutes les connexions suivantes sembleront être différentes des précédentes."
+msgstr "Toutes les nouvelles connexions apparaîtront différentes des anciennes."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "La création d'une nouvelle identité a échoué"
+msgstr "Impossible de créer une nouvelle identité"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Erreur de Transfert de Port"
+msgstr "Erreur de redirection de port"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia n'a pas pu configurer automatiquement le transfert de ports."
+msgstr "Vidalia n'a pas pu configurer automatiquement la redirection de port."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1980,71 +1899,7 @@ msgstr "Panneau de contrôle de Vidalia"
msgctxt "MainWindow"
msgid "Status"
-msgstr "État"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Raccourcis Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Installer un relais\n"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Paramétrez un relay et aidez le réseau à grandir."
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Voir le réseau Tor"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Voir la carte du réseau Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Utiliser une nouvelle identité"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Faire apparaître les connexions suivantes comme nouvelles"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Voir la bande passante utilisée"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Voir l'historique des messages"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Voir la documentation d'aide"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configurer Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Voir les informations de version et de licence"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Quitter Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Afficher cette fenêtre au démarrage"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Cacher"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Cacher cette fenêtre"
+msgstr "Etat"
msgctxt "MainWindow"
msgid "Password Reset Failed"
@@ -2052,28 +1907,14 @@ msgstr "Echec de la réinitialisation du mot de passe"
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 a essayé de réinitialiser le mot de passe de Tor, mais n'a pu "
-"redémarrer le logiciel Tor. Merci de consulter votre gestionnaire de Taches "
-"pour vous assurer qu'il n'y a pas d'autres processus Tor actif."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr ""
-"La version actuellement installée de Tor est obsolète et n'est plus "
-"recommandée."
+msgstr "La version actuellement installée de Tor est obsolète et n'est plus recommandée."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Voulez-vous vérifier si une nouvelle version est disponible pour "
-"l'intstallation ?"
+msgstr "Voulez-vous vérifier si une nouvelle version est disponible à l'installation ?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
@@ -2083,13 +1924,11 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor a automatiquement fermé votre connexion de façon à protéger votre "
-"anonymat."
+msgstr "Tor a automatiquement fermé votre connexion afin de protéger votre anonymat."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Echec de la mise à jour"
+msgstr "Mise à jour avortée"
msgctxt "MainWindow"
msgid "Your software is up to date"
@@ -2099,18 +1938,15 @@ msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"Il n'y a pas de nouvelle version de Tor disponible pour votre ordinateur "
-"pour le moment."
+msgstr "Il n'y a pas de nouvelle version de Tor disponible pour le moment."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Echec de l'installation"
+msgstr "Installation avortée"
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr ""
-"Vidalia n'a pas été capable d'installer les mises à jour de votre logiciel."
+msgstr "Vidalia n'a pas pu installer les mises à jour de votre logiciel."
msgctxt "MainWindow"
msgid "The following error occurred:"
@@ -2118,65 +1954,90 @@ msgstr "L'erreur suivante s'est produite:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Une de vos applications%1apparaît effectuer une connexion non chiffrée et non sécurisée sur le port %2."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Tout ce qui sera envoyé à travers cette connexion pourrait être surveillé. "
-"Merci de vérifier la configuration de votre application et d'utiliser "
-"seulement des protocoles cryptés, tél que SSL, si possible."
+msgstr "Tout ce qui sera envoyé à travers cette connexion pourrait être surveillé. Merci de vérifier la configuration de votre application et d'utiliser seulement des protocoles chiffrés, tel que SSL, si possible."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "échec (%1)"
+msgid "toolBar"
+msgstr "Barre d'outils"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Votre relais s'arrête.\n"
-"Cliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement."
+msgid "Start"
+msgstr "Démarrer"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Arrêter"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Redémarrer"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Relancer le fichier de configuration Tor"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Actions"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Exécution de torrc de %1 à %2"
+msgstr "Démarrage torrc de %1 à %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Vous hébergez actuellement un relais. Terminer le relais va interrompre toutes les connexions des clients.\n"
-"\n"
-"Voulez vous l'arrêter doucement et laisser à vos clients le temps de trouver un nouveau relais."
+msgstr "Vous utilisez actuellement un relai. Fermer votre relai coupera toutes les connexions ouvertes par les clients.\n\nVoulez vous arrêter progressivement et laisser le temps aux clients de trouver un autre relai ?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia a détecté que Tor s'est arrêté brutalement.\n"
-"\n"
-"Veuillez contrôler dans l'historique les derniers messages d'erreur ou d'alerte."
+msgstr "Vidalia a détecté que le logiciel Tor a quitté de façon inattendue.\n\nMerci de vérifier le journal des messages afin de trouver des alertes ou messages d'erreur récents."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablement Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia a essayé de relancer Tor, sans succès. Merci de vérifier votre Gestionnaire de tâches afin de vérifier qu'il n'existe pas un autre processus Tor en cours d'exécution."
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probably un client de messagerie)"
+msgid "failed (%1)"
+msgstr "échec (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", probablement Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probablement un client email,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Une de vos applications %1 semble réaliser une connexion non chiffrée au "
-"port %2."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Votre relai est en cours d'arrêt.\nCliquez 'Stop' encore une fois pour arrêter votre relai maintenant."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Erreur lors du rechargement de la configuration"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia n'a pas pu relancer la configuration de Tor."
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2188,11 +2049,11 @@ msgstr "Vidalia n'a pas pu s'enregistrer pour recevoir les événements de Tor."
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Erreur à l'ouverture du fichier du Journal"
+msgstr "Erreur d'ouverture du journal des messages"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia n'a pas pu ouvrir le fichier du Journal spécifié."
+msgstr "Vidalia n'a pas pu ouvrir le fichier des messages défini."
msgctxt "MessageLog"
msgid "Log Filename Required"
@@ -2200,13 +2061,11 @@ msgstr "Le nom de fichier du Journal des messages est requis"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Vous devez entrer un nom de fichier pour pouvoir enregistrer les messages "
-"dans un fichier."
+msgstr "Vous devez entrer un nom de fichier pour pouvoir enregistrer les messages dans un fichier."
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Sélectionner le fichier du Journal"
+msgstr "Sélectionner le journal des messages"
msgctxt "MessageLog"
msgid "Save Log Messages"
@@ -2214,7 +2073,7 @@ msgstr "Enregistrer le Journal des messages"
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Fichiers texte (*.txt)"
+msgstr "Fichiers Texte (*.txt)"
msgctxt "MessageLog"
msgid "Vidalia"
@@ -2226,11 +2085,11 @@ msgstr "Chercher dans le Journal des messages"
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Chercher :"
+msgstr "Rechercher:"
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Non trouvé"
+msgstr "Non Trouvé"
msgctxt "MessageLog"
msgid "Search found 0 matches."
@@ -2282,7 +2141,7 @@ msgstr "Ctrl+C"
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Sélectionner tout"
+msgstr "Tout sélectionner"
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
@@ -2310,7 +2169,7 @@ msgstr "Enregistrer les messages sélectionnés dans un fichier"
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Options"
+msgstr "Paramètres"
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
@@ -2338,15 +2197,15 @@ msgstr "Fermer"
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Fermer le Journal des messages"
+msgstr "Fermer le journal des messages"
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Échap"
+msgstr "Esc"
msgctxt "MessageLog"
msgid "Find"
-msgstr "Chercher"
+msgstr "Rechercher"
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
@@ -2374,7 +2233,7 @@ msgstr "Enregistrer les options actuelles du Journal des messages"
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Enregistrer les options"
+msgstr "Enregistrer les paramètres"
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
@@ -2390,23 +2249,23 @@ msgstr "Filtrage des messages"
msgctxt "MessageLog"
msgid "Error"
-msgstr "Erreur"
+msgstr "Error"
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Avertissement"
+msgstr "Warning"
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Signalement"
+msgstr "Notice"
msgctxt "MessageLog"
msgid "Info"
-msgstr "Information"
+msgstr "Info"
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Débogage"
+msgstr "Debug"
msgctxt "MessageLog"
msgid "Message Log History"
@@ -2430,39 +2289,27 @@ msgstr "Activer l'enregistrement automatique de tous les messages du Journal"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Enregistrer les nouveaux messages dans un fichier"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Basique"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Etat de Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avancé"
+msgstr "Enregistrer les nouveaux messages automatiquement dans un fichier"
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Toujours enregistrer les nouveaux messages du Journal"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr "Barre d'outils"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Messages qui apparaissent quand un problème\n"
-" est arrivé et que Tor ne peut continuer."
+msgstr "Les messages qui apparaissent quand un problème sérieux vient d'arriver et que Tor ne peut continuer."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Messages qui apparaissent uniquement quand\n"
-"un problème s'est produit avec Tor."
msgctxt "MessageLog"
msgid ""
@@ -2471,50 +2318,33 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Messages qui apparaissent de manière peu fréquente\n"
-"durant le fonctionnement normal\n"
-"de Tor et ne sont pas considérés comme\n"
-"des erreurs, mais dont vous devez tenir\n"
-"compte."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Messages qui apparaissent fréquemment \n"
-"durant le fonctionnement de Tor"
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Nombreux Messages destiné à \n"
-"l'usage principal des développeurs \n"
-"de Tor."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Impossible d'écrire le fichier %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Carte du réseau Tor"
+msgstr "Impossible d'écrire le fichier %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Rafraîchir"
+msgstr "Actualiser"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Rafraîchir la liste des relais Tor et des connexions"
+msgstr "Actualiser la liste des relai et connexions Tor"
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2526,11 +2356,11 @@ msgstr "Aide"
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Montrer l'aide de la carte du réseau"
+msgstr "Voir l'aide de la carte du réseau"
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Aide de la carte du réseau"
+msgstr "Voir l'aide de la carte du réseau"
msgctxt "NetViewer"
msgid "F1"
@@ -2546,15 +2376,15 @@ msgstr "Fermer la carte du réseau"
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Échap"
+msgstr "Esc"
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Rapprocher"
+msgstr "Zoom Avant"
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Agrandir l'échelle de la carte du réseau"
+msgstr "Zoom avant sur la carte du réseau"
msgctxt "NetViewer"
msgid "+"
@@ -2562,11 +2392,11 @@ msgstr "+"
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Éloigner"
+msgstr "Zoom Arrière"
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Réduire l'échelle de la carte du réseau"
+msgstr "Zoom arrière sur la carte du réseau"
msgctxt "NetViewer"
msgid "-"
@@ -2586,11 +2416,11 @@ msgstr "Ctrl+Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Relais non trouvé"
+msgstr "Relai non trouvé"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Aucun détail disponible sur le relais sélectionné."
+msgstr "Pas de détails disponibles pour le relai sélectionné."
msgctxt "NetViewer"
msgid "Unknown"
@@ -2602,19 +2432,35 @@ msgstr "Plein écran"
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Voir la carte du réseau en plein écran."
+msgstr "Voir la carte du réseau en plein écran"
msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Carte du réseau"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Relai"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Connexion"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Etat"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Passerelle invalide"
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "L'identifiant de passerelle spécifié est invalide."
+msgstr "L'identifiant de la passerelle défini est invalide."
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
@@ -2624,18 +2470,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro "
-"de port pour que Tor puisse utiliser le serveur mandataire (proxy) et "
-"accéder à l'Internet."
+msgstr "Vous devez indiquer une adresse IP ou un nom d'hôte et un numéro de port pour que Tor puisse utiliser le serveur mandataire (proxy) et accéder à Internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Vous devez indiquer le ou les ports utilisés par votre parefeu pour vous "
-"autoriser à vous connecter."
+msgstr "Vous devez indiquer un ou plusieurs ports que votre pare feu autorise pour vous connecter."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2643,9 +2484,7 @@ msgstr "'%1' n'est pas un numéro de port valide."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Cochez si votre réseau local a besoin d'un proxy mandataire pour accéder à "
-"Internet"
+msgstr "Cochez si votre réseau local a besoin d'un proxy mandataire pour accéder à Internet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2653,25 +2492,23 @@ msgstr "J'utilise un serveur mandataire (proxy) pour accéder à Internet"
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Paramètres du serveur mandataire (proxy)"
+msgstr "Paramètres du proxy"
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Nom d'utilisateur :"
+msgstr "Utilisateur:"
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Mot de passe :"
+msgstr "Mot de passe:"
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port :"
+msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Cochez pour se connecter uniquement au relais en utilisant les ports "
-"autorisés par votre parefeu."
+msgstr "Cochez pour se connecter uniquement au relais en utilisant les ports autorisés par votre parefeu."
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2679,11 +2516,11 @@ msgstr "Mon parefeu me laisse me connecter seulement à certains ports"
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Paramètres du parefeu"
+msgstr "Paramètres du pare feu"
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Ports autorisés :"
+msgstr "Ports autorisés:"
msgctxt "NetworkPage"
msgid "80, 443"
@@ -2693,18 +2530,15 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Cochez pour crypter les demandes d'annuaire et, facultativement, utilisez "
-"les relais passerelles pour accéder au réseau Tor."
+msgstr "Cochez pour chiffrer les demandes d'annuaire et, facultativement, utilisez les relais passerelles pour accéder au réseau Tor."
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr ""
-"Mon fournisseur d'accès à Internet bloque les connexions au réseau Tor"
+msgstr "Mon fournisseur d'accès à Internet bloque les connexions au réseau Tor"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Paramètres de Passerelle"
+msgstr "Paramètres de la passerelle"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
@@ -2712,7 +2546,7 @@ msgstr "Ajouter une passerelle :"
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Supprimer de la liste les passerelles sélectionnées"
+msgstr "Supprimer les passerelles sélectionnées de la liste"
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
@@ -2724,9 +2558,7 @@ msgstr "Rechercher maintenant des passerelles"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">Comment puis-je trouver autrement des "
-"passerelles ?</a>"
+msgstr "<a href=\"bridges.finding\">Comment puis-je trouver autrement des passerelles ?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2737,15 +2569,10 @@ msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Pas de nouvelle passerelle disponible. Vous pouvez soit attendre un peu et "
-"réessayer, ou encore essayer une autre méthode pour trouver de nouvelles "
-"passerelles."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Appuyez sur Aide pour voir d'autres moyens de trouver de nouvelles "
-"passerelles."
+msgstr "Appuyez sur Aide pour voir d'autres moyens de trouver de nouvelles passerelles."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2757,7 +2584,7 @@ msgstr "Type:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Vous devez sélectionner l type de proxy:"
+msgstr "Vous devez sélectionner le type de proxy."
msgctxt "NetworkPage"
msgid "SOCKS 4"
@@ -2841,7 +2668,7 @@ msgstr "Inconnu"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Détails du Relais"
+msgstr "Détails du relai"
msgctxt "RouterInfoDialog"
msgid "Summary"
@@ -2853,7 +2680,7 @@ msgstr "Nom :"
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "État :"
+msgstr "Etat :"
msgctxt "RouterInfoDialog"
msgid "Location:"
@@ -2901,11 +2728,11 @@ msgstr "%1 Ko/s"
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Relais"
+msgstr "Relai"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zoomer sur le relais"
+msgstr "Zoomer sur le relai"
msgctxt "RouterListWidget"
msgid "%1 relays online"
@@ -2931,18 +2758,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Vous avez configuré Tor en tant que relais passerelle pour les utilisateurs "
-"censurés, mais la version de Tor que vous utilisez ne supporte pas les "
-"passerelles."
+msgstr "Vous avez configuré Tor en tant que relais passerelle pour les utilisateurs censurés, mais la version de Tor que vous utilisez ne supporte pas les passerelles."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Merci de mettre à jour Tor ou de configurer votre version actuelle pour agir"
-" en tant que relais Tor normal."
+msgstr "Merci de mettre à jour Tor ou de configurer votre version actuelle pour agir en tant que relais Tor normal."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2954,15 +2776,11 @@ msgstr "Vous devez spécifier au moins un nom de relais et un port."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Lancer uniquement comme client"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relayer le trafic pour le réseau Tor"
+msgstr "Démarrer uniquement en tant que client"
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Port relais :"
+msgstr "Port du relai:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
@@ -2970,7 +2788,7 @@ msgstr "Activer le miroir de l'annuaire des relais"
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Essayer de configurer automatiquement le transfert de ports"
+msgstr "Essayer de configurer automatiquement la redirection de ports"
msgctxt "ServerPage"
msgid "Test"
@@ -2978,7 +2796,7 @@ msgstr "Test"
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Voir la rubrique d'aide sur le transfert de port"
+msgstr "Voir la rubrique d'aide sur la redirection de port"
msgctxt "ServerPage"
msgid "Directory Port:"
@@ -2994,13 +2812,11 @@ msgstr "Info. de contact :"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nom de votre relais"
+msgstr "Nom de votre relai"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Port par lequel les utilisateurs et les autres relais peuvent communiquer "
-"avec votre relais"
+msgstr "Port par lequel les utilisateurs et les autres relais peuvent communiquer avec votre relais"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -3015,50 +2831,46 @@ msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"Merci d'indiquer votre vitesse en remontée si votre connexion a une vitesse "
-"élevée en téléchargement mais lente en remontée."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Câble/ADSL 256 kbit/s"
+msgstr "Cable/ADSL 256 Kbps"
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Câble/ADSL 512 kbit/s"
+msgstr "Cable/ADSL 512 Kbps"
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Câble/ADSL 768 kbit/s"
+msgstr "Cable/ADSL 768 Kbps"
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Câble/ADSL 1.5 Mbit/s"
+msgstr "T1/Cable/ADSL 1.5 Mbps"
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbit/s"
+msgstr "> 1.5 Mbps"
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Personnalisé"
+msgstr "Autre"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Sélectionner dans la liste déroulante l'entrée qui se rapproche le plus de "
-"votre connexion Internet"
+msgstr "Sélectionner dans la liste déroulante l'entrée qui se rapproche le plus de votre connexion Internet"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Afficher la rubrique d'aide sur les limitations de la bande passante"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Taux moyen"
+msgstr "Débit moyen"
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Limite à long terme du taux moyen de la bande passante"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
@@ -3077,9 +2889,6 @@ msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"Votre bande passante maximale doit être supérieure ou égal à votre bande "
-"passante moyene. Les deux valeurs doivent être supérieures ou égales à 20 "
-"KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3091,7 +2900,7 @@ msgstr "Ports 6660 - 6669 et 6697"
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
@@ -3099,11 +2908,11 @@ msgstr "Ports 110, 143, 993 et 995"
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Téléchargement des courriels (POP, IMAP)"
+msgstr "Téléchargement des emails (POP, IMAP)"
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Ports non spécifiés par d'autres choix prédéfinis"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
@@ -3135,22 +2944,18 @@ msgstr "Sites Web"
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Afficher la rubrique d'aide des politiques de sortie"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Quelles sont les ressources d'Internet auquelles peuvent avoir accès les "
-"utilisateurs par votre relais ?"
+msgstr "A quelles ressources Internet peuvent avoir accès les utilisateurs via votre relais ?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor bloque encore certains programmes mails et partage de fichiers par "
-"défaut pour réduire le spam et les autres abus."
+msgstr "Tor bloque encore certains programmes mails et partage de fichiers par défaut afin de réduire le spam et autres abus."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3158,16 +2963,12 @@ msgstr "Politiques de sortie"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Permettre aux utilisateurs d'accéder à votre passerelle en leur donnant "
-"cette ligne :"
+msgstr "Permettez aux utilisateurs d'accéder à votre passerelle en leur donnant cette ligne :"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Il s'agit de l'identité de votre passerelle ; vous pouvez la communiquer aux"
-" personnes que vous souhaitez"
+msgstr "Il s'agit de l'identité de votre passerelle, vous pouvez la communiquer aux personnes que vous souhaitez"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3179,15 +2980,13 @@ msgstr "Pas d'utilisation récente"
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Aucun client n'a utilisé votre relais dernièrement."
+msgstr "Aucun client a utilisé votre relay récemment."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Laisser votre relais actif de façon à ce que les clients aient un chance de "
-"le trouver et de l'utiliser."
+msgstr "Laisser votre relais actif de façon à ce que les clients aient un chance de le trouver et de l'utiliser."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3201,9 +3000,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor a renvoyé une réponse incorrecte lorsque Vidalia a demandé l'historique "
-"de votre passerelle."
+msgstr "Tor a renvoyé une réponse mal formatée lorsque Vidalia a demandé l'historique de votre passerelle."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3211,7 +3008,7 @@ msgstr "La réponse renvoyée était: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Aider les utilisateurs censurés à accéder au réseau Tor"
+msgstr "Aide les utilisateurs censurés a accéder au réseau Tor"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3223,19 +3020,25 @@ msgstr "<a href=\"#bridgeHelp\">Qu'est-ce que c'est?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Attribuer automatiquemeny l'adresse de mon bridge"
+msgstr "Diffuser automatiquement l'adresse de ma passerelle"
+
+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 "Héberger une copie du répertoire des relais"
+msgstr "Héberger un miroir d'annuaire des relais"
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Adresse email à laquelle vous pouvez être joint s'il y a un \n"
-"problème avec votre relais. Vous pouvez aussi inclure votre empreinte PGP ou GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3245,48 +3048,39 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Merci de configurer au moins un répertoire et un port virtuel pour chacun "
-"des services que vous voulez sauver. Supprimez les autres."
+msgstr "Merci de configurer au moins un service d'annuaire et un port virtuel pour chacun des services que vous voulez sauvegarder. Supprimez les autres."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Erreur"
+msgstr "Error"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Merci de choisir un Service."
+msgstr "Merci de sélectionner un Service."
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Sélectionnez le répertoire de Service"
+msgstr "Sélectionnez le service d'annuaire"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Les ports virtuels peuvent uniquement contenir des numéros de ports valides "
-"[1..65535]"
+msgstr "Les ports virtuels peuvent uniquement contenir des numéros de ports valides [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
-"Destination doit uniquement contenir addresse:port, addresse, or port."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr "Répertoire déjà utilisé par un autre service"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulaire"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Services Cachés hébergés"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Adresse Onion"
+msgstr "Adresse de l'onion"
msgctxt "ServicePage"
msgid "Virtual Port"
@@ -3294,7 +3088,7 @@ msgstr "Port Virtuel"
msgctxt "ServicePage"
msgid "Target"
-msgstr "Destination"
+msgstr "Cible"
msgctxt "ServicePage"
msgid "Directory Path"
@@ -3314,13 +3108,11 @@ msgstr "Supprimer le service selectionné de la liste"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Copier l'adresse onion du service selectionné dans le presse-papiers."
+msgstr "Copier l'adresse onion du service sélectionné dans le presse-papiers."
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Parcourez le système de fichiers et choisissez le dossier du service "
-"sélectionné"
+msgstr "Parcourez le système de fichiers et choisissez le dossier du service sélectionné"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3328,11 +3120,11 @@ msgstr "Créé par Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Copier au presse-papiers"
+msgstr "Copier dans le presse-papier"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Le programme Tor est en cours de fonctionnement"
+msgstr "Le programme Tor est en cours d’exécution"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
@@ -3340,18 +3132,14 @@ msgstr "Vous utilisez actuellement la version \"%1\" du programme Tor."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Le programme Tor n'est pas ouvert"
+msgstr "Le programme Tor n'est pas en cours d’exécution"
msgctxt "StatusEventWidget"
msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Cliquer sur \"Démarrer Tor\" dans le Panneau de Configuration Vidalia pour "
-"redémarrer le programme Tor. Si Tor s'arrête de manière intempestive, "
-"sélectionnez l'onglet \"Avancé\" ci-dessus pour obtenir des détails sur "
-"l'erreur produite."
+msgstr "Cliquer sur \"Démarrer Tor\" dans le Panneau de Configuration de Vidalia pour redémarrer le programme Tor. Si Tor s'arrête de manière inattendue, sélectionnez l'onglet \"Avancé\" ci-dessus pour obtenir des détails sur l'erreur produite."
msgctxt "StatusEventWidget"
msgid ""
@@ -3360,10 +3148,6 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
-"Vous utilisez actuellement le programme Tor en version \"%1\", qui n'est "
-"plus recommandée. Merci de mettre à jour Tor à la version la plus récente, "
-"qui pourrait contenir d'importantes corrections de sécurité, de fiabilité et"
-" de performances."
msgctxt "StatusEventWidget"
msgid ""
@@ -3372,14 +3156,10 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"Vous utilisez actuellement le programme Tor en version \"%1\", qui pourrait "
-"ne pas fonctionner avec le réseau Tor actuel. Merci de mettre à jour Tor à "
-"la version la plus récente, qui pourrait contenir d'importantes corrections "
-"de sécurité, de fiabilité et de performances."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Votre programme Tor est périmé"
+msgstr "Votre logiciel Tor n'est pas à jour"
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
@@ -3389,10 +3169,7 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Vous avez pu vous connecter avec succès au réseau Tor. Vous pouvez "
-"maintenant configurer vos applications pour utiliser Internet de manière "
-"anonyme."
+msgstr "Vous avez pu vous connecter avec succès au réseau Tor. Vous pouvez maintenant configurer vos applications pour utiliser Internet de manière anonyme."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
@@ -3402,10 +3179,7 @@ msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Le programme Tor a rencontré une erreur interne. Merci de transmettre le "
-"message d'erruer suivant aux développeurs de Tor à bugs.torproject.org: "
-"\"%1\"\n"
+msgstr "Le logiciel Tor a recontré un bug interne. Merci de signaler le message d'erreur suivant aux développeurs de Tor sur bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3414,10 +3188,6 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Tor a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 "
-"secondes en retard de la source \"%2\". Si votre horloge n'est pas correcte,"
-" Tor ne sera pas capable de fonctionner. Merci de vérifier que votre "
-"ordinateur affiche la bonne heure."
msgctxt "StatusEventWidget"
msgid ""
@@ -3426,14 +3196,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
-"Tor a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 "
-"secondes en avance de la source \"%2\". Si votre horloge n'est pas correcte,"
-" Tor ne sera pas capable de fonctionner. Merci de vérifier que votre "
-"ordinateur affiche la bonne heure."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "L'horloge de votre ordinateur est potentiellement inexacte."
+msgstr "L'heure système de votre ordinateur est potentiellement incorrect"
msgctxt "StatusEventWidget"
msgid ""
@@ -3442,10 +3208,6 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
-"Une des applications de votre ordinateur a tenté d'établir une connexion "
-"non-cryptée à travers Tor sur le port %1. Envoyer des informations non-"
-"cryptées sur Tor peut être dangereux et n'est pas recommandé. Pour votre "
-"protection, Tor a automatiquement fermé la connexion."
msgctxt "StatusEventWidget"
msgid ""
@@ -3453,9 +3215,6 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
-"Une des applications de votre ordinateur a tenté d'établir une connexion "
-"non-cryptée à travers Tor sur le port %1. Envoyer des informations non-"
-"cryptées sur Tor peut être dangereux et n'est pas recommandé. "
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3468,15 +3227,10 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
-"Une des applications de votre ordinateur a établi une connexion à travers "
-"Tor vers \" %1\", en utilisant un protocole qui pourrait révéler des "
-"informations sur votre destination. Merci de vous assurer que vous avez "
-"configuré vos applications pour qu'elles utilisent seulement SOCKS4a ou "
-"SOCKS5 avec résolution à distance du nom d'hôte."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocole SOCKS inconnu"
+msgstr "Protocole SOCKS invalide"
msgctxt "StatusEventWidget"
msgid ""
@@ -3484,15 +3238,10 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"Une des applications de votre ordinateur a tenté d'établir une connexion à "
-"travers Tor en utilisant un protocole que Tor ne reconnait pas. Merci de "
-"vous assurer que vous avez configuré vos applications pour qu'elles "
-"utilisent seulement SOCKS4a ou SOCKS5 avec résolution à distance du nom "
-"d'hôte."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Nom d'hôte (hostname) de la destination invalide"
+msgstr "Nom d'hôte de destination invalide"
msgctxt "StatusEventWidget"
msgid ""
@@ -3500,9 +3249,6 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
-"Une de vos applications a tenté d'établir une connexion à travers Tor vers "
-"\"%1\", que Tor ne reconnait comme étant un nom d'hôte valide. Merci de "
-"vérifier la configuration de votre application."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
@@ -3514,9 +3260,6 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
-"Tor a déterminé que l'adresse IP publique de votre relais est actuellement "
-"%1%2. Si ceci n'est pas correct, merci de mettre l'option \"Adresse\" de la "
-"configuration de votre relais à la bonne valeur."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
@@ -3528,10 +3271,6 @@ 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 a détecté que votre fournisseur DNS fournit des réponses fausses pour "
-"des domaines qui n'existent pas. Quelques FAI et autres fournisseurs DNS, "
-"téls que OpenDNS, sont connus pour cette pratique qui a pour but d'afficher "
-"leurs propres pages de recherche et de publicité."
msgctxt "StatusEventWidget"
msgid ""
@@ -3539,10 +3278,6 @@ 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 a détecté que votre fournisseur DNS fournit des réponses fausses pour "
-"des domaines bien connus. Puisque les clients comptent sur les relais Tor "
-"pour obtenir des réponses DNS précises, votre relais ne sera pas configuré "
-"en tant que relais de sortie."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3554,23 +3289,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"Tor tente de déterminer si le port du serveur de votre relais est accessible"
-" par le réseau Tor en se connectant à %1:%2. Ce test pourrait prendre "
-"plusieurs minutes."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr ""
-"Test de vérification de l'accessibilité du port du serveur effectué avec "
-"succès!"
+msgstr "Test de vérification de l'accessibilité du port du serveur effectué avec succès!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Le port du serveur de votre relais est accessible par le réseau Tor!"
+msgstr "Le port de votre serveur relais est accessible sur le réseau Tor!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Echec du test de vérification de l'accessibilité du port du serveur"
+msgstr "Echec du test de vérification d'accessibilité du port du serveur"
msgctxt "StatusEventWidget"
msgid ""
@@ -3578,42 +3308,30 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"Le port du serveur de votre relais n'est pas accessible par les autres "
-"clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un "
-"firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre "
-"adresse IP / port de serveur, merci de vérifier la configuration de votre "
-"relais."
+msgstr "Le port de votre relais n'est pas accessible par les autres clients Tor. Cela peut survenir si vous êtes derrière un routeur ou un pare-feu qui nécessite une redirection de port. Si %1:%2 n'est pas l'adresse IP / port de votre serveur, merci de vérifier la configuration de votre relais."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Vérification de l'accessibilité du répertoire du port"
+msgstr "Vérification de l'accessibilité du port de l'annuaire"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor tente de déterminer si le port du serveur de votre relais est accessible"
-" par le réseau Tor en se connectant à %1:%2. Ce test pourrait prendre "
-"plusieurs minutes."
+msgstr "Tor essaye de vérifier que le port de votre annuaire est accessible par le réseau Tor en se connectant à %1:%2. Ce test peut prendre plusieurs minutes."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-"Test de vérification de l'accessibilité du port du répertoire effectué avec "
-"succès!"
+msgstr "Test de vérification de l'accessibilité du port de l'annuaire effectué avec succès!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-"Le port du répertoire de votre relais est accessible par le réseau Tor!"
+msgstr "Le port de votre annulaire de relais est accessible par le réseau Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr ""
-"Echec du test de vérification de l'accessibilité du port du répertoire"
+msgstr "Echec du test de vérification de l'accessibilité du port de l'annuaire"
msgctxt "StatusEventWidget"
msgid ""
@@ -3622,11 +3340,6 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
-"Le port du répertoire de votre relais n'est pas accessible par les autres "
-"clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un "
-"firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre "
-"adresse IP / port de répertoire, merci de vérifier la configuration de votre"
-" relais."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
@@ -3636,14 +3349,11 @@ msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Le descripteur de votre relais, qui permet à des clients de se connecter à "
-"votre relais, a été rejeté par le serveur de répertoire à %1:%2. La raison "
-"donnée est: %3"
+msgstr "L'identifiant de votre relais, qui permet aux clients de se connecter à votre relais, a été rejeté par le serveur d'annuaire %1:%2. La raison donnée est: %3."
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "re relais est en ligne"
+msgstr "Votre relai est en ligne"
msgctxt "StatusEventWidget"
msgid ""
@@ -3652,11 +3362,22 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-"Votre relais est maintenant en ligne et disponible pour être utilisé par les"
-" clients Tor. Dans quelques heures, au fur et à mesure que des clients "
-"apprendront l'existance de votre relais, vous devriez remarquer une "
-"augmentation du traffic de votre réseau sur le Graphique de Bande Passante "
-"Merci de contribuer au déploiement du réseau Tor!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Etat"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Journal des messages"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Etat de Tor"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Voir au lancement"
msgctxt "Stream"
msgid "New"
@@ -3684,16 +3405,22 @@ msgstr "Fermé"
msgctxt "Stream"
msgid "Retrying"
-msgstr "Réessai"
+msgstr "Nouvelle tentative"
msgctxt "Stream"
msgid "Remapped"
-msgstr "'Remappé'"
+msgstr "Remappé"
msgctxt "Stream"
msgid "Unknown"
msgstr "Inconnu"
+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 "Le processus %1 ne s'est pas arrêté. [%2]"
@@ -3704,7 +3431,7 @@ msgstr "Le service Tor n'est pas installé."
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Le service Tor n'a pu être démarré."
+msgstr "Impossible de démarrer le service Tor."
msgctxt "TorSettings"
msgid "Failed to hash the control password."
@@ -3718,9 +3445,7 @@ msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Sauvegarde des réglages. Si non cochée les réglages seront appliqués "
-"seulement à la présente instance Tor."
+msgstr "Sauvegarde des paramètres. Si non cochée les réglages seront appliqués seulement à l'instance Tor actuelle."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3744,7 +3469,7 @@ msgstr "Refaire"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Sélectionner tout"
+msgstr "Sélectionner Tout."
msgctxt "TorrcDialog"
msgid "Apply all"
@@ -3760,9 +3485,7 @@ msgstr "Erreur de connexion à Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"La sélection est vide. Merci de sélectionner du texte, ou cocher \"Appliquer"
-" tout\""
+msgstr "La sélection est vide. Merci de sélectionner du texte, ou cocher \"Appliquer tout\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3770,11 +3493,35 @@ msgstr "Erreur à la ligne %1: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Erreur"
+msgstr "Error"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Une erreur s'est produite à l'ouverture du fichier torrc"
+msgstr "Une erreur est survenue lors de l'ouverture du fichier torrc"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
msgctxt "UPNPControl"
msgid "Success"
@@ -3814,11 +3561,11 @@ msgstr "Recherche des périphériques UPnP"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Mise à jour du transfert du port Annuaire"
+msgstr "Mise à jour du transfert du port de l'annuaire"
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Mise à jour du transfert du port Relais"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
@@ -3836,17 +3583,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia n'a pu vérifier les mises à jour logicielles car il n'a pu trouver "
-"'%1'."
+msgstr "Vidalia n'a pu vérifier les mises à jour logicielles car il n'a pas trouvé '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia n'a pu vérifier les mises à jour logicielles car le processus de "
-"mise à jour de Tor a échoué de façon inattendue."
+msgstr "Vidalia n'a pu vérifier les mises à jour logicielles car le processus de mise à jour de Tor a quitté de façon inattendue."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3866,7 +3609,7 @@ msgstr "Installation d'une mise à jour du logiciel..."
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Terminé. Votre logiciel est maintenant à jour."
+msgstr "Terminé! Votre logiciel est maintenant à jour."
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3886,11 +3629,11 @@ msgstr "Annuler"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Des mises à jour logicielles sont disponibles"
+msgstr "Des mises à jour sont disponibles"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Rappelez moi plus tard"
+msgstr "Me rappeler plus tard"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3902,15 +3645,23 @@ msgstr "Les mise à jour suivantes sont disponibles pour l'installation:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Ensemble"
+msgstr "Paquet"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Version"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Envoi du Rapport d'erreur"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Impossible d'envoyer le rapport: %1"
+
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr "Ok"
msgctxt "VMessageBox"
msgid "Cancel"
@@ -3938,7 +3689,7 @@ msgstr "Voir l'historique"
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Montrer options"
+msgstr "Afficher les préférences"
msgctxt "VMessageBox"
msgid "Continue"
@@ -3958,7 +3709,7 @@ msgstr "Argument invalide"
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia est déjà en fonctionnement"
+msgstr "Vidalia est déjà lancé"
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
@@ -3970,20 +3721,15 @@ msgstr "Réinitialiser TOUS les paramètres utilisés par Vidalia."
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
-"Définir le dossier que Vidalia utiliser pour enregistrer les fichiers de "
-"données."
+msgstr "Définir le dossier que Vidalia doit utiliser pour enregistrer les fichiers de données."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
-"Définir le nom et le chemin du fichier d'identification du processus Vidalia"
-" (pidfile)."
+msgstr "Définir le nom et le chemin du fichier d'identification du processus Vidalia (pidfile)."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
-"Définir le nom et le chemin du fichier du Journal des messages de Vidalia."
+msgstr "Définir le nom et le chemin du fichier du Journal des messages de Vidalia."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
@@ -4006,12 +3752,8 @@ msgid "Unable to open log file '%1': %2"
msgstr "Impossible d'ouvrir le fichier du Journal des messages '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Valeur requise pour le paramètre :"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Code langage demandé invalide:"
+msgstr "Code de langue demandé invalide:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
@@ -4019,25 +3761,22 @@ msgstr "Style d'interface demandé invalide:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Niveau d'historique demandé invalide:"
+msgstr "Niveau d'historisation demandé invalide:"
msgctxt "Vidalia"
msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Un autre processus Vidalia est peut être actif. S'il n'y a réellement aucun autre processus fonctionnant, vous pouvez choisir de continuer quand même. \n"
-"\n"
-"Voulez vous continuer à lancer Vidalia ?"
+msgstr "Un autre processus Vidalia est peut être actif. S'il n'y a réellement aucun autre processus en cours, vous pouvez choisir de continuer quand même. \n\nVoulez vous continuer à lancer Vidalia ?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 secs"
+msgstr "%1 secondes"
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 o/s"
+msgstr "%1 B/s"
msgctxt "stringutil.h"
msgid "%1 KB/s"
@@ -4049,7 +3788,7 @@ msgstr "%1 Mo/s"
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 Go/s"
+msgstr "%1 GB/s"
msgctxt "stringutil.h"
msgid "%1 days"
@@ -4061,6 +3800,4 @@ msgstr "%1 heures"
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 mins"
-
-
+msgstr "%1 minutes"
diff --git a/src/vidalia/i18n/po/fur/vidalia_fur.po b/src/vidalia/i18n/po/fur/vidalia_fur.po
index 9307aa2..d98c195 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 92828aa..fa661c9 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 f23a0ed..8da7090 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 174bcbe..ef05b26 100755
--- a/src/vidalia/i18n/po/gu/vidalia_gu.po
+++ b/src/vidalia/i18n/po/gu/vidalia_gu.po
@@ -1,11 +1,12 @@
#
+# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+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,10 +233,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -275,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,17 +429,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1334,10 +1344,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1365,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1647,34 +1657,6 @@ 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 ""
@@ -1683,10 +1665,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1799,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1885,18 +1859,6 @@ 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 ""
@@ -1937,138 +1899,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2076,31 +2015,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2356,19 +2289,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2411,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2514,6 +2435,22 @@ 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 ""
@@ -2839,10 +2776,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3087,6 +3020,14 @@ 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 ""
@@ -3131,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3423,6 +3360,22 @@ 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 ""
@@ -3459,6 +3412,12 @@ 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 ""
@@ -3537,6 +3496,30 @@ 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 ""
@@ -3815,5 +3798,3 @@ 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 bd970e0..0cdc1ea 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 ce91a85..de68c96 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/he/qt_he.po b/src/vidalia/i18n/po/he/qt_he.po
index c875a40..1f1f7af 100644
--- a/src/vidalia/i18n/po/he/qt_he.po
+++ b/src/vidalia/i18n/po/he/qt_he.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# Amichay P. K. <am1chay.p.k 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-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-10-09 19:14+0000\n"
-"Last-Translator: Amichay <am1chay.p.k at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +17,17 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "הפעל"
+msgstr ""
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "הקובץ '%1' דורש Qt %2, נמצא Qt %3."
+msgstr ""
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "שגיאה: ספריית QT אינה תואמת"
+msgstr ""
#: qapplication.cpp:2095
msgctxt "QApplication"
@@ -40,162 +37,162 @@ msgstr "RTL"
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "הפעל את החלון המרכזי של התוכנה"
+msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr "אישור"
+msgstr ""
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "שמור"
+msgstr ""
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr "פתח"
+msgstr ""
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr "ביטול"
+msgstr ""
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr "סגור"
+msgstr ""
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr "החל"
+msgstr ""
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "אתחול"
+msgstr ""
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr "עזרה"
+msgstr ""
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "אל תשמור"
+msgstr ""
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "מחק"
+msgstr ""
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "&כן"
+msgstr ""
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr "כן ל&כל"
+msgstr ""
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr "&לא"
+msgstr ""
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "ל&א לכל"
+msgstr ""
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr "שמור הכל"
+msgstr ""
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr "עזוב"
+msgstr ""
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr "נסה שנית"
+msgstr ""
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr "התעלם"
+msgstr ""
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr "שחזר ברירת מחדל"
+msgstr ""
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr "סגור ללא שמירה"
+msgstr ""
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr "&אישור"
+msgstr ""
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr "שם"
+msgstr ""
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr "גודל"
+msgstr ""
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "סוג"
+msgstr ""
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr "סוג"
+msgstr ""
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr "תאריך שינוי"
+msgstr ""
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr "כל הקבצים (*)"
+msgstr ""
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "תיקיות"
+msgstr ""
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr "&פתח"
+msgstr ""
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr "&שמור"
+msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr "פתח"
+msgstr ""
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
@@ -203,8 +200,6 @@ msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
msgstr ""
-"%1 כבר קיים.\n"
-"האם ברצונך להחליף אותו?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -213,59 +208,56 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
-"הקובץ לא נמצא.\n"
-"אנא וודא ששם הקובץ נכון."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "המחשב שלי"
+msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "&שנה שם"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&מחק"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "הצג קבצים &נסתרים"
+msgstr ""
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr "חזרה"
+msgstr ""
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "תיקיית אב"
+msgstr ""
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "תצוגת רשימה"
+msgstr ""
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "תצוגת פרטים"
+msgstr ""
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr "קבצים מסוג:"
+msgstr ""
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "תיקייה:"
+msgstr ""
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
@@ -274,9 +266,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"התיקייה לא נמצאה.\n"
-"אנא וודא את שם התיקייה."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -284,98 +273,96 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' מוגן מפני כתיבה.\n"
-"האם ברצונך למחוק אותו בכל מקרה?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "האם אתה בטוח שברצונך למחוק את '%1'?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "אין אפשרות למחוק את התיקייה."
+msgstr ""
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr "כל הקבצים (*.*)"
+msgstr ""
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "שמור בשם"
+msgstr ""
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "כונן"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr "קובץ"
+msgstr ""
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr "לא ידוע"
+msgstr ""
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "מצא תיקייה"
+msgstr ""
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "הצג"
+msgstr ""
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "קדימה"
+msgstr ""
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr "תיקייה חדשה"
+msgstr ""
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "&תיקייה חדשה"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&בחר"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "הסר"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "קובץ &בשם:"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "חפש ב:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "צור תיקייה חדשה"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "שם קובץ שגוי"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -383,67 +370,63 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>השם \"%1\" אינו תקין.</b><p>נסה שנית עם שם אחר, בעל פחות אותיות וללא "
-"סימנים מיוחדים."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr "שם"
+msgstr ""
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr "גודל"
+msgstr ""
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "סוג"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr "סוג"
+msgstr ""
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr "תאריך שינוי"
+msgstr ""
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "המחשב שלי"
+msgstr ""
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr "מחשב"
+msgstr ""
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr "%1 TB"
+msgstr ""
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/he/vidalia_he.po b/src/vidalia/i18n/po/he/vidalia_he.po
index 1372b55..b5a9f9f 100644
--- a/src/vidalia/i18n/po/he/vidalia_he.po
+++ b/src/vidalia/i18n/po/he/vidalia_he.po
@@ -1,16 +1,13 @@
#
# Translators:
-# Amichay P. K. <am1chay.p.k at gmail.com>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
-# Something Another <roeyjobsyud at gmail.com>, 2012.
-# <static.172 at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-22 16:52+0000\n"
-"Last-Translator: static172 <static.172 at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,15 +22,15 @@ msgstr "אודות Vidalia"
msgctxt "AboutDialog"
msgid "License"
-msgstr "רישיון"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr "Vidalia"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
@@ -82,7 +79,7 @@ msgstr "לא יכול להתקין את שירות Tor"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia לא הצליחה להתקין את שירות Tor."
+msgstr "Vidalia לא הצליח להתקין את שירות Tor."
msgctxt "AdvancedPage"
msgid "Authentication:"
@@ -114,15 +111,15 @@ msgstr ":"
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "קובץ הגדרות Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "התחל את Tor באמצעות קובץ הגדרות מותאם אישית (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "בחר נתיב אל קובץ ההגדרות"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
@@ -130,43 +127,43 @@ msgstr "חפש"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "תיקית מידע"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "אחסן מידע עבור Tor בתיקיה זו"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "בחר את התיקיה שתשמש לאיחסון מידע עבור Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "שליטה ב-Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "השתמש בחיבור TCP (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "נתיב:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "השתמש ב-Unix domain socket (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "ערוך את torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "שים לב: פעולה זו תערוך את קובץ torrc הטעון"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "נתיב ל-ControlSocket אינו קיים."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -182,23 +179,19 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "אזהרה"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "שינית הגדרות בקונפיגורציית טור, רוצה לאתחל את Tor?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "קובץ קונפיגורציית Tor (torrc);;כל הקבצים (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "בחר קובץ עבור Tor socket path"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "עשה קונפיגורצייה אוטומטית עבור \"שליטת פורטים\""
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -206,9 +199,6 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia לא היתה מסוגלת להסיר את Tor.\n"
-"\n"
-"יתכן שעליך להסיר אותו ידנית."
msgctxt "AppearancePage"
msgid "Language"
@@ -228,7 +218,7 @@ msgstr "בחר את סגנון הממשק של Vidalia"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia לא היתה מסוגלת לטעון את קבצי התרגום המבוקשים."
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -243,10 +233,6 @@ msgid "Show Settings"
msgstr "הצג הגדרות"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "שימוש רוחב-פס של Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "אתחל"
@@ -286,53 +272,57 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ביטול"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "מתחיל בקשת גשר HTTPS..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "מתחבר אל %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "שולח בקשת HTTPS אל הגשר..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "טוען רשימת גשרים..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "טוען גשרים..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "לא מסוגל לטעון גשרים: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "מנסה שנית בקשה לגשרים..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "מדינה"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# קליינט"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "קליינטים מהמדינות הבאות השתמשו בממסר שלך מאז %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "סיכום שימוש בגשר"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "סיכום קליינטים"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -392,11 +382,11 @@ msgstr "רשת"
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "שיתוף"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "שירות"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
@@ -439,19 +429,27 @@ msgid "Control socket is not connected."
msgstr "סוקט שליטה לא מחובר."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "נדרשת סיסמה"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "זכור את הסיסמה שלי"
+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 ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia התחברה לתהליך פעיל של Tor שדורש סיסמה. אנא הזן את סיסמת התהליך:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -471,847 +469,854 @@ msgstr "תשובת שליטה שגויה. (%1)"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "אפגניסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "אנדורה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "אנגולה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "אנטיגואה וברבודה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "ארגנטינה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "ארמניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "אוסטרליה"
+msgstr "אודות Vidalia"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "אזרביג'אן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "בהאמה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "בנגאלדש"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "ברבדוס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "בלרוס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "בלגיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "בליז"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "בוטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "בוליביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "בוסניה / הרצגובינה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "בוצואנה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "ברזיל"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "ברוני דרוסלם"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "בולגריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "בורקינה פאסו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "בורונדי"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "קמבודיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "קמרון"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "קנדה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "קייפ ורדה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "רפובליקת מרכז אפריקה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "צ'אד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "צ'ילה"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "סין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "קולומביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "איי קומורו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "הרפובליקה הדמוקרטית של קונגו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "קונגו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "קוסטה ריקה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "חוף השנהב"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "קרואטיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "קובה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "קפריסין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "קזחסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "דנמרק"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "ג'יבוטי"
+msgstr "אודות"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "דומיניקה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "הרפובליקה הדומיניקנית"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "אקוודור"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "מצריים"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "אל-סלוודור"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "גיניאה המשוונית"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "אריטראה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "אסטוניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "צרפת"
+msgstr "ביטול"
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "גיבון"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "גמביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "גאורגיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "גרמניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "גאנה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "גראנאדה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "גואטמאלה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr "כללי"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "הונג-קונג"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "האיטי"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "הונדורס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "ישראל"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "איטליה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "ג'מאיקה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "יפן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "ירדן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "קזחסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "קניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "כווית"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "קירגיזיסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "לאוס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "לטביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "לבנון"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "ליבריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "ליכטנשטיין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lithuania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "לוקסמבורג"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "מקדוניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "מדגסקר"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "מלזיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "מאלי"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "מלטה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Marshall Islands"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "מאוריטניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "מאוריציוס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "מיקרונזיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "מולדובה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "מונקו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "מונגוליה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "מונטנגרו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "מרוקו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "מוזמביק"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "נמיביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "נפאל"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "הולנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "ניוזילנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "ניקרגואה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "ניגר"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "ניגריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "נורווגיה"
+msgstr "קדימה"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "עמאן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "פקיסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "בפאלאא"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "פלסטין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "פנמה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "פאפה ניו גיני"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "פרגוואי"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "פרו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "הפיליפינים"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "פולין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "פורטוגל"
+msgstr "פורט:"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "קטאר"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "רומניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "רוסיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "רואנדה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "סנט קיטס ונוויס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "סט. לושיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "סנט וינסנט והגרנדינים"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "סמואה"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "סן מרינו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "סאו טומה ופרינסיפה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "ערב הסעודית"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "סנגל"
+msgstr "כללי"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "סרביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "סיישל"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "סיירה לאונה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "סינגפור"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "סלובקיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "סלובניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "איי שלמה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "סומליה"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "דרום אפריקה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "ספרד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "סרי לנקה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "סודן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "סורינאם"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "סווזילנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "שוודיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "שוויצריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "סוריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "טג'יקיסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "טנזניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "תאילנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "טימור-Leste (מזרח טימור)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "טוגו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "טונגה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "טרינידד וטובגו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "טוניס"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "טורקיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "טורקמניסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "טובאלו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "אוגנדה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "אוקראינה"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "איחוד האמירויות הערביות"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "בריטניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "ארה\"ב"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "אורוגוואי"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "אוזבקיסטן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "ונואטו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "וותיקן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "וונצואלה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "וויאטנם"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "סהרה המערבית"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "תימן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "זמביה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "זימבבואה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "אלבניה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "אלג'יריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "אוסטריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "בחריין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "בנין"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "אתיופיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "פיג'י"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "פינלנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "יוון"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "גואם"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "הונגריה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "איסלנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "הודו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "אינדונזיה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "איראן"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "עיראק"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "אירלנד"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "צפון קוריאה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "דרום קוריאה"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "לוב"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "המלדיבים"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "מקסיקו"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "מיאנמאר"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "טאיוואן"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "שלח דו\"ח התרסקות"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia נתקל בשגיאה וחייב להסגר"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "אתחל את "
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "אל תאתחל"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "לא מסוגל לאתחל את Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "לא יכלנו לאתחל את Vidalia. אנא אתחל אותו ידנית."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
msgctxt "GeneralPage"
@@ -1324,7 +1329,7 @@ msgstr "בחר נתיב ל-Tor"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "בחר קובץ הרצה לפרוקסי"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
@@ -1332,43 +1337,43 @@ msgstr "חובה לציין את קובץ הרצת Tor שלך."
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "הפעל את Vidalia בהפעלת המחשב"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
msgstr "חפש"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "הפעל את Tor כאשר Vidalia מופעלת"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "תוכנת פרוקסי (אופציונאלי)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "הפעל פרוקסי כאשר Tor מופעל"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "ארוגמנטים לתוכנת פרוקסי:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "עדכוני תוכנה"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "חפש עבור עדכונים אוטומטית"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "חפש עכשיו"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1388,11 +1393,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "התקבלו:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "נשלחו:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1520,11 +1525,11 @@ msgstr "מסמכים שנמצאו"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "שגיאה בטעינת תוכן עזרה:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "פותח קישור חיצוני"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1532,40 +1537,36 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Vidalia יכולה לפתוח את הקישור שבחרת בדפדפן ברירת המחדל שלך. אם הדפדפן אינו "
-"מותאם לשימוש ב-Tor, הבקשה עשוייה להיות חשופה."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "האם ברצונך ש-Vidalia תפתח את הקישור בדפדפן?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "אין אפשרות לפתוח את הקישור"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia לא הצליחה לפתוח את הקישור בדפדפן. אתה עדיין יכול להעתיק את הכתובת אל"
-" הדפדפן בצורה ידנית."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "שגיאה בפתיחת קובץ העזרה:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "מידע אודות הרישיון"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "רישיון"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "תודות"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
@@ -1585,7 +1586,7 @@ msgstr "אזהרה"
msgctxt "LogEvent"
msgid "Error"
-msgstr "שגיאה"
+msgstr "שגיעה"
msgctxt "LogEvent"
msgid "Unknown"
@@ -1593,31 +1594,31 @@ msgstr "לא ידוע"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "דיבאג"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "מידע"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "שים לב"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "אזהרה"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "שגיאה"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "לא ידוע"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "הפעל את Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
@@ -1656,34 +1657,6 @@ 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"
@@ -1692,12 +1665,8 @@ msgid "View"
msgstr "תצוגה"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "עזרה אודות Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "שגיאה בעת פתיחת דפדפן"
+msgstr "שגיעה בעת פתיחת דפדפן"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
@@ -1705,99 +1674,99 @@ msgstr "Vidalia נכשל בהפעלת הדפדפן המוגדר"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "שגיאה בהפעלת לקוח מסרים מיידיים"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia לא היתה מסוגלת להפעיל את לקוח המסרים המיידיים המוגדר"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "שגיאה בהפעלת שרת הפרוקסי"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia לא היתה מסוגלת להפעיל את שרת הפרוקסי המוגדר"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "מתחבר לספריית הממסר"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "מקים חיבור ספריות מוצפן"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "מאתר את מצב הרשת"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "טוען את מצב הרשת"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "טוען אישורים אמינים"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "מבקש מידע על הממסר"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "טוען מידע על הממסר"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "מתחבר אל רשת Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "מקים מעגל שימוש ב-Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "מחובר לרשת Tor!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "מצב אתחול לא מזוהה"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "שונות"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "זהות אינה תואמת"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "בוצע"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "החיבור נדחה"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "החיבור התעכב"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "שגיאה בקריאה/כתיבה"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "אין נתיב אל השרת"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "משאבים לא מספקים"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "לא ידוע"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
@@ -1808,40 +1777,34 @@ msgid "Tor is shutting down"
msgstr "Tor בתהליך עצירה"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "עצור את Tor עכשיו"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "עצור את Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "מפעיל את התוכנה"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "מפעיל את Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "שגיאה בעת התחלת Tor"
+msgstr "שגיעה בעת התחלת Tor"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia לא הצליח להפעיל את Tor. אנא בדוק את ההגדרות וודא שהשם ומיקום קובץ "
-"הרצת Tor הינו נכון."
+msgstr "Vidalia לא הצליח להפעיל את Tor. אנא בדוק את ההגדרות וודא שהשם ומיקום קובץ הרצת Tor הינו נכון."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "מתחבר אל Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "שגיאה בחיבור"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
@@ -1849,19 +1812,19 @@ msgstr "מימסור מופעל"
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "שגיאה בכיבוי"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia לא היתה מסוגלת לעצור את Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "שגיאה בלתי צפוייה"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "מזדהה מול Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
@@ -1872,8 +1835,6 @@ msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"תוכנת Tor דורשת ש-Vidalia תשלח עוגיית אימות, אך Vidalia לא היתה מסוגלת למצוא"
-" כזאת."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1881,11 +1842,11 @@ msgstr "האם ברצונך לציין את המיקום של הקובץ 'contro
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "תיקיית מידע"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "עוגיית שליטה (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
@@ -1896,20 +1857,6 @@ msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Vidalia לא היתה מסוגלת להרשם למספר אירועים. תכונות מסויימות של Vidalia "
-"יושבתו."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "שגיאה בהזדהות"
-
-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"
@@ -1919,9 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר Tor על מנת "
-"להוריד את הגירסה האחרונה."
+msgstr "גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר Tor על מנת להוריד את הגירסה האחרונה."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1939,11 +1884,11 @@ msgstr "כשלון ביצירת זהות חדשה"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "כשלון ב-Port Forwarding"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia לא היתה מסוגלת להתקין אוטומטית port forwarding."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1954,104 +1899,29 @@ 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 "שנה את הגדרות 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."
+msgid "Password Reset Failed"
msgstr ""
-"Vidalia ניסתה לאתחל את סיסמת לוח הבקרה של Tor, אך לא היתה מסוגלת לאתחל את "
-"התוכנה. אנא וודא שאין עוד תהליכים פעילים של Tor."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr ""
-"גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר Tor על מנת "
-"להוריד את הגירסה האחרונה."
+msgstr "גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר Tor על מנת להוריד את הגירסה האחרונה."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "האם ברצונך לבדוק אם חבילות חדשות יותר זמינות להתקנה?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "חיבור מסוכן פוטנציאלית"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "Tor סגר אוטומטית את החיבור על מנת לשמור על האנונימיות שלך."
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2059,25 +1929,31 @@ msgstr "עידכון Tor זמין"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "התוכנה שבידך מעודכנת"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "אין חבילות תוכנה חדשות שזמינות למחשבך כרגע."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "ההתקנה נכשלה"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia לא הצליח להתקין את העידכונים."
+msgstr "Vidalia לא הצליח להתקין את שירות Tor."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "השגיאות הבאות אירעו:"
+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 ""
@@ -2085,20 +1961,30 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
-"כל מה שנשלח דרך חיבור זה יכול להיות והיה מועקב. אנא בדוק את קונפיגורציית "
-"התוכניות שלך והשתמש בפרוטוקולים מוצפנים, כגון SSL, אם מתאפשר."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "נכשל (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"הממדר שלך מכובה כעת.\n"
-"לחץ \"עצור\" על מנת לעצור אותו מיידית."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2110,9 +1996,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"אתה מריץ כעת ממסר. עצירת הממסר יפגע בתקשורת של קליינטים דרכך.\n"
-"\n"
-"האם ברצונך לעצור את הממסר בהדרגה, ולאפשר לקליינטים לאתר נתיב שונה?"
msgctxt "MainWindow"
msgid ""
@@ -2120,27 +2003,42 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia זיהה כי תוכנת Tor נעצרה באופן פתאומי.\n"
-"\n"
-"אנא בדוק את ארכיון ההודעות למידע נוסף."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(יתכן (Telnet"
+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 ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(כנראה לקוח אימייל)"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 "שגיאה בעת קביעת סינון"
+msgstr "שגעיה בעת קביעת סינון"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
@@ -2148,7 +2046,7 @@ msgstr "Vidalia לא הצליח להרשם ליומן האירועים של Tor.
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "שגיעה בעת פתיחת קובץ יומן"
+msgstr "שגיעה באת פתיחת קובץ יומן"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
@@ -2391,36 +2289,24 @@ msgid "Automatically save new log messages to a file"
msgstr "שמוראוטומטית הודעות חדשות לקובץ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "בסיסי"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "סטטוס Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "מתקדם"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "שמור תמיד הודעות יומן חדשות"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"הודעות המופיעות כאשר משהו\n"
-"השתבש מאוד ו-Tor לא יכול להמשיך."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"הודעות המופיעות כאשר משהו\n"
-"השתבש ב-Tor."
msgctxt "MessageLog"
msgid ""
@@ -2429,22 +2315,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"הודעות המופיעות לעיתים רחוקות\n"
-"במהלך פעילות רגילה של Tor\n"
-"ואינן נחשבות לתקלות, אך יתכן\n"
-"שיעניינו אותך."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "הודעות שמופיעות לעתים קרובות במהלך פעילות רגילה של Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "הודעות מגוונות המיועדות בעיקר למפתחים."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2452,17 +2334,10 @@ msgid ""
"\n"
"%2."
msgstr ""
-"לא יכול לכתוב את הקובץ %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "מפת רשת Tor"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "רענן"
+msgstr "עדכן"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
@@ -2542,7 +2417,7 @@ msgstr "קובץ לא נמצא"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "אין פרטים זמינים על החיבור הנבחר"
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
@@ -2550,16 +2425,32 @@ msgstr "לא ידוע"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "מסך מלא"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "הצג את מפת הרשת במסך מלא"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "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 "גשר לא תקין"
@@ -2576,9 +2467,7 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"עליך לציין כתובת IP או שם ומספר פורט על מנת להגדיר את Tor לשימוש בשרת "
-"פרוקסי."
+msgstr "עליך לציין כתובת IP או שם ומספר פורט על מנת להגדיר את Tor לשימוש בשרת פרוקסי."
msgctxt "NetworkPage"
msgid ""
@@ -2592,7 +2481,7 @@ msgstr "'%1' אינו מספר פורט חוקי."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "בודק אם הרשת המקומית זקוקה לפרוקסי על מנת לגשת לאינטרנט"
+msgstr ""
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2616,7 +2505,7 @@ msgstr "פורט:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr "ברצוני לגשת באמצעות פורט מסויים שמאושר על ידי חומת האש שלי"
+msgstr ""
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2638,7 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr "סמן כדי להצפין בקשות לספרייה ו(אפשרי) ולהשתמש בממסר כדי לגשת לרשת Tor"
+msgstr ""
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2646,7 +2535,7 @@ msgstr "ספק האינטרנט שלי חוסם חיבורים לרשת Tor"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "הגדרות גשר"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
@@ -2662,43 +2551,41 @@ msgstr "העתק את הגשרים הנבחרים ללוח-העריכה"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "חפש גשר עכשיו"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">איך עוד אני יכול למצוא גשרים?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">איך אני יכול למצוא גשרים?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"גשרים חדשים אינם זמינים כעת. אתה יכול לחכות ולנסות שוב, או לנסות דרך אחרת "
-"לאיתור גשרים חדשים."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "לחץ על \"עזרה\" לקבלת מידע נוסף על דרכים שונות למציאת גשרים חדשים."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "כתובת:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "סוג:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "אתה חייב לבחור את סוג הפרוקסי."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
@@ -2706,11 +2593,11 @@ msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2778,11 +2665,11 @@ msgstr "לא ידוע"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "פרטי חיבור"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "סיכום"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2822,7 +2709,7 @@ msgstr "עודכן לאחרונה:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "תיאור"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2846,7 +2733,7 @@ msgstr "קרב למימסר"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 ממסר מחובר"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2854,11 +2741,11 @@ msgstr "העתק"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "כינוי"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "טביעת אצבע"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
@@ -2868,8 +2755,7 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"הגדרת את Tor לשמש בגשר למשתמשים מצונזרים, אבל גירסת Tor שלך לא תומכת בגשרים."
+msgstr "הגדרת את Tor לשמש בגשר למשתמשים מצונזרים, אבל גירסת Tor שלך לא תומכת בגשרים."
msgctxt "ServerPage"
msgid ""
@@ -2887,11 +2773,7 @@ msgstr "עליך לציין לפחות כינוי ופורט מימסר."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "הפעל כלקוח בלבד"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "העבר מידע עבור רשת Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
@@ -2899,19 +2781,19 @@ msgstr "פורט מימסר:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Enable to mirror the relay directory"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "נסה להגדר אוטומטית "
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "ניסיון"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "הצג נושאי עזרה אודות port forwarding"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
@@ -2945,9 +2827,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"לחיבורי אינטרנט עם קצב הורדה מהיר אבל קצב העלאה איטי, אנא הכנס את קצב ההעלאה"
-" שלך כאן."
+msgstr "לחיבורי אינטרנט עם קצב הורדה מהיר אבל קצב העלאה איטי, אנא הכנס את קצב ההעלאה שלך כאן."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3005,9 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"רוחב הפס המירבי חייב להיות גדול או שווה לרוחב הפס הממוצע. על שני הערכים "
-"להיוצ לפחות 20 KB/s."
+msgstr "רוחב הפס המירבי חייב להיות גדול או שווה לרוחב הפס הממוצע. על שני הערכים להיוצ לפחות 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3039,9 +2917,7 @@ msgstr "שירותים נוספים"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"פורטים 706, 1863, 5050, 5190, 5222, 8300 ו 8888 {706, 1863, 5050, 5190, "
-"5222, 5223, 8300 ?}"
+msgstr "פורטים 706, 1863, 5050, 5190, 5222, 8300 ו 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3070,14 +2946,13 @@ msgstr "הצג עזרה בנוגע למדיניות יציאה"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr "לאיזה תכנים באינטרנט משתמשים יוכלו לגשת דרך הממסר שלך?"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Tor עדיין יחסום יציאה של דוא\"ל ושיתוף קבצים על מנת למנוע ספאם ופשיעה אחרת."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3098,18 +2973,17 @@ msgstr "העתק את הזהות של הגשר שלך ללוח-העריכה"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "אין שימוש לאחרונה"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "אין משתמשים שנעזרו בממסר שלך לאחרונה."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"השאר את הממסר שלך פועל, כך שמשתמשים יוכלו למצוא ולהשתמש בו ביותר קלות."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3124,11 +2998,10 @@ msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor החזיר תשובה שאינה מאורגנת כאשר Vidalia ביקשה את היסטורית השימוש בגשר."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "התשובה המחוזרת היתה: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
@@ -3136,111 +3009,111 @@ msgstr "עזור למשתמשים מצונזרים לגשת לרשת Tor (גרס
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"bridges.finding\">מי השתמש בגשר שלי?</a>"
+msgstr "<a href=\"bridges.finding\">כיצד אני מוצא גשר?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">מה זה?</a>"
+msgstr ""
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 ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "השתמש במראה עבור תיקיית הממסר"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"כתובת דוא\"ל בה אתה זמין למקרה בו יהיה צורך ליצור איתך קשר לגבי הממסר. אתה "
-"יכול גם להכליל את טביעת האצבע של מפתח PGP או GPG שלך."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "שגיאה במהלך ביטול הפרסום של כל השירותים"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"אנא הגדר לפחות תיקיית שירות ופורט ווירטואלי עבור כל שירות שאתה מעוניין "
-"שישמר. מחק את האחרים."
msgctxt "ServicePage"
msgid "Error"
-msgstr "שגיאה"
+msgstr "שגיעה"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "אנא בחר שירות."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "בחר תיקיית שירות"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "פורט ווירטואלי יכול להכיל רק מספרי פורט תקינים [1..65535]"
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "יעד יכול להכיל address:port, address או port בלבד."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "התיקייה כבר נמצאת בשימוש על ידי שירות אחר."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "טופס"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "שירותים מסופקים מוסתרים"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "כתובת בצל"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "פורט ווירטואלי"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "יעד"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "נתיב לתיקייה"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "מופעל"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "הוסף שירות חדש לרשימה"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "הסר את השירות הנבחר מהרשימה"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "העתק כתובת בצל של השירות הנבחר אל לוח הגזירים"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "חפש במערכת הקבצים המקומית ובחר תיקייה עבור השירות הנבחר"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "נוצר על ידי Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
@@ -3248,15 +3121,15 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor רץ כעת"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "אתה מריץ את גרסאת \"%1\" של Tor כעת."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "\"tor\" לא רץ כעת"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3283,11 +3156,11 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Tor פג תוקף"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "התחבר אל רשת Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3297,7 +3170,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "שגיאת תוכנה "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3323,7 +3196,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "השעה של המחשב שלך עלולה להיות שגיאה"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3342,7 +3215,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "חיבור העלול להיות מסוכן!."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3354,7 +3227,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "SOCKS Protocol לא ידועים"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3387,7 +3260,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "נמצא DNS Hijacking"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3487,6 +3360,22 @@ 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 "חדש"
@@ -3523,6 +3412,12 @@ 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)"
@@ -3541,7 +3436,7 @@ msgstr "ערבול סיסמת שליטה נכשל."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "ערוך torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
@@ -3551,15 +3446,15 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "גזור"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "העתק"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "הדבק"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
@@ -3571,107 +3466,131 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "בחר הכל"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "החל הכל"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "החל על הנבחרים בלבד"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "שגיאת חיבור אל Tor"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "אין בחירות. אנא בחר טקסט מסוים, או שבחר ב\"החל הכל\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "שגיאה בשורה %1:\"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "שגיאה"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "שגיאה מסויימת התרחשה בעת פתיחת קובץ torrc"
+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 "הצלחה"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "לא נמצא UPnP-enabled devices"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "לא נמצא חיבור אינטרנט שתומך ב-UPnP"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup נכשל"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "נכשל בהוספה של port mapping"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "נכשל בהשגת port mapping"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "נכשל בהסרת port mapping"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "שגיאה לא ידועה"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "מחפש UPnP-enabled devices"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "מעדכן תיקיות port mapping"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "מעדכן port mapping של הממסר"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "הבדיקה הושלמה בהצלחה!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "בודק תמיכה ב-UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "בודק תמיכת Plug & Play אוניברסאלית."
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr "Vidalia לא היתה מסוגלת לחפש עדכוני תוכנה כיוון שלא נמצא '%1'."
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr "Vidalia לא היתה מסוגלת לחפש עדכוני תוכנה כיוון ש-Tor נסגר בפתאומיות."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "מחפש עדכונים זמינים..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3679,15 +3598,15 @@ msgstr "הסתר"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "מוריד עדכונים..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "מתקין עדכונים..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "סיום! התוכנה שלך מעודכנת."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3695,11 +3614,11 @@ msgstr "אישור"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "עדכוני תוכנה"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "מחפש עדכונים..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3711,23 +3630,31 @@ msgstr "עידכון Tor זמין"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "הזכר לי אחר כך"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "התקן"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "חבילות התוכנה הבאות מוכנות להתקנה:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "חבילה"
+msgstr "Backspace"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "גרסה"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
@@ -3822,20 +3749,16 @@ msgid "Unable to open log file '%1': %2"
msgstr "כשלון בפתחיחת קובץ יומן '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "קוד שפה לא תקין:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "סגנון ממשק לא תקין:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "רמת ארכיון שגוייה צויינה:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3843,13 +3766,10 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"תהליך אחר של Vidalia פעיל. אם אין תהליך פעיל אחר של Vidalia,אתה יכול לבחור להמשיך בכל מקרה.\n"
-"\n"
-"האם ברצונך להמשיך להפעיל את Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 שניות"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -3869,14 +3789,12 @@ msgstr "%1 GB/s"
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 ימים"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 שעות"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 דקות"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/hi/vidalia_hi.po b/src/vidalia/i18n/po/hi/vidalia_hi.po
index 69a19f6..dae7296 100644
--- a/src/vidalia/i18n/po/hi/vidalia_hi.po
+++ b/src/vidalia/i18n/po/hi/vidalia_hi.po
@@ -1,11 +1,12 @@
#
+# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+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,10 +233,6 @@ msgid "Show Settings"
msgstr "अनुकुलन दिखाओ"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "टोर बैंडविड्थ का उपयोग "
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "पुनःस्थाप"
@@ -275,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "रद्द "
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,17 +429,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1334,10 +1344,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1365,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1647,34 +1657,6 @@ 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 ""
@@ -1683,10 +1665,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1799,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1885,18 +1859,6 @@ 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 ""
@@ -1937,138 +1899,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Would you like to check if a newer package is available for installation?"
+"Anything 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 "Potentially Unsafe Connection"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2076,31 +2015,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2356,19 +2289,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2411,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2514,6 +2435,22 @@ 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 ""
@@ -2839,10 +2776,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3087,6 +3020,14 @@ 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 ""
@@ -3131,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3423,6 +3360,22 @@ 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 "नया"
@@ -3459,6 +3412,12 @@ 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 ""
@@ -3537,6 +3496,30 @@ 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 ""
@@ -3815,5 +3798,3 @@ 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 d8a7f23..7fb3b9f 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 32e3898..d42081d 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/hu/qt_hu.po b/src/vidalia/i18n/po/hu/qt_hu.po
index 24dbe22..83f5171 100644
--- a/src/vidalia/i18n/po/hu/qt_hu.po
+++ b/src/vidalia/i18n/po/hu/qt_hu.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
-# <viktor.varga at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-07-17 21:47+0000\n"
-"Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +17,7 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "Aktiválás"
+msgstr "Aktíválás"
#: qmessagebox.h:319
msgctxt "QApplication"
@@ -40,7 +37,7 @@ msgstr "QT_LAYOUT_DIRECTION"
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "Aktiválja a program fő ablakát"
+msgstr "Aktíválja a progam fõ ablakát"
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
@@ -203,8 +200,6 @@ msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
msgstr ""
-"%1 már létezik.\n"
-"Szeretné felülírni?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -213,9 +208,6 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
-"Fájl nem található.\n"
-"Kérjük ellenőrizze, hogy helyes fájlnevet adott-e meg."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -274,9 +266,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"Könyvtár nem található.\n"
-"Kérjük ellenőrizze, hogy helyes könyvtárnevet adott-e meg."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -284,8 +273,6 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' írásvédett.\n"
-"Biztos hogy ennek ellenére törölni akarja?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -335,7 +322,7 @@ msgstr "Mutasd"
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Előre"
+msgstr "Elõre"
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
@@ -445,5 +432,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bájt"
-
-
diff --git a/src/vidalia/i18n/po/hu/vidalia_hu.po b/src/vidalia/i18n/po/hu/vidalia_hu.po
index 1405efc..1493527 100644
--- a/src/vidalia/i18n/po/hu/vidalia_hu.po
+++ b/src/vidalia/i18n/po/hu/vidalia_hu.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-15 12:37+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -170,17 +170,13 @@ msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"A megadott Tor konfigurációs fájl helye olyan karakteret tartalmaz, amely "
-"nem értelmezhető a rendszer aktuális 8-bites karakter kódolásával."
+msgstr "A megadott Tor konfigurációs fájl helye olyan karakteret tartalmaz, amely nem értelmezhető a rendszer aktuális 8-bites karakter kódolásával."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"A megadott Tor adatkönyvtár neve olyan karakteret tartalmaz, amely nem "
-"értelmezhető a rendszer aktuális 8-bites karakter kódolásával."
+msgstr "A megadott Tor adatkönyvtár neve olyan karakteret tartalmaz, amely nem értelmezhető a rendszer aktuális 8-bites karakter kódolásával."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -199,18 +195,11 @@ msgid "Select a file to use for Tor socket path"
msgstr "Válasszon ki egy fájlt a Tor socket útvonalhoz"
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Vezérlőport automatikus konfigurálása"
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia nem tudta eltávolítani a Tor szolgáltatást.\n"
-"\n"
-"Kézzel kell majd eltávolítania."
+msgstr "Vidalia nem tudta eltávolítani a Tor szolgáltatást.\n\nKézzel kell majd eltávolítania."
msgctxt "AppearancePage"
msgid "Language"
@@ -245,12 +234,8 @@ 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 "Alapállapot"
+msgstr "Visszaállítás"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
@@ -288,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Mégse"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Sávszélesség grafikon"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "HTTPS hídkérés indítása..."
@@ -441,20 +430,27 @@ msgid "Control socket is not connected."
msgstr "A Vezérlõ szál (socket) nem kapcsolódott."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Jelszó szükséges"
+msgid "Problem connecting to Tor"
+msgstr "Probléma a Tor-hoz csatlakozás közben"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Emlékezzen a jelszavamra"
+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 "A Tor már fut, de a Vidalia nem tud kapcsolódni hozzá.\n\nEz akkor fordulhat elő, ha valami más (mint például egy másik Vidalia folyamat, vagy egy Vidalia folyamat ami összeomlott) elindította a Tor-t."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"A Vidalia olyan Tor folyamathoz kapcsolódott, amely jelszót kér. Kérjük adja"
-" meg a vezérlő jelszót:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Le kell állítania a Tor folyamatot, mielőtt a Vidalia el tudna indítani egy újat."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "A Vidalia megpróbálhatja újraindítani a Tor-t. Ez le fogja csukni az aktuálisan aktív kapcsolatokat a Tor folyamaton keresztül."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1277,6 +1273,24 @@ msgid "Vidalia encountered an error and needed to close"
msgstr "A Vidalia hibát észlelt és bezárása szükséges"
msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Egy összeomlási jelentés készült, amit automatikusan el tud küldeni a Vidalia fejlesztői részére, hogy azonosíthassák, és javíthassák a problémát. Az elküldött jelentés nem tartalmaz személyes azonosításra alkalmas információt, de a csatlakozás a bejelentő szerverhez lehet, hogy nem lesz névtelen."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Kérjük írja le, hogy mit csinált, mielőtt az alkalmazás összeomlott (opcionális):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Az összeomlási jelentés elküldése a Vidalia fejlesztői felé"
+
+msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
msgstr "A Vidalia újraindítása"
@@ -1292,39 +1306,19 @@ msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Nem sikerült automatikusan újraindítani a Vidalia-t. Kérjük indítsa el "
-"kézzel."
+msgstr "Nem sikerült automatikusan újraindítani a Vidalia-t. Kérjük indítsa el kézzel."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Kérjük töltsön ki egy jegyet:"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Kapcsolódás..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Egy összeomlási jelentés jött létre, amit elküldhet a Vidalia fejlesztőinek,"
-" hogy segítse a hiba megkeresését és javítását. Az elküldött hibajelentés "
-"személyazonosításra alkalmas adatot nem tartalmaz."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Összeomlási jelentés küldése..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"egy leírással, hogy mit csinált mielőtt az alkalmazás összeomlott, és az "
-"alábbi fájlokkal, amelyek az összeomlási jelentéshez kapcsolódnak:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Válasz fogadása..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1340,7 +1334,7 @@ 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"
@@ -1351,10 +1345,6 @@ msgid "Browse"
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"
@@ -1382,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Ellenőrzés most"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Automatikus kapcsolódás a Tor-hoz "
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1543,16 +1537,11 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészőben."
-" Ha a böngésző nincs jelenleg a Tor használatára beállítva, a kapcsolat nem "
-"lesz anonim."
+msgstr "A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészőben. Ha a böngésző nincs jelenleg a Tor használatára beállítva, a kapcsolat nem lesz anonim."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-"Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett "
-"böngészőben?"
+msgstr "Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett böngészőben?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
@@ -1562,10 +1551,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészőben. "
-"Próbálja meg másolni és beilleszteni a a hivatkozást és <b>Beilleszt</b>eni "
-"a böngészõ URL sávjába."
+msgstr "A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészőben. Próbálja meg másolni és beilleszteni a a hivatkozást és <b>Beilleszt</b>eni a böngészõ URL sávjába."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1672,34 +1658,6 @@ 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 "Ctrl+I"
-msgstr "CTRL+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "CTRL+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1708,10 +1666,6 @@ 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"
@@ -1824,10 +1778,6 @@ msgid "Tor is shutting down"
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"
@@ -1847,9 +1797,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"A Vidalia nem tudta elindítani a Tor-t. Ellenőrizze a beállításait, hogy jól"
-" van-e megadva a Tor indítófájl neve és elérési útja."
+msgstr "A Vidalia nem tudta elindítani a Tor-t. Ellenőrizze a beállításait, hogy jól van-e megadva a Tor indítófájl neve és elérési útja."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1887,9 +1835,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"A Tor a Vidalia-tól egy bejelentkező süti elküldését kéri, de a Vidalia nem "
-"találja."
+msgstr "A Tor a Vidalia-tól egy bejelentkező süti elküldését kéri, de a Vidalia nem találja."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1911,21 +1857,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Nem sikerült a Vidalia-t kifogástalanul elindítani, ezért bizonyos funkciói "
-"várhatóan nem fognak rendeltetésszerűen működni."
-
-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."
+msgstr "Nem sikerült a Vidaliát néhány eseményhez hozzá rendelni. Várhatóan sok Vidalia szolgáltatás ezért nem lesz elérhető."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1935,9 +1867,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"A Tor jelenleg telepített régi vagy már nem ajánlott. Látogasson el a Tor "
-"weboldalára a legfrissebb verzióért."
+msgstr "A Tor jelenleg telepített régi vagy már nem ajánlott. Látogasson el a Tor weboldalára a legfrissebb verzióért."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1947,8 +1877,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Minden későbbi kapcsolat a régi kapcsolataitól különbözőként fog szerepelni."
+msgstr "Minden későbbi kapcsolat a régi kapcsolataitól különbözőként fog szerepelni."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1960,8 +1889,7 @@ msgstr "Port továbbítás sikertelen"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"A Vidalia-nak nem sikerült beállítania az automatikus port továbbítást."
+msgstr "A Vidalia-nak nem sikerült beállítania az automatikus port továbbítást."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1972,82 +1900,8 @@ msgid "Status"
msgstr "Állapot"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Parancsikonok"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Elosztás beállítása"
-
-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 működé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ó 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."
+msgstr "A jelszó alaphelyzetbe állítása nem sikerült"
msgctxt "MainWindow"
msgid ""
@@ -2068,8 +1922,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"A Tor automatikusan lezárta a kapcsolatot az anonimitása védelme érdekében."
+msgstr "A Tor automatikusan lezárta a kapcsolatot az anonimitása védelme érdekében."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2083,7 +1936,7 @@ msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "Jelenleg nincs új Tor szoftvercsomag az ön számítógépéhez."
+msgstr "Jelenleg nincs új tor szoftvercsomag az ön számítógépéhez."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2099,25 +1952,40 @@ msgstr "Az alábbi hiba történt:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Az alkalmazásai egyike %1a titkosítatlan és nem biztonságos kapcsolatot próbál létrehozni a %2 porton keresztül."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Bármi ami ezen a kapcsolaton keresztül megy ki nyomon követhető. Ellenőrizze"
-" az alkalmazás beállításait, és csak titkosított kapcsolatot használjon, "
-"például SSL-t ha lehetséges."
+msgstr "Bármi ami ezen a kapcsolaton keresztül megy ki nyomon követhető. Ellenőrizze az alkalmazás beállításait, és csak titkosított kapcsolatot használjon, például SSL-t ha lehetséges."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "sikertelen (%1)"
+msgid "toolBar"
+msgstr "eszköztár"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Az Elosztó leáll.\n"
-"Kattintson újra 'Stop'-ra az azonnali leállításhoz."
+msgid "Start"
+msgstr "Indítás"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Leállítás"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Újraindítás"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "A Tor konfiguráció újratöltése"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Események"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2128,36 +1996,46 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Jelenleg Elosztót futtat. Az Elosztó leállítása megszakítja a többi használó kapcsolatát.\n"
-"\n"
-"Szeretné szépen leállítani, és ezzel időt adni a többi használónak, hogy új elosztót találjanak??"
+msgstr "Jelenleg Elosztót futtat. Az Elosztó leállítása megszakítja a többi használó kapcsolatát.\n\nSzeretné szépen leállítani, és ezzel időt adni a többi használónak, hogy új elosztót találjanak??"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"A Vidalia a Tor szoftver váratlan kilépését észlelte..\n"
-"\n"
-"Kérjük tekintse meg a log üzeneteket az aktuális hibaüzenetekért."
+msgstr "A Vidalia a Tor szoftver váratlan kilépését észlelte..\n\nKérjük tekintse meg a log üzeneteket az aktuális hibaüzenetekért."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(valószínűleg Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "A Vidalia megpróbálta újraindítani a Tor-t, de nem sikerült neki. Kérjük ellenőrizze a Feladatkezelőben, hogy nem fut más Tor folyamat."
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "sikertelen (%1)"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(valószínűleg egy email kliens)"
+msgid ", probably Telnet,"
+msgstr ", valószínűleg Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", valószínüleg egy levelező kliens,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Az alkalmazásai egyike %1 úgy tűnik, hogy egy pontenciálisan titkosítatlan "
-"és nem biztonságos kapcsolatot próbál létrehozni a a %2 porton keresztül."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Az Elosztója leállítás alatt.\nKattintson a 'Leállítás'-ra az azonnali leállításhoz."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Hiba a konfiguráció betöltése közben"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "A Vidalia nem tudta újratölteni a Tor konfigurációját."
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2412,35 +2290,24 @@ msgid "Automatically save new log messages to a file"
msgstr "Mindig mentse automatikusan az új üzeneteket"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Alap"
-
-msgctxt "MessageLog"
-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 "toolbar"
+msgstr "eszköztár"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Üzenetek, amik akkor jelentek meg, amikor valami nagyon nem volt jó, és a "
-"Tor nem tudott működni."
+msgstr "Üzenetek, amik akkor jelentek meg, amikor valami nagyon nem volt jó, és a Tor nem tudott működni."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Üzenetek, amik akkor jelentek meg, amikor valamivel gond volt a Tor-ra."
+msgstr "Üzenetek, amik akkor jelentek meg, amikor valamivel gond volt a Tor-ra."
msgctxt "MessageLog"
msgid ""
@@ -2448,9 +2315,7 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Üzenetek, amik néha-néha megjelennek normális Tor használatnál, és nem "
-"hibák, de talán érdemes odafigyelni rájuk."
+msgstr "Üzenetek, amik néha-néha megjelennek normális Tor használatnál, és nem hibák, de talán érdemes odafigyelni rájuk."
msgctxt "MessageLog"
msgid ""
@@ -2469,14 +2334,7 @@ msgid ""
"Cannot write file %1\n"
"\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"
+msgstr "Nem írható az állomány: %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2578,6 +2436,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Hálózati térkép"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Elosztó"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Kapcsolat"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Állapot"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Érvénytelen Hídkapcsolat"
@@ -2594,17 +2468,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Meg kell adnia egy IP címet, vagy egy gépnevet (host) és egy portot , ahhoz,"
-" hogy a Tor ezen a proxy-n keresztül kapcsolódjon az Internethez."
+msgstr "Meg kell adnia egy IP címet, vagy egy gépnevet (host) és egy portot , ahhoz, hogy a Tor ezen a proxy-n keresztül kapcsolódjon az Internethez."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) "
-"vannak a tűzfalon."
+msgstr "Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) vannak a tűzfalon."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2612,13 +2482,11 @@ msgstr "A következő port érvénytelen: '%1'"
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez való "
-"kapcsolódáshoz"
+msgstr "Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez való kapcsolódáshoz"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Proxy-t használok az Internethez kapcsolódáshoz"
+msgstr "Proxy-t használok az Internetre való kapcsolódáshoz"
msgctxt "NetworkPage"
msgid "Proxy Settings"
@@ -2638,9 +2506,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tűzfalam nyitott "
-"portjaira vannak konfigurálva"
+msgstr "Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tűzfalam nyitott portjaira vannak konfigurálva"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2662,9 +2528,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Címtár lekérdezések titkosítása és opcionálisan, Hídkapcsolatok használata a"
-" TOR-hoz való kapcsolódáshoz"
+msgstr "Címtár lekérdezések titkosítása és opcionálisan, Hídkapcsolatok használata a TOR-hoz való kapcsolódáshoz"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2702,15 +2566,11 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Nincs új hídkapcsolat elérhető. Várhat egy kicsit és megpróbálhatja később, "
-"vagy kereshet egy másik megoldást a hídkapcsolatok keresésére."
+msgstr "Nincs új hídkapcsolat elérhető. Várhat egy kicsit és megpróbálhatja később, vagy kereshet egy másik megoldást a hídkapcsolatok keresésére."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Kattintson a Súgó-ra, hogy megtudja, milyen lehetőségek vannak még a "
-"hídkapcsolatok keresésére."
+msgstr "Kattintson a Súgó-ra, hogy megtudja, milyen lehetőségek vannak még a hídkapcsolatok keresésére."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2896,18 +2756,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Beállította a Tor-t Hídkapcsolati Elosztóként, a korlátozott felhasználók "
-"Tor-hoz kapcsolódásának segítéséhez, viszont ez a Tor verzió nem támogatja a"
-" Hídkapcsolati Elosztást."
+msgstr "Beállította a Tor-t Hídkapcsolati Elosztóként, a korlátozott felhasználók Tor-hoz kapcsolódásának segítéséhez, viszont ez a Tor verzió nem támogatja a Hídkapcsolati Elosztást."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Frissítse a Tor-t vagy állítsa be hagyományos Tor Elosztóként "
-"(közvetítőként)."
+msgstr "Frissítse a Tor-t vagy állítsa be hagyományos Tor Elosztóként (közvetítőként)."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2922,10 +2777,6 @@ msgid "Run as a client only"
msgstr "Csak kliens indítása"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "A Tor hálózat forgalmának közvetítése (Elosztás)"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Közvetítő port:"
@@ -2963,9 +2814,7 @@ msgstr "Az Elosztó neve"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"A port, amelyen más felhasználók és Elosztók kommunikálhatnak az Ön "
-"Elosztójával"
+msgstr "A port, amelyen más felhasználók és Elosztók kommunikálhatnak az Ön Elosztójával"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2979,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Gyors letöltés, de lassú feltöltés esetén adja meg a feltöltési sebességét "
-"itt."
+msgstr "Gyors letöltés, de lassú feltöltés esetén adja meg a feltöltési sebességét itt."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3039,9 +2886,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"A maximum sávszélességnek nagyobbnak kell lennie, mint az átlagosnak, de "
-"mindkét érték minimum 20 KB/s kell legyen."
+msgstr "A maximum Internetsebességnek nagyobbnak kell lennie, mint az átlagosnak, de mindkét érték minimum 20 KB/s lehet."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3102,17 +2947,13 @@ msgstr "Kilépési szabályokkal kapcsolatos súgó témák megjelenítése"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak az Elosztón"
-" keresztül?"
+msgstr "Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak az Elosztón keresztül?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"A Tor továbbra is blokkolni fog néhány levelező és fájlmegosztó "
-"szolgáltatást, a spam és visszaélések megfékezése érdekében."
+msgstr "A Tor továbbra is blokkolni fog néhány levelező és fájlmegosztó szolgáltatást, a spam és visszaélések megfékezése érdekében."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3120,9 +2961,7 @@ msgstr "Kilépési szabályok"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a "
-"Hídkapcsolatával a Tor hálózathoz:"
+msgstr "Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a Hídkapcsolatával a Tor hálózathoz:"
msgctxt "ServerPage"
msgid ""
@@ -3145,9 +2984,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Hagyja futni az Elosztót, így a felhasználóknak jobb esélye van észlelni és "
-"használni azt."
+msgstr "Hagyja futni az Elosztót, így a felhasználóknak jobb esélye van észlelni és használni azt."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3161,9 +2998,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"A Tor szoftver egy rosszul formázott üzenetet adott vissza, mikor a Vidalia "
-"elkérte tőle a Hídkapcsolat használat előzményeit."
+msgstr "A Tor szoftver egy rosszul formázott üzenetet adott vissza, mikor a Vidalia elkérte tőle a Hídkapcsolat használat előzményeit."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3171,8 +3006,7 @@ msgstr "A visszaadott válasz: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
-"A korlátozott felhasználók segítése a Tor hálózathoz való kapcsolódáshoz"
+msgstr "A korlátozott felhasználók segítése a Tor hálózathoz való kapcsolódáshoz"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3184,7 +3018,15 @@ msgstr "<a href=\"#bridgeHelp\">Mi ez?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "A Hídkapcsolati címem automatikus terjesztése"
+msgstr "A híd címem automatikus terjesztése"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Elosztó forgalom a Tor hálózaton belül (nem-Kilépő Elosztó)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Elosztó forgalom a Tor hálózathoz (Kilépő Elosztó)"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
@@ -3194,9 +3036,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Email cím amin elérhető, ha probléma van az Ön elosztójával. Megadhatja "
-"mellé a PGP vagy GPG ujjlenyomatát is."
+msgstr "Email cím amin elérhető, ha probléma van az Ön elosztójával. Megadhatja mellé a PGP vagy GPG ujjlenyomatát is."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3206,9 +3046,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Adjon meg minimum egy szolgáltatás könyvtárat és egy portot minden "
-"elmentendő szolgáltatáshoz, a többit pedig törölje."
+msgstr "Adjon meg minimum egy szolgáltatás könyvtárat és egy portot minden elmentendő szolgáltatáshoz, a többit pedig törölje."
msgctxt "ServicePage"
msgid "Error"
@@ -3228,19 +3066,13 @@ msgstr "A Virtuális port csak érvényes (1..65535) számokat tartalmazhat"
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"A cél cím a következő formátumú lehet: cím:port vagy csak cím, vagy csak "
-"port."
+msgstr "A cél cím a következő formátumú lehet: cím:port vagy csak cím, vagy csak port."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
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 "Biztosított rejtett szolgáltatások"
@@ -3305,10 +3137,7 @@ msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Kattintson a \"Tor indítása\" gombra a Vidalia Vezérlőpultban a Tor szoftver"
-" elindításához. Ha a Tor váratlanul lépett ki, akkor válassza a Speciális "
-"fület a megjelent hibák részleteinek megismeréséhez."
+msgstr "Kattintson a \"Tor indítása\" gombra a Vidalia Vezérlőpultban a Tor szoftver elindításához. Ha a Tor váratlanul lépett ki, akkor válassza a Speciális fület a megjelent hibák részleteinek megismeréséhez."
msgctxt "StatusEventWidget"
msgid ""
@@ -3316,10 +3145,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"Jelenleg a Tor szoftver %1 verzióját használja, ami tovább már nem ajánlott."
-" Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és"
-" teljesítmény javításokat tartalmaz."
+msgstr "Jelenleg a Tor szoftver %1 verzióját használja, ami tovább már nem ajánlott. Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
msgctxt "StatusEventWidget"
msgid ""
@@ -3327,10 +3153,7 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"Jelenleg a Tor szoftver %1 verzióját használja, ami már nem működik az "
-"aktuális Tor hálózattal. Kérjük frissítse a legújabb verzióra, ami fontos "
-"biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
+msgstr "Jelenleg a Tor szoftver %1 verzióját használja, ami már nem működik az aktuális Tor hálózattal. Kérjük frissítse a legújabb verzióra, ami fontos biztonsági, stabilitási és teljesítmény javításokat tartalmaz."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
@@ -3344,9 +3167,7 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Sikeresen csatlakoztunk a Tor hálózathoz. Most már csak az alkalmazásait "
-"kell beállítania, hogy névtelenül érje el az Internetet."
+msgstr "Sikeresen csatlakoztunk a Tor hálózathoz. Most már csak az alkalmazásait kell beállítania, hogy névtelenül érje el az Internetet."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
@@ -3356,9 +3177,7 @@ msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"A Tor szoftver belső hibára futott. Kérjük jelezze az alább hibaüzenetet a "
-"Tor fejlesztőinek a bugs.torproject.org oldalon: \"%1\"\n"
+msgstr "A Tor szoftver belső hibára futott. Kérjük jelezze az alább hibaüzenetet a Tor fejlesztőinek a bugs.torproject.org oldalon: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3366,10 +3185,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel vissza van "
-"állítva a \"%2\" időforráshoz képes. Ha az órája nem pontos, a Tor nem fog "
-"megfelelően működni. Ellenőrizze, hogy a számítógép a helyes időt mutatja."
+msgstr "A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel vissza van állítva a \"%2\" időforráshoz képes. Ha az órája nem pontos, a Tor nem fog megfelelően működni. Ellenőrizze, hogy a számítógép a helyes időt mutatja."
msgctxt "StatusEventWidget"
msgid ""
@@ -3377,10 +3193,7 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel előre van "
-"állítva a \"%2\" időforráshoz képes. Ha az órája nem pontos, a Tor nem fog "
-"megfelelően működni. Ellenőrizze, hogy a számítógép a helyes időt mutatja."
+msgstr "A Tor úgy észlelte, hogy a számítógép órája %1 másodperccel előre van állítva a \"%2\" időforráshoz képes. Ha az órája nem pontos, a Tor nem fog megfelelően működni. Ellenőrizze, hogy a számítógép a helyes időt mutatja."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3392,21 +3205,14 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát "
-"létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ "
-"keresztül küldése a Tor hálózaton veszélyes és nem ajánlott. A biztonsága "
-"érdekében a Tor lezárta ezt a kapcsolatot."
+msgstr "Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ keresztül küldése a Tor hálózaton veszélyes és nem ajánlott. A biztonsága érdekében a Tor lezárta ezt a kapcsolatot."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát "
-"létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ "
-"keresztül küldése a Tor hálózaton veszélyes és nem ajánlott."
+msgstr "Az alkalmazásainak valamelyike megpróbált egy titkosítatlan csatornát létesíteni a Tor-on keresztül a %1 porton. titkosítatlan információ keresztül küldése a Tor hálózaton veszélyes és nem ajánlott."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3418,11 +3224,7 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on a %1 "
-"irányba egy olyan protokollon keresztül, ami információt szivárogtathat az "
-"ön elérhetőségéről. Ellenőrizze, hogy az alkalmazása beállítása csak SOCKS4a"
-" vagy SOCKS5 protokollt használjon a távoli név feloldáshoz."
+msgstr "Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on a %1 irányba egy olyan protokollon keresztül, ami információt szivárogtathat az ön elérhetőségéről. Ellenőrizze, hogy az alkalmazása beállítása csak SOCKS4a vagy SOCKS5 protokollt használjon a távoli név feloldáshoz."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
@@ -3433,11 +3235,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on egy "
-"olyan protokollon keresztül, amit a Tor nem tud értelmezni. Ellenőrizze, "
-"hogy az alkalmazása beállítása csak SOCKS4a vagy SOCKS5 protokollt "
-"használjon a távoli név feloldáshoz."
+msgstr "Az alkalmazásainak valamelyike létrehozott egy kapcsolatot a Tor-on egy olyan protokollon keresztül, amit a Tor nem tud értelmezni. Ellenőrizze, hogy az alkalmazása beállítása csak SOCKS4a vagy SOCKS5 protokollt használjon a távoli név feloldáshoz."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
@@ -3448,10 +3246,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Az alkalmazásainak valamelyike megpróbált létrehozni egy egy kapcsolatot a "
-"Tor-on keresztül a \"%1\" címre, amit a Tor nem ismer fel érvényes host "
-"névnek. Kérjük ellenőrizze az alkalmazás beállítását."
+msgstr "Az alkalmazásainak valamelyike megpróbált létrehozni egy egy kapcsolatot a Tor-on keresztül a \"%1\" címre, amit a Tor nem ismer fel érvényes host névnek. Kérjük ellenőrizze az alkalmazás beállítását."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
@@ -3462,10 +3257,7 @@ msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"A Tor azt észleltem hogy az Elosztó publikus IP címe jelenleg %1%2. Ha ez "
-"helytelen, akkor gondolkozzon el a 'Cím' beállítás használatáról az Elosztó "
-"beállításai között."
+msgstr "A Tor azt észleltem hogy az Elosztó publikus IP címe jelenleg %1%2. Ha ez helytelen, akkor gondolkozzon el a 'Cím' beállítás használatáról az Elosztó beállításai között."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
@@ -3476,21 +3268,14 @@ msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"A Tor azt észlelte hogy a DNS szolgáltatója nem létező domainekre hamis "
-"válaszokat ad. Néhány internet szolgáltató vagy DNS szolgáltató, mint "
-"például az OpenDNS ismert arról, hogy ilyet tesz a saját reklám vagy kereső "
-"oldalaik megjelenítése érdekében."
+msgstr "A Tor azt észlelte hogy a DNS szolgáltatója nem létező domainekre hamis válaszokat ad. Néhány internet szolgáltató vagy DNS szolgáltató, mint például az OpenDNS ismert arról, hogy ilyet tesz a saját reklám vagy kereső oldalaik megjelenítése érdekében."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"A Tor azt észlelte hogy a DNS szolgáltatója hamis válaszokat ad jól ismert "
-"domainekre. Mivel a kliensek függnek a a pontos Tor Elosztó DNS válaszoktól,"
-" így az Elosztója nem lehet lesz Kilépő Elosztónak beállítva."
+msgstr "A Tor azt észlelte hogy a DNS szolgáltatója hamis válaszokat ad jól ismert domainekre. Mivel a kliensek függnek a a pontos Tor Elosztó DNS válaszoktól, így az Elosztója nem lehet lesz Kilépő Elosztónak beállítva."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3501,10 +3286,7 @@ msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"A Tor megpróbálja ellenőrizni, hogy a Elosztó szerver port elérhető-e a Tor "
-"hálózatból, a %1:%2 helyre történő visszacsatlakozással. A teszt lefutása "
-"néhány percet vehet igénybe."
+msgstr "A Tor megpróbálja ellenőrizni, hogy a Elosztó szerver port elérhető-e a Tor hálózatból, a %1:%2 helyre történő visszacsatlakozással. A teszt lefutása néhány percet vehet igénybe."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
@@ -3524,11 +3306,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"Az Elosztó szerver portja nem elérhető más Tor kliensek által. Ezt "
-"okozhatja, hogy tűzfal vagy router mögött található, ahol a port továbbítást"
-" be kell állítania. Ha %1:%2 nem a helyes IP címe és portja, akkor "
-"ellenőrizze az Elosztó beállításait."
+msgstr "Az Elosztó szerver portja nem elérhető más Tor kliensek által. Ezt okozhatja, hogy tűzfal vagy router mögött található, ahol a port továbbítást be kell állítania. Ha %1:%2 nem a helyes IP címe és portja, akkor ellenőrizze az Elosztó beállításait."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
@@ -3539,10 +3317,7 @@ msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"A Tor megpróbálja ellenőrizni, hogy a Elosztó címtár port elérhető-e a Tor "
-"hálózatból, a %1:%2 helyre történő visszacsatlakozással. A teszt lefutása "
-"néhány percet vehet igénybe."
+msgstr "A Tor megpróbálja ellenőrizni, hogy a Elosztó címtár port elérhető-e a Tor hálózatból, a %1:%2 helyre történő visszacsatlakozással. A teszt lefutása néhány percet vehet igénybe."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
@@ -3562,11 +3337,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"Az Elosztó címtár portja nem elérhető más Tor kliensek által. Ezt okozhatja,"
-" hogy tűzfal vagy router mögött található, ahol a port továbbítást be kell "
-"állítania. Ha %1:%2 nem a helyes IP címe és címtár portja, akkor ellenőrizze"
-" az Elosztó beállításait."
+msgstr "Az Elosztó címtár portja nem elérhető más Tor kliensek által. Ezt okozhatja, hogy tűzfal vagy router mögött található, ahol a port továbbítást be kell állítania. Ha %1:%2 nem a helyes IP címe és címtár portja, akkor ellenőrizze az Elosztó beállításait."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
@@ -3576,10 +3347,7 @@ msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Elosztó leíró amely a kliensek csatlakozását teszi lehetővé visszautasításra"
-" került a címtár a %1:%2 címen elérhető címtár szerver által. A "
-"visszautasítás oka: %3"
+msgstr "Elosztó leíró amely a kliensek csatlakozását teszi lehetővé visszautasításra került a címtár a %1:%2 címen elérhető címtár szerver által. A visszautasítás oka: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
@@ -3591,11 +3359,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"Az Elosztója Online és elérhető a többi kliens számára. Emelkedő hálózati "
-"forgalmat kell látnia a Sávszélesség diagramon néhány órán belül, ahogy "
-"újabb kliensek szereznek tudomást az Elosztójáról. Köszönjük a "
-"hozzájárulását a Tor hálózathoz."
+msgstr "Az Elosztója online és elérhető a többi kliens számára. Emelkedő hálózati forgalmat kell látnia a Sávszélesség diagramon néhány órán belül, ahogy újabb kliensek szereznek tudomást az Elosztójáról. Köszönjük a hozzájárulását a Tor hálózathoz."
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Állapot"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Log üzenetek"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Tor állapot"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Indításkor megjelenítés"
msgctxt "Stream"
msgid "New"
@@ -3633,6 +3413,12 @@ 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 "A Vidalia nem indította el a Tor-t. Le kell állítania a Tor-t azon a felületen keresztül, ahogy indította azt."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "%1 folyamat leállítása sikertelen. [%2]"
@@ -3657,9 +3443,7 @@ msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Beállítások mentése. Ha nem kerül bejelölésre, akkor csak az aktuális Tor "
-"példányhoz kerül beállításra."
+msgstr "Beállítások mentése. Ha nem kerül bejelölésre, akkor csak az aktuális Tor példányhoz kerül beállításra."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3699,9 +3483,7 @@ msgstr "Hiba a Tor-hoz kapcsolódásban"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"A kijelölés üres. Válasszon ki szöveget, vagy jelölje a Mindenre végrehajt "
-"opciót."
+msgstr "A kijelölés üres. Válasszon ki szöveget, vagy jelölje a Mindenre végrehajt opciót."
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3715,6 +3497,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr "Hiba történt a torrc fájl megnyitása során"
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Siker"
@@ -3775,17 +3581,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"A Vidalia nem tudta ellenőrizni az elérhető szoftver frissítéseket, mert nem"
-" találta a következőt: '%1'."
+msgstr "A Vidalia nem tudta ellenőrizni az elérhető szoftver frissítéseket, mert nem találta a következőt: '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"A Vidalia nem tudta ellenőrizni az elérhető szoftverfrissítéseket, mert a "
-"Tor frissítési folyamat nem várt módon megszakadt."
+msgstr "A Vidalia nem tudta ellenőrizni az elérhető szoftverfrissítéseket, mert a Tor frissítési folyamat nem várt módon megszakadt."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3847,6 +3649,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Verzió"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Összeomlási jelentés feltöltése"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "A jelentés küldése sikertelen: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3940,10 +3750,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "A '%1' napló megnyitása sikertelen: %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Várt érték a paraméterhez:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Érvénytelen nyelvi kód lett megadva:"
@@ -3960,10 +3766,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Valószínűleg egy másik Vidalia folyamat is fut. Ha biztosan nem fut Vidalia folyamat, akkor választhatja a folytatás mindenképp lehetőséget.\n"
-"\n"
-"Szeretné folyatni a Vidalia indítását?"
+msgstr "Valószínűleg egy másik Vidalia folyamat is fut. Ha biztosan nem fut Vidalia folyamat, akkor választhatja a folytatás mindenképp lehetőséget.\n\nSzeretné folyatni a Vidalia indítását?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3996,5 +3799,3 @@ msgstr "%1 óra"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 perc"
-
-
diff --git a/src/vidalia/i18n/po/id/qt_id.po b/src/vidalia/i18n/po/id/qt_id.po
index de80115..db8ea53 100644
--- a/src/vidalia/i18n/po/id/qt_id.po
+++ b/src/vidalia/i18n/po/id/qt_id.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/id/vidalia_id.po b/src/vidalia/i18n/po/id/vidalia_id.po
index c4123c9..9725f5a 100755
--- a/src/vidalia/i18n/po/id/vidalia_id.po
+++ b/src/vidalia/i18n/po/id/vidalia_id.po
@@ -1,15 +1,13 @@
#
# Translators:
-# daweng <thedaweng at yahoo.com>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <thedaweng at yahoo.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: daweng <thedaweng at yahoo.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,15 +26,15 @@ msgstr "Lisensi"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "4.4.2 qt"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
@@ -45,9 +43,7 @@ msgstr "'%1' bukanlah alamat IP yang valid."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Anda memilih 'Password' authentication, tetapi Anda tidak memberikan "
-"password."
+msgstr "Anda memilih 'Password' authentication, tetapi Anda tidak memberikan password."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -139,71 +135,62 @@ msgstr "Simpan data untuk software Tor pada direktori berikut ini"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Pilih direktori yang digunakan untuk menyimpan data pada software Tor."
+msgstr "Pilih direktori yang digunakan untuk menyimpan data pada software Tor."
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Kontrol "
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Gunakan koneksi TCP (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Path:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Gunakan domain socket Unix(ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Edit torrc saat ini"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "Catatan: ini akan mengedit saat ini dimuat torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "Path ControlSocket tidak ada."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
-"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 "Peringatan"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Anda berubah path torrc, apakah Anda ingin me-restart Tor?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Konfigurasi File (torrc);; All Files (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Pilih file untuk digunakan untuk path soket Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
msgstr ""
msgctxt "AdvancedPage"
@@ -212,8 +199,6 @@ 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"
@@ -248,10 +233,6 @@ msgid "Show Settings"
msgstr "Tampilkan Pengaturan"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Penggunaan Bandwidth Tor "
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reset"
@@ -291,53 +272,57 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Batal"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Mulai meminta penghubung HTTPS ..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Menghubungkan ke %1:%2."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Mengirim permintaan HTTPS untuk penghubung ..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Men-download daftar penghubung ..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Men-download Penghubung"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Tidak dapat mendownload penghubung: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Mencoba kembali permintaan penghubung ..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Negara"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Klien"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klien dari negara berikut telah menggunakan relay anda sejak %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Ringkasan Penggunaan Penghubung"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Ringkasan Klien "
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -349,7 +334,7 @@ msgstr "Buka"
msgctxt "Circuit"
msgid "Building"
-msgstr "Bangunan"
+msgstr "Building"
msgctxt "Circuit"
msgid "Failed"
@@ -444,20 +429,27 @@ msgid "Control socket is not connected."
msgstr "Kendali socket tidak terhubung."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Diperlukan Password"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ingat password saya"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia telah tersambung ke Tor proses berjalan yang membutuhkan password. "
-"Silakan masukkan sandi kendali Anda:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -477,849 +469,854 @@ msgstr "Balasan Kendali tidak valid. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afganistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Australia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaijan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Belarusia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnia & Herzegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brazil"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgaria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Kamboja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Kamerun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Kanada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Cape Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Republik Afrika Tengah"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Chad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Chile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Cina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Kolumbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Komoro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Kongo, Republik Demokratik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Kongo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Pantai Gading"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Kroasia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Kuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Siprus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Republik Ceko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Denmark"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibouti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Republik Dominika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ekuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Mesir"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Perancis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Jerman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haiti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Jepang"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Yordania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirgistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Latvia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Libanon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lithuania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxembourg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Makedonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagaskar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malaysia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Kepulauan Marshall"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauritius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Mikronesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldova"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Maroko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Belanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Selandia Baru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nikaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norwegia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Nugini"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Pilipina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Rumania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rusia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts and Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent and Grenadines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Arab Saudi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Sisilia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapura"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slowakia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Kepulauan Solomon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Afrika Selatan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Spanyol"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Suriname"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Swedia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Switzerland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Suriah"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thailand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Timor Timur)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad dan Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turki"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukraina"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Uni Emirat Arab"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Inggris"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Amerika Serikat"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatikan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sahara Barat"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yaman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Aljazair"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Austria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Etiopia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finlandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Yunani"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Hongaria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Islandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irlandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Korea Utara"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Korea Selatan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maladewa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Meksiko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Myanmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Menyampaikan Laporan kerusakan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia mengalami galat dan dibutuhkan untuk menutup"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Restart Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Jangan Restart"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Tidak dapat me-restart Vidalia"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+"Please also describe what you were doing before the application crashed "
+"(optional):"
msgstr ""
-"Kami tidak dapat secara otomatis restart Vidalia. Silahkan restart Vidalia "
-"secara manual."
msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
+msgid "Send my crash report to the Vidalia developers"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgid "Restart Vidalia"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgid "Don't Restart"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Unable to restart Vidalia"
msgstr ""
msgctxt "CrashReportDialog"
msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
msgctxt "GeneralPage"
@@ -1344,11 +1341,7 @@ msgstr "Jalankan Vidalia ketika sistem saya berjalan"
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Jelajah"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Jalankan software Tor ketika Vidalia berjalan"
+msgstr "Browse"
msgctxt "GeneralPage"
msgid "Tor"
@@ -1368,15 +1361,19 @@ msgstr "Proxy Application Arguments:"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Software Updates"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Periksa untuk pembaruan perangkat lunak baru secara otomatis"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Periksa Sekarang"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1396,11 +1393,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Terima:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Terkirim:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1528,7 +1525,7 @@ msgstr "Dokumen ditemukan"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Error Memuat Isi Bantuan:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1539,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia dapat membuka tautan yang Anda pilih melalui default browser. Jika "
-"browser Anda tidak dikonfigurasi untuk penggunaan Tor maka aktivitas "
-"browsing Anda tidak anonymous lagi."
+msgstr "Vidalia dapat membuka tautan yang Anda pilih melalui default browser. Jika browser Anda tidak dikonfigurasi untuk penggunaan Tor maka aktivitas browsing Anda tidak anonymous lagi."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1556,13 +1550,11 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia tidak bisa membuka tautan yang dipilih pada browser Anda. Anda dapat"
-" menyalin URL dan menempelkannya pada browser Anda."
+msgstr "Vidalia tidak bisa membuka tautan yang dipilih pada browser Anda. Anda dapat menyalin URL dan menempelkannya pada browser Anda."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Error membuka file bantuan:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1602,27 +1594,27 @@ msgstr "Tidak diketahui"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Pemberitahuan"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Peringatan"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Kesalahan"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Tidak diketahui"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1665,34 +1657,6 @@ 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"
@@ -1701,10 +1665,6 @@ msgid "View"
msgstr "Tampilan"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Bantuan Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Error menjalankan browser"
@@ -1817,10 +1777,6 @@ 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"
@@ -1840,9 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia tidak bisa menjalankan Tor. Periksa pengaturan Anda untuk memastikan"
-" nama dan lokasi yang benar dari executable Tor Anda."
+msgstr "Vidalia tidak bisa menjalankan Tor. Periksa pengaturan Anda untuk memastikan nama dan lokasi yang benar dari executable Tor Anda."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1858,238 +1812,148 @@ msgstr "Relay diaktifkan"
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Kesalahan Shutting Down"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia tidak dapat menghentikan perangkat lunak Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Kesalahan tak terduga"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Otentikasi untuk Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Diperlukan Cookie Otentikasi "
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"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 "Apakah Anda ingin menelusuri sendiri 'control_auth_cookie' file?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Direktori Data"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Cookie Control (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Kesalahan memasukkan agenda"
+msgstr ""
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 "Tor Update Tersedia"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
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 "Situs web Tor: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr "Semua koneksi berikutnya akan tampil berbeda dari koneksi lama Anda."
+msgstr ""
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Gagal membuat Identitas Baru"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Gagal Penerusan Port"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia tidak dapat mengkonfigurasi port terusan otomatis."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Panel Kontrol Vidalia "
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-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"
+msgstr ""
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 "Koneksi Berpotensi Tidak Aman"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "Tor secara otomatis menutup koneksi untuk melindungi penyamaran Anda."
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Perbarui Gagal"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Perangkat lunak Anda telah terbarui"
+msgstr ""
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 "Instalasi Gagal"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia tidak dapat menginstal pembaruan perangkat lunak Anda."
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Kesalahan berikut terjadi:"
+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 ""
@@ -2097,20 +1961,30 @@ 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 "failed (%1)"
-msgstr "gagal (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"relay Anda munutup. Klik 'Stop' lagi untuk menghentikan relay Anda sekarang."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2122,9 +1996,6 @@ 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 ""
@@ -2132,306 +2003,310 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia mendeteksi bahwa perangkat lunak Tor keluar tak terduga. Silakan "
-"memeriksa log pesan untuk peringatan terbaru atau pesan kesalahan."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+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 ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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 "Kesalahan Setting Filter"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia tidak dapat meregister log kejadian Tor's."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Error Membuka File Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia tidak dapat membuka file log yang ditentukan."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Log Filename Diperlukan"
+msgstr ""
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 "Pilih Log File"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Simpan Pesan Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "File teks (*. txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Cari di pesan Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Cari:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Tidak Ditemukan"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "Ditemukan 0 cocok."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Log Pesan "
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Filter Pesan ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Mengatur pesan filter"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Ukuran histori ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Tetapkan jumlah pesan maksimum untuk ditampilkan"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Hapus"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Hapus semua pesan dari pesan Log (Ctrl + E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl + E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Salin"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Salin pesan yang dipilih ke clipboard (Ctrl + C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl + C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Pilih Semua"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Pilih semua pesan (Ctrl + A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl + A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Simpan Semua"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Simpan semua pesan ke file"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Simpan Dipilih"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Menyimpan pesan yang dipilih ke file"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Pengaturan"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Sesuaikan pesan Pengaturan log"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl + T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Bantuan"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Tampilkan bantuan browser"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Tutup"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Tutup pesan Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Cari"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Cari semua pesan yang berisi teks pencarian (Ctrl + F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl + F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Waktu"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Jenis"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Pesan"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Menyimpan pesan saat pengaturan Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Simpan Pengaturan"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Membatalkan perubahan yang dilakukan untuk pengaturan"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Membatalkan"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Filter pesan"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Kesalahan"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Peringatan"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Pemberitahuan"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Pesan Log Sejarah"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Jumlah pesan untuk menampilkan di jendela log pesan"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "pesan"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Jelajahi"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "Aktifkan simpan otomatis semua pesan log baru ke sebuah file"
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Secara otomatis menyimpan pesan log baru ke sebuah file"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Dasar"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Status Tor "
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Lebih lanjut"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Selalu Simpan Pesan Log Baru"
+msgid "toolbar"
+msgstr ""
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 "Pesan yang hanya muncul ketika sesuatu yang tidak beres dengan Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2440,20 +2315,18 @@ 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 "Pesan yang sering muncul selama operasi normal Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Hyper-verbose pesan terutama menarik bagi pengembang Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2461,835 +2334,802 @@ 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 "Segarkan"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Segarkan daftar Tor relay dan koneksi"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl + R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Bantuan"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Tampilkan peta jaringan bantuan"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Tampilkan peta jaringan bantuan"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Dekat"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Tutup peta jaringan"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Perbesar"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Zoom in pada peta jaringan"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Zoom Out"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Zoom out pada peta jaringan"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Zoom Untuk Fit"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Memperbesar untuk cocok untuk semua sirkuit saat ini ditampilkan"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl + Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Relay Tidak Ditemukan"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Tidak ada rincian tentang relay dipilih yang tersedia."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Tidak diketahui"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Layar Penuh"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Lihat peta jaringan sebagai jendela layar penuh"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "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 "Kesalahan Penghubung"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "Identifier Penghubung yang ditentukan tidak valid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Salin (Ctrl + C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
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 "'%1' bukan nomor port yang valid."
+msgstr ""
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 "Saya menggunakan proxy untuk mengakses Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Pengaturan Proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Nama User:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Kata Kunci:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port:"
+msgstr ""
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 "Firewall saya hanya mengizinkan saya terhubung ke port tertentu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Pengaturan Firewall"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Port yang diizinkan:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"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 "ISP saya memblok koneksi ke jaringan Tor"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Pengaturan Penghubung"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Tambahkan sebuah Penghubung:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Lepaskan penghubung yang dipilih dari daftar"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Salin penghubung dipilih ke clipboard"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Cari Penghubung Sekarang"
+msgstr ""
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 "Alamat:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Tipe:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Anda harus memilih jenis proxy."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "terima"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "tolak"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Hibernate"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Lokasi:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "Alamat IP:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Platform:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Bandwidth:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Uptime:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Terakhir Diperbarui:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Salin"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Hibernasi"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Relay Details"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Ringkasan"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Nama:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Status:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Lokasi:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "Alamat IP:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Platform:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Bandwidth:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Uptime:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Kontak:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Terakhir Diperbarui:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descriptor"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Hibernate"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB / s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zoom untuk Relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 relay online"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Salin"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Julukan"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Sidik jari"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Penghubung Dukungan Tidak Tersedia"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"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 "relay jembatan anda tidak aktif."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Anda harus menentukan paling tidak nama panggilan relay dan port."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Jalankan hanya sebagai klien"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Lalu lintas relay untuk jaringan Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Port Relay:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Hidupkan untuk dapat mirrir direktori"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Mencoba untuk secara otomatis mengkonfigurasi penerusan port "
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Tes"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Tampilkan topik bantuan di port forwarding"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Direktori Port:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Direktori Nomor Port"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Info Kontak:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nama relay Anda"
+msgstr ""
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 "Nickname:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Pengaturan Dasar"
+msgstr ""
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 "Kabel / DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Kable / DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Kable / DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Kable/DSL 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Sesukanya"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Pilih entri yang paling menyerupai koneksi Internet Anda"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Tampilkan topik bantuan pada tingkat batas bandwidth"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Kecepatan Rata-rata"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Rata-rata Batas bandwith jangka panjang "
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB / s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Kecepatan Maksimum"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Batas tingkat kecepatan bandwidth"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"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 "Batas Bandwidth "
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Ports 6660 - 6669 dan 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Port 110, 143, 993 dan 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Ambil Mail (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Port tidak ditentukan oleh checkbox lain"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "servis lain-lainnya"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Port 706, 1863, 5050, 5190, 5222, 5223, 8300 dan 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Pesan Instan (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Port 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Situs Web Aman (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Port 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Situs Web"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Tampilkan topik bantuan mengenai kebijakan keluar"
+msgstr ""
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 "Kebijakan Keluar "
+msgstr ""
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 "Salin relay penghubung identitas Anda ke clipboard"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Tidak ada Penggunaan terbaru"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Tidak ada klien yang menggunakan relay anda sekarang."
+msgstr ""
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 "Histori Penghubung"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia tidak dapat mengambil sejarah penggunaan penghubung Anda."
+msgstr ""
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 "Respon yang dikembalikan:%1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Bantu pengguna disensor menjangkau jaringan Tor"
+msgstr ""
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 "<a href=\"#bridgeHelp\">Apa ini?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Secara otomatis mendistribusikan alamat penghubung saya"
+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 Direktori Relay"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"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 "Kesalahan ketika mencoba untuk membatalkan publikasi semua layanan"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Harap mengkonfigurasi setidaknya sebuah direktori layanan dan port virtual "
-"untuk setiap layanan yang ingin Anda simpan. Lepaskan yang lain."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Kesalahan"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Silakan pilih Layanan."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Pilih Direktori Layanan"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Port Virtual hanya dapat berisi nomor port yang valid [1 .. 65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Target hanya dapat berisi alamat: port, alamat, atau port."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Direktori sudah digunakan oleh layanan lain."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Form"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Diperoleh Layanan Tersembunyi "
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Alamat Onion"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Port Virtual "
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Sasaran"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Path Direktori"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Diaktifkan"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Tambahkan layanan baru ke daftar"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Hapus layanan yang dipilih dari daftar"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Salin alamat onion layanan terpilih ke clipboard"
+msgstr ""
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 "Dibuat oleh Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Salin ke Clipboard"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Perangkat Lunak Tor adalah Lari"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Perangkat Lunak Tor tidak berjalan"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3297,9 +3137,6 @@ 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 ""
@@ -3308,9 +3145,6 @@ 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 ""
@@ -3319,39 +3153,30 @@ 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 "Perangkat lunak Tor anda tidak up-to-date."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Terhubung ke Jaringan Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"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 "Tor Software Error"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"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 ""
@@ -3360,10 +3185,6 @@ 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 ""
@@ -3372,14 +3193,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 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 "Jam Komputer Anda adalah Berpotensi Salah"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3388,10 +3205,6 @@ 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 ""
@@ -3399,13 +3212,10 @@ 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 "Berpotensi Koneksi Berbahaya !"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3414,14 +3224,10 @@ 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 "Unknown SOCKS Protokol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3429,14 +3235,10 @@ 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 "Hostname Tujuan tidak valid "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3444,13 +3246,10 @@ 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 "Eksternal IP Address Berubah"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3458,13 +3257,10 @@ 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 "Pembajakan DNS Terdeteksi"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3472,10 +3268,6 @@ 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 ""
@@ -3483,14 +3275,10 @@ 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 "Memeriksa jangkauan Port Server"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3498,21 +3286,18 @@ 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 "Port Server reachability Test Sukses!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "port server relay Anda adalah dicapai dari jaringan Tor!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Port Server reachability Test Gagal"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3521,14 +3306,10 @@ 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 "Memeriksa jangkauan Port Direktori"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3536,21 +3317,18 @@ 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 "Direktori Port reachability Test Sukses!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Port Direktori relay Anda dapat dicapai dari jaringan Tor!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Test Jangkauan Port Direktori Gagal"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3559,26 +3337,20 @@ 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 "Relay Descriptor Ditolak"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"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 "Relay Anda Online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3587,367 +3359,406 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-"relay Anda sekarang online dan tersedia untuk Tor klien untuk digunakan. "
-"Anda akan melihat peningkatan lalu lintas jaringan yang ditampilkan oleh "
-"Grafik Bandwidth dalam beberapa jam sebagai klien lebih belajar tentang "
-"relay Anda. Terima kasih atas kontribusi ke jaringan Tor!"
+
+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 "Baru"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Menyelesaikan"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Menghubungkan"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Buka"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Gagal"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Tertutup"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Mencoba lagi"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Dipetakan Ulang"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Tidak diketahui"
+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 "Proses %1 gagal menghentikan. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Layanan Tor tidak terpasang."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Tidak dapat memulai layanan Tor."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Gagal hash password kontrol."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Mengedit torrc"
+msgstr ""
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 "Potong"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Salin"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Tempel"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Undo"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Redo"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Pilih Semua"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Terapkan semua"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Terapkan terpilih"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Kesalahan koneksi ke Tor"
+msgstr ""
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 "Error pada baris %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Kesalahan"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Kesalahan terjadi ketika membuka file torrc"
+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 "Sukses"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Tidak ditemukan perangkat Aktif UPnP"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Tidak berlaku diaktifkan UPnP-perangkat Internet gateway ditemukan"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup gagal"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Gagal menambahkan pemetaan port"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Gagal mengambil pemetaan port"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Gagal menghapus pemetaan port"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Error tidak diketahui"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Menemukan perangkat aktif UPnP-"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Memperbarui pemetaan direktori port"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Memperbarui pemetaan relay port"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Test selesai dengan sukses!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Pengujian Dukungan UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Pengujian Dukungan Universal Plug and Play "
+msgstr ""
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 "Memeriksa pembaruan yang tersedia ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Sembunyikan"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Men-download pembaruan ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Menginstal update software ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Selesai! Perangkat lunak Anda sekarang up to date."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Software Updates"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Memeriksa update ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Membatalkan"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Software Updates Tersedia"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Ingatkan Saya Nanti"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Menginstal"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Paket perangkat lunak berikut diperbarui siap untuk instalasi:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Paket"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Versi"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Batal"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Ya"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "Tidak ada"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Bantuan"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Coba Lagi"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Tampilkan Log"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Tampilkan Setting"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Lanjutkan"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Berhenti"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Jelajahi"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Argumen tidak valid"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia sudah berjalan"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Menampilkan pesan penggunaan ini dan keluar."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Mereset SEMUA pengaturan Vidalia yang tersimpan ."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Mengatur direktori Vidalia menggunakan untuk file data."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Mengatur nama dan lokasi pidfile Vidalia's."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Mengatur nama dan lokasi Vidalia's logfile."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Mengatur verbositas log Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Atur gaya antarmuka Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Atur bahasa Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Informasi Penggunaan Vidalia "
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Tidak dapat membuka '%1' log file: %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Kode Bahasa yang ditentukan tidak valid:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Gaya GUI yang ditentukan tidak valid:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Tinglkat Log yang ditentukan tidak valid:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3955,40 +3766,35 @@ 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 "%1 detik"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 B / s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 KB / s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 MB / s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 GB / "
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 hari"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 jam"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 menit"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/is/vidalia_is.po b/src/vidalia/i18n/po/is/vidalia_is.po
index 0326b2e..fbef7a8 100755
--- a/src/vidalia/i18n/po/is/vidalia_is.po
+++ b/src/vidalia/i18n/po/is/vidalia_is.po
@@ -1,11 +1,12 @@
#
+# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+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,10 +233,6 @@ msgid "Show Settings"
msgstr "Sýna stillingar"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Bandvíddarnotkun Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Endurstilla"
@@ -275,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Hætta við"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,17 +429,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Lykilorð er nauðsynlegt"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Muna lykilorðið mitt"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1334,10 +1344,6 @@ 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"
@@ -1365,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1647,34 +1657,6 @@ 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"
@@ -1683,10 +1665,6 @@ 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"
@@ -1799,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1885,18 +1859,6 @@ 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 ""
@@ -1937,138 +1899,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2076,31 +2015,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2356,19 +2289,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2411,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2514,6 +2435,22 @@ 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 ""
@@ -2839,10 +2776,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3087,6 +3020,14 @@ 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 ""
@@ -3131,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3423,6 +3360,22 @@ 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 ""
@@ -3459,6 +3412,12 @@ 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 ""
@@ -3537,6 +3496,30 @@ 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 ""
@@ -3815,5 +3798,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/it/qt_it.po b/src/vidalia/i18n/po/it/qt_it.po
index de88c57..c568554 100644
--- a/src/vidalia/i18n/po/it/qt_it.po
+++ b/src/vidalia/i18n/po/it/qt_it.po
@@ -1,15 +1,12 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
-# <tru74368 at yahoo.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-10-25 20:22+0000\n"
-"Last-Translator: fetidyoo <tru74368 at yahoo.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: Italian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -213,7 +210,7 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
+"%\n"
"File non trovato.\n"
" Verifica qual'è il nome corretto del file"
@@ -276,7 +273,7 @@ msgid ""
msgstr ""
"%1\n"
"Cartella non trovata.\n"
-"Controlla il nome corretto della cartella."
+"Controlla il nome corretto della cartella"
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -284,7 +281,7 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' è di sola lettura.\n"
+"'%1' è protetto.\n"
"Vuoi comunque cancellare?"
#: qfiledialog.cpp:2286
@@ -295,7 +292,7 @@ msgstr "Sei sicuro di voler cancellare '%1'?"
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Impossibile cancellare la cartella."
+msgstr "Cartella non cancellabile"
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
@@ -375,7 +372,7 @@ msgstr "Crea nuova cartella"
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Nome file non valido"
+msgstr "Nome file invalido"
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -445,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 byte"
-
-
diff --git a/src/vidalia/i18n/po/it/vidalia_it.po b/src/vidalia/i18n/po/it/vidalia_it.po
index b2ad472..231bba9 100644
--- a/src/vidalia/i18n/po/it/vidalia_it.po
+++ b/src/vidalia/i18n/po/it/vidalia_it.po
@@ -1,17 +1,19 @@
#
# Translators:
-# <a.n0on3 at gmail.com>, 2011.
+# <a.n0on3 at gmail.com>, 2012.
+# <balelo at mailforspam.com>, 2011.
+# <perlon at yopmail.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <sergiopelino at gmail.com>, 2011.
# <tru74368 at yahoo.com>, 2011.
+# usagetta <usa_getta at libero.it>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-11-14 20:06+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: n0on3 <a.n0on3 at gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -46,9 +48,7 @@ msgstr "'%1' non è un indirizzo IP valido."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Hai scelto l'autenticazione tramite password, ma non ne hai specificata "
-"nessuna."
+msgstr "Hai scelto l'autenticazione tramite password, ma non ne hai specificata nessuna."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -56,7 +56,7 @@ msgstr "Scegliere il file di configurazione di Tor"
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "File non trovato."
+msgstr "File non trovato"
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
@@ -84,7 +84,7 @@ msgstr "Impossibile installare il servizio Tor"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia non è riuscitoad installare il servizio Tor."
+msgstr "Vidalia non è riuscito ad installare il servizio Tor."
msgctxt "AdvancedPage"
msgid "Authentication:"
@@ -148,7 +148,7 @@ msgstr "Controllo di Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Utilizzo di una connessione TCP (ControlPort)"
+msgstr "Usa una connessione TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
@@ -156,37 +156,31 @@ msgstr "Percorso:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Utilizzo di una socket UNIX (ControlSocket)"
+msgstr "Usa un domain socket Unix (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Modificare l'attuale torrc"
+msgstr "Modificare il file di configurazione torrc corrente"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTA: Questa azione modificherà il file torrc attualmente in uso"
+msgstr "Nota: questo modificherà il file di configurazione torrc utilizzato correntemente"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "Il percorso della ControlSocket non esiste."
+msgstr "Il percorso della socket di controllo non esiste."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Il file di configurazione di Tor presente alla locazione specificata "
-"contiene caratteri che non possono essere rappresentati nell'attuale schema "
-"di codifica ad 8-bit del tuo sistema."
+msgstr "Il percorso specificato per il file di configurazione di tor contiene caratteri che non possono essere rappresentati nel sistema di encoding ad 8-bit corrente."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"La locazione specificata per la directory dati Tor contiene caratteri che "
-"non possono essere rappresentati nell'attuale schema di codifica ad 8-bit "
-"del tuo sistema."
+msgstr "Il percorso specificato per la directory dati di Tor contiene caratteri che non possono essere rappresentati nel sistema di encoding ad 8-bit corrente."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -194,29 +188,22 @@ msgstr "Attenzione"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Hai modificato il percorso del file torrc, vuoi riavviare Tor? "
+msgstr "Il percorso di torrc e' cambiato. Si vuole ristartare Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "File di configurazione di Tor (torrc);; Tutti i files(*)"
+msgstr "File di configurazione di Tor (torrc);;Tutti i Files (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Scegliere un file da utilizzare per il percorso Tor socket"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configura la porta di controllo automaticamente"
+msgstr "Seleziona il percorso del file da usare come socket per Tor"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia non ha potuto rimuovere il servizio Tor.\n"
-"\n"
-"Dovresti rimuoverlo manualmente."
+msgstr "Vidalia non ha potuto rimuovere il servizio Tor.\n\nDovresti rimuoverlo manualmente."
msgctxt "AppearancePage"
msgid "Language"
@@ -236,8 +223,7 @@ msgstr "Scegliere lo stile dell'interfaccia di Vidalia"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr ""
-"Vidalia non è in grado di caricare la traduzione della lingua prescelta"
+msgstr "Vidalia non è in grado di caricare la traduzione della lingua prescelta"
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -252,10 +238,6 @@ msgid "Show Settings"
msgstr "Mostra Impostazioni"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Utilizzo di banda di Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reinizializza"
@@ -295,6 +277,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annulla"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Grafico dell'ampiezza di banda"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Inizio la richiesta HTTPS di bridge..."
@@ -448,20 +434,27 @@ msgid "Control socket is not connected."
msgstr "Il socket di controllo non è connesso."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Password richiesta"
+msgid "Problem connecting to Tor"
+msgstr "Problema nel connettersi a Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ricorda la mia password"
+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 "Tor è già avviato, ma Vidalia non è in grado di connettersi ad esso.\n\nCiò può succedere quando qualcos'altro (come un altro processo di Vidalia attivo, o un processo Vidalia che non risponde) ha lanciato Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia si è collegato a un processo Tor in corse che richiede una password."
-" Inserisci la tua password di controllo:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Dovete terminare il processo di Tor prima che Vidalia ne possa avviare un altro."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia può provare a riavviare Tor per voi. Questo chiuderà tutte le connessioni attive attraverso il vostro processo Tor."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -473,8 +466,7 @@ msgstr "Errore nell'invio del comando di controllo. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Il socket si è disconnesso durante il tentativo di leggere una riga di dati."
+msgstr "Il socket si è disconnesso durante il tentativo di leggere una riga di dati."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
@@ -1278,11 +1270,29 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Invia un rapporto sul crash."
+msgstr "Invia una Segnalazione di Crash"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia è incorso in un errore ed è stato chiuso"
+msgstr "Vidalia ha riscontrato un errore e deve essere chiuso."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Un rapporto sul crash è stato creato automaticamente in modo che sia possibile inviarlo agli sviluppatori di Vidalia per aiutarli ad identificare e correggere il problema. Il rapporto inviato non contiene alcuna informazione personale, ma potrebbe essere possibile associare la vostra identità al rapporto stesso."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Si prega di descrivere quello che si stava facendo prima che l'applicazione smettesse di rispondere (facoltativo):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Manda una segnalazione dell'errore agli sviluppatori di Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
@@ -1294,46 +1304,25 @@ msgstr "Non riavviare"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Non è stato possibile riavviare Vidalia"
+msgstr "Impossibile riavviare Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Non è stato possibile riavviare Vidalia automaticamente. Si prega di "
-"riavviare Vidalia manualmente."
+msgstr "Vidalia non è riuscito a riavviarsi automaticamente, per favore lo riavvi manualmente."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Si prega di compilare il ticket:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Connessione in corso..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Invio segnalazione errore in corso..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Un rapporto di crash è stato creato; è possibile inviare il rapporto agli "
-"sviluppatori di Vidalia per aiutare ad identifare e risolvere il problema. I"
-" rapporti inviati non contengono alcuna informazione personale."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"con una descrizione di cosa si stava facendo al momento del crash "
-"dell'applicazione, insieme ai seguenti files corrispondenti al rapporto del "
-"crash:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Ricezione risposta in corso..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1360,10 +1349,6 @@ 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"
@@ -1391,6 +1376,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Controlla adesso"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Connetti a Tor automaticamente"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1552,10 +1541,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia può aprire il collegamento che hai scelto dentro il tuo browser web "
-"predefinito. Se il tuo browser non è configurato per usare Tor, la richiesta"
-" non sarà anonima."
+msgstr "Vidalia può aprire il collegamento che hai scelto dentro il tuo browser web predefinito. Se il tuo browser non è configurato per usare Tor, la richiesta non sarà anonima."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1569,9 +1555,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia non è riuscito ad aprire il collegamento nel tuo browser web. Puoi "
-"sempre copiare l'indirizzo e incollarlo nel tuo browser."
+msgstr "Vidalia non è riuscito ad aprire il collegamento nel tuo browser web. Puoi sempre copiare l'indirizzo e incollarlo nel tuo browser."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1619,11 +1603,11 @@ msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Informazione"
+msgstr "Informazioni"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Notifica"
+msgstr "Informazione"
msgctxt "LogTreeItem"
msgid "Warning"
@@ -1678,34 +1662,6 @@ 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"
@@ -1714,10 +1670,6 @@ 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"
@@ -1830,10 +1782,6 @@ 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"
@@ -1853,10 +1801,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia non è riuscito ad avviare Tor. Controlla le impostazioni per "
-"assicurarti di aver specificato nome e posizione corretti per l'eseguibile "
-"di Tor."
+msgstr "Vidalia non è riuscito ad avviare Tor. Controlla le impostazioni per assicurarti di aver specificato nome e posizione corretti per l'eseguibile di Tor."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1894,9 +1839,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor richiede Vidalia per mandare i contenuti di un cookie di autenticazione,"
-" ma Vidalia non è stato in grado di trovarne uno."
+msgstr "Tor richiede Vidalia per mandare i contenuti di un cookie di autenticazione, ma Vidalia non è stato in grado di trovarne uno."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1918,22 +1861,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia non è stato in grado di registrare alcuni eventi. Alcune funzioni di"
-" Vidalia potrebbero non essere disponibili"
-
-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."
+msgstr "Vidalia non è stato in grado di registrare alcuni eventi. Alcune funzioni di Vidalia potrebbero non essere disponibili"
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1943,9 +1871,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per "
-"favore visita il sito di Tor per scaricare l'ultima versione."
+msgstr "L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per favore visita il sito di Tor per scaricare l'ultima versione."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1978,90 +1904,14 @@ 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 ""
-"L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per "
-"favore visita il sito di Tor per scaricare l'ultima versione."
+msgstr "L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per favore visita il sito di Tor per scaricare l'ultima versione."
msgctxt "MainWindow"
msgid ""
@@ -2076,9 +1926,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor ha chiuso automaticamente la connessione per proteggere il tuo "
-"anonimato."
+msgstr "Tor ha chiuso automaticamente la connessione per proteggere il tuo anonimato."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2108,65 +1956,90 @@ msgstr "Si è verificato questo errore:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Una delle applicazioni in uso %1a sembra utilizzare una connessione non criptata e potenzialmente non sicura verso la porta %2."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Ogni dato inviato attraverso questa connessione potrebbe essere monitorato. "
-"Si consiglia di controllare la configurazione della propria applicazione e "
-"se possibile di usare esclusivamente protocolli crittografici come SSL."
+msgstr "Ogni dato inviato attraverso questa connessione potrebbe essere monitorato. Si consiglia di controllare la configurazione dell'applicazione e di utilizzare esclusivamente protocolli protetti da crittografia, come SSL, dove possibile."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fallito (%1)"
+msgid "toolBar"
+msgstr "Barra degli strumenti"
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."
+msgid "Start"
+msgstr "Avvia"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Stop"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Riavvia"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Ricarica le configurazioni di Tor"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Azioni"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc da %1 a %2"
+msgstr "Inizializzando torrc fa %1 a %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Hai realizzato un relay Tor. Se lo spegni tutte le connessioni aperte dai client verranno interrotte.\n"
-"\n"
-"Vuoi chiuderlo gradualmente per dare ai client il tempo di trovare un nuovo relay?"
+msgstr "Hai realizzato un relay Tor. Se lo spegni tutte le connessioni aperte dai client verranno interrotte.\n\nVuoi chiuderlo gradualmente per dare ai client il tempo di trovare un nuovo relay?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n"
-"\n"
-"Controlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
+msgstr "Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n\nControlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probabilmente Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia ha provato a riavviare Tor, ma non è stata in grado. Si consiglia di controllare il gestore dei processi per assicurarsi che non ci siano altri processi Tor in esecuzione."
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fallito (%1)"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probabilmente un programma per le email)"
+msgid ", probably Telnet,"
+msgstr ", probabilmente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probabilmente un client email,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Una delle applicazioni %1 sembra effettuare una connessione non criptata e "
-"non sicura verso la porta %2. "
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Il tuo relay si sta spegnendo.\nFai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Errore durante il caricamento delle impostazioni"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia non ha potuto ricaricare la configurazione di Tor."
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2421,36 +2294,24 @@ msgid "Automatically save new log messages to a file"
msgstr "Salva automaticamente i nuovi messaggi su file"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Base"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Stato di Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avanzate"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Salva sempre i nuovi messaggi di log"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr "barra degli strumenti"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Messaggi che compaiono quando qualcosa è andato \n"
-"davvero storto e Tor non può continuare a funzionare."
+msgstr "Messaggi che compaiono quando qualcosa è andato \ndavvero storto e Tor non può continuare a funzionare."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Messaggi che compaiono solo quando \n"
-"qualcosa è andato storto con Tor."
+msgstr "Messaggi che compaiono solo quando \nqualcosa è andato storto con Tor."
msgctxt "MessageLog"
msgid ""
@@ -2458,41 +2319,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Messaggi che compaiono di rado \n"
-"durante il normale funzionamento \n"
-"di Tor e non sono considerati errori, \n"
-"ma potrebbero comunque interessarti."
+msgstr "Messaggi che compaiono di rado \ndurante il normale funzionamento \ndi Tor e non sono considerati errori, \nma potrebbero comunque interessarti."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Messaggi che compaiono spesso \n"
-"durante il funzionamento di Tor."
+msgstr "Messaggi che compaiono spesso \ndurante il funzionamento di Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Messaggi molto prolissi che interessano \n"
-"principalmente gli sviluppatori di Tor."
+msgstr "Messaggi molto prolissi che interessano \nprincipalmente gli sviluppatori di Tor."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Non riesco a scrivere il file %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mappa della rete Tor"
+msgstr "Non riesco a scrivere il file %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2594,6 +2440,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Mappa della Rete"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Relay"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Connessione"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Stato"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Bridge non valido"
@@ -2610,16 +2472,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Devi indicare sia un indirizzo IP o un nome host, sia un numero di porta per"
-" configurare Tor e usare un proxy per accedere a Internet"
+msgstr "Devi indicare sia un indirizzo IP o un nome host, sia un numero di porta per configurare Tor e usare un proxy per accedere a Internet"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Devi indicare una o più porte a cui il tuo firewall permette di connettersi"
+msgstr "Devi indicare una o più porte a cui il tuo firewall permette di connettersi"
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2627,9 +2486,7 @@ msgstr "'%1' non è un numero di porta valido."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Seleziona nel caso che la tua rete locale richieda un proxy per accedere a "
-"Internet"
+msgstr "Seleziona nel caso che la tua rete locale richieda un proxy per accedere a Internet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2653,9 +2510,7 @@ msgstr "Porta:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Seleziona per connetterti ai relay solo attraverso le porte consentite dal "
-"tuo firewall"
+msgstr "Seleziona per connetterti ai relay solo attraverso le porte consentite dal tuo firewall"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2677,9 +2532,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Seleziona per cifrare le richieste di directory e, facoltativamente, usare "
-"bridge relay per accedere alla rete Tor"
+msgstr "Seleziona per cifrare le richieste di directory e, facoltativamente, usare bridge relay per accedere alla rete Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2717,9 +2570,7 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, "
-"oppure cerca un altro modo per trovare dei bridge"
+msgstr "Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, oppure cerca un altro modo per trovare dei bridge"
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2735,7 +2586,7 @@ msgstr "Tipo:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Dovete scegliere il tipo di proxy."
+msgstr "Devi selezionare il tipo di proxy"
msgctxt "NetworkPage"
msgid "SOCKS 4"
@@ -2909,16 +2760,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Hai configurato Tor per fare da bridge relay per utendi censurati, ma la tua"
-" versione di Tor non supporta i bridge."
+msgstr "Hai configurato Tor per fare da bridge relay per utendi censurati, ma la tua versione di Tor non supporta i bridge."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor"
+msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor"
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2933,10 +2781,6 @@ msgid "Run as a client only"
msgstr "Usa solo come client"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Fai da relay e scambia traffico per la rete Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta relay:"
@@ -2974,8 +2818,7 @@ msgstr "Nome del tuo relay"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Porta tramite cui utenti e altri relay possono comunicare con il tuo relay"
+msgstr "Porta tramite cui utenti e altri relay possono comunicare con il tuo relay"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2989,9 +2832,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Se hai una connessione ad internet con molta banda in download ma poca in "
-"upload, inserisci la tua velocità di upload qui."
+msgstr "Se hai una connessione ad internet con molta banda in download ma poca in upload, inserisci la tua velocità di upload qui."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3019,8 +2860,7 @@ msgstr "Personalizzata"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Seleziona la voce che si avvicina di più alla tua connessione internet"
+msgstr "Seleziona la voce che si avvicina di più alla tua connessione internet"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3050,9 +2890,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"La banda massima deve essere maggiore o uguale alla banda allocata media. "
-"Entrambi i valori devono essere almeno 20 KB/s."
+msgstr "La banda massima deve essere maggiore o uguale alla banda allocata media. Entrambi i valori devono essere almeno 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3113,17 +2951,13 @@ msgstr "Mostra l'aiuto sulle exit policy"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"A quali risorse di internet gli utenti possono accedere tramite il tuo "
-"relay?"
+msgstr "A quali risorse di internet gli utenti possono accedere tramite il tuo relay?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor bloccherà di default alcune mail in uscita e programmi di condivisione "
-"file per ridurre spam ed altri abusi"
+msgstr "Tor bloccherà di default alcune mail in uscita e programmi di condivisione file per ridurre spam ed altri abusi"
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3131,15 +2965,12 @@ msgstr "Exit policy"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Consenti agli altri di accedere al tuo bridge dando loro questa riga di "
-"testo:"
+msgstr "Consenti agli altri di accedere al tuo bridge dando loro questa riga di testo:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Questa è l'identità del tuo bridge relay che puoi dare a altre persone"
+msgstr "Questa è l'identità del tuo bridge relay che puoi dare a altre persone"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3157,9 +2988,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Mantieni attivo il tuo relay così che i client possano meglio trovarlo ed "
-"usarlo."
+msgstr "Mantieni attivo il tuo relay così che i client possano meglio trovarlo ed usarlo."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3173,9 +3002,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor ha dato una risposta malformata quando Vidalia ha chiesto lo storico "
-"d'utilizzo del tuo bridge."
+msgstr "Tor ha dato una risposta malformata quando Vidalia ha chiesto lo storico d'utilizzo del tuo bridge."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3183,9 +3010,7 @@ msgstr "La risposta fornita è stata: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
-"Aiuta gli utenti sotto censura a raggiungere la rete Tor (Tor 0.2.0.8-alpha "
-"o più recente)"
+msgstr "Aiuta gli utenti sotto censura a raggiungere la rete Tor (Tor 0.2.0.8-alpha o più recente)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3193,13 +3018,21 @@ msgstr "<a href=\"bridges.finding\">Come trovo un bridge?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Cos'è?</a>"
+msgstr "<a href=\"#bridgeHelp\">Cos'è questo?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
msgstr "Distribuisci automaticamente l'indirizzo del mio bridge"
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Distribuisci il traffico all'interno della rete Tor (non utilizzarmi con relay in uscita)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Distribuisci il traffico per la rete tor (anche in uscita)"
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Offri un mirror della directory dei relay"
@@ -3207,9 +3040,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"L'indirizzo email per contattarti se ci fosse un \n"
-"problema col tuo relay. Puoi inserire anche il tuo fingerprint PGP o GPG."
+msgstr "L'indirizzo email per contattarti se ci fosse un \nproblema col tuo relay. Puoi inserire anche il tuo fingerprint PGP o GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3219,9 +3050,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Configura almeno una cartella per il servizio e una porta virtuale per ogni "
-"servizio che vuoi salvare. Rimuovi gli altri."
+msgstr "Configura almeno una cartella per il servizio e una porta virtuale per ogni servizio che vuoi salvare. Rimuovi gli altri."
msgctxt "ServicePage"
msgid "Error"
@@ -3237,8 +3066,7 @@ msgstr "Seleziona la cartella del servizio"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"La porta virtuale può solo contenere numeri di porta validi [1..65535]."
+msgstr "La porta virtuale può solo contenere numeri di porta validi [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
@@ -3249,10 +3077,6 @@ 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"
@@ -3290,9 +3114,7 @@ msgstr "Copia l'indirizzo onion selezionato negli appunti"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Esplora nei file di sistema locali e scegli una cartella per i servizi "
-"selezionati"
+msgstr "Esplora nei file di sistema locali e scegli una cartella per i servizi selezionati"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3300,30 +3122,26 @@ msgstr "Creato da Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Copia negli Appunti"
+msgstr "Copia"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Il software Tor è in esecuzione!"
+msgstr "Tor è operativo"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "State usando la versione \"%1\" del software Tor."
+msgstr "Al momento stai usando la versione \"%1\" del software Tor."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Il software Tor non è attivo"
+msgstr "Tor è in esecuzione"
msgctxt "StatusEventWidget"
msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Fare click su \"Avvia Tor\" nel pannello di controllo di vidalia per "
-"riavviare Tor. Se l'esecuzione di Tor è terminata in modo inatteso, si "
-"selezioni la pagina \"Avanzate\" per ulteriori dettagli sugli errori "
-"riscontrati."
+msgstr "Clicca su \"Avvia Tor\" nel pannello di controllo di Vidalia per avviare l'esecuzione di Tor. Se Tor si è chiuso in modo inatteso, selezionare \"Avanzate\" dalla scheda in alto per maggiori dettagli sugli errori riscontrati."
msgctxt "StatusEventWidget"
msgid ""
@@ -3331,10 +3149,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"Stai attualmente eseguendo la versione \"%1\" del software Tor, che risulta "
-"obsoleta. Si prega di aggiornare alla versione più recente, che può "
-"contenere importanti aggiornamenti di sicurezza, affidabilità e prestazioni."
+msgstr "Al momento stai usando la versione \"%1\" del software Tor, che non è più raccomandata. Si consiglia di aggiornare alla versione più recente del software, che può contenere importanti aggiornamenti di sicurezza, affidabilità e miglioramenti in termini di prestazioni."
msgctxt "StatusEventWidget"
msgid ""
@@ -3342,41 +3157,31 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"Stai attualmente eseguendo la versione \"%1\" del software Tor, che potrebbe"
-" non essere più in grado di funzionare con la rete Tor. Si prega di "
-"aggiornare alla versione più recente, che può contenere importanti "
-"aggiornamenti di sicurezza, affidabilità e prestazioni."
+msgstr "Al momento stai usando la versione \"%1\" del software Tor, che non è più in grado di interagire con la rete Tor. Si consiglia di aggiornare alla versione più recente del software, che può contenere importanti aggiornamenti di sicurezza, affidabilità e miglioramenti in termini di prestazioni."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Il vostro software Tor non è aggiornato all'ultima versione"
+msgstr "La vostra versione ti Tor è deprecata."
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Connesso alla rete Tor"
+msgstr "Connessione alla rete Tor effettuata."
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Connessione stabilita con successo verso la rete Tor. Adesso si possono "
-"configurare le proprie applicazioni per accedere ad internet in modo "
-"anonimo."
+msgstr "Connessione effettuata con successo alla rete Tor. E' ora possibile configurare le proprie applicazioni per utilizzare Internet anonimamente."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Errore Software Tor."
+msgstr "Errore del 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 ""
-"Tor ha riscontrato un malfunzionamento interno. Si prega di riportare il "
-"seguente messaggio di errore agli sviluppatori del progetto Tor "
-"all'indirizzo bugs.torproject.org: \"%1\""
+msgstr "Tor ha riscontrato un bug software interno. Si prega di riportare il seguente messaggio di errore agli sviluppatori di Tor presso developers at bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3384,12 +3189,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor ha rilevato che l'orologio del vostro computer potrebbe essere "
-"configurato con %1 secondi di ritardo rispetto alla sorgente \"%2\". Se il "
-"vostro orologio non è configurato correttamente, Tor non sarà in grado di "
-"funzionare. Si prega di verificare che il proprio computer visualizzi "
-"l'orario corretto."
+msgstr "Tor ha determinato che l'orologio del computer potrebbe essere di %1 secondi indietro rispetto a \"%2\". Se il vostro orologio non è corretto, Tor non sarà in grado di funzionare. Si prega di verificare se il computer visualizza l'ora corretta."
msgctxt "StatusEventWidget"
msgid ""
@@ -3397,15 +3197,11 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor ha rilevato che l'orologio del vostro computer potrebbe essere %1 "
-"secondi indietro rispetto a \"%2\". Se l'orologio non è configurato "
-"correttamente, Tor non sarà in grado di funzionare. Si prega di verificare "
-"che il computer visualizzi l'orario corretto."
+msgstr "Tor ha determinato che l'orologio del computer potrebbe essere di %1 secondi avanti rispetto a \"%2\". Se il vostro orologio non è corretto, Tor non sarà in grado di funzionare. Si prega di verificare se il computer visualizza l'ora corretta."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "L'orologio del computer potrebbe essere errato"
+msgstr "L'orologio del computer potrebbe essere sbagliato"
msgctxt "StatusEventWidget"
msgid ""
@@ -3413,27 +3209,18 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"Una delle applicazioni sul vostro computer potrebbe aver tentato di "
-"stabilire una connessione non crittografata tramite Tor alla porta %1. "
-"L'invio di informazioni non crittografate attraverso la rete Tor è "
-"pericoloso e non raccomandato. Per la vostra sicurezza, Tor ha "
-"automaticamente chiuso questa connessione."
+msgstr "Una delle applicazioni in esecuzione può aver tentato di effettuare una connessione non criptata attraverso Tor verso la porta %1. Inviare informazioni non criptate attraverso la rete Tor è rischioso e non raccomandato. Per la vostra sicurezza, Tor ha automaticamente chiuso questa connessione."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Una delle applicazioni sul vostro computer potrebbe aver tentato di "
-"stabilire una connessione non crittografata tramite Tor alla porta %1. "
-"L'invio di informazioni non crittografate attraverso la rete Tor è "
-"pericoloso e non raccomandato."
+msgstr "Una delle applicazioni in esecuzione può aver tentato di effettuare una connessione non criptata attraverso Tor verso la porta %1. Inviare informazioni non criptate attraverso la rete Tor è rischioso e non raccomandato"
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Questa connessione è potenzialmente pericolosa!"
+msgstr "Connessione Potenzialmente Pericolosa!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3441,109 +3228,81 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Una delle vostre applicazioni ha stabilito una connessione attraverso Tor a "
-"\"%1\" utilizzando un protocollo che potrebbe rivelare informazioni sulla "
-"vostra destinazione. Assicuratevi di configurare le applicazioni affinché "
-"utilizzino esclusivamente socks4a o SOCKS5 con risoluzione remota "
-"dell'hostname."
+msgstr "Una delle applicazioni in esecuzione ha effettuato una connessione attraverso Tor alla porta \"%1\" utilizzando un protocollo che potrebbe trasmettere informazioni relative alla vostra destinazione. Si consiglia di assicurarsi di utilizzare solo SOCKS4a o SOCKS5 con risoluzione degli hostname remoti."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocollo SOCKS sconosciuto"
+msgstr "Protocollo SOCKS sconosciuto."
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Una delle vostre applicazioni ha stabilito una connessione attraverso Tor "
-"utilizzando un protocollo che Tor non è in grado di comprendere. "
-"Assicuratevi di configurare le applicazioni affinché utilizzino "
-"esclusivamente socks4a o SOCKS5 con risoluzione remota dell'hostname."
+msgstr "Una delle applicazioni in esecuzione ha provato a stabilire una connessione attraverso Tor utilizzando un protocollo che Tor non supporta. Si consiglia di assicurarsi che le applicazioni utilizzino solo SOCKS4a o SOCKS5 con risoluzione degli hostname remoti."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Hostname di destinazione non valido"
+msgstr "Hostname di destinazione non valido."
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Una delle vostre applicazioni ha stabilito una connessione attraverso Tor a "
-"\"%1\", che Tor non riconosce come un hostname valido. Si prega di "
-"controllare la configurazione della vostra applicazione."
+msgstr "Una delle applicazioni in esecuzione ha effettuato una connessione attraverso Tor alla porta \"%1\", che Tor non riconosce come un hostname valido. Si consiglia di controllare la configurazione delle proprie applicazioni."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "L'indirizzo IP esterno è stato cambiato"
+msgstr "Inidirizzo IP esterno cambiato."
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"Tor ha rilevato che l'indirizzo IP pubblico del proprio relay è attualmente "
-"%1%2. Se tale informazione non è corretta, si consiglia di configurare "
-"l'indirizzo nel campo 'Address' nella schermata di configurazione del relay."
+msgstr "Tor ha determinato che l'indirizzo IP pubblico del proprio relay è %1%2. Se questa informazione non è esatta, si consiglia di configurare il campo 'Indirizzo' nella configurazione del relay."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Rilevato hijacking del DNS"
+msgstr "Trovato Hijack del DNS"
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor ha rilevato che il server DNS utilizzato sta fornendo falsi responsi per"
-" domini che non esistono. Alcuni ISP ed altri DNS provider come OpenDNS sono"
-" noti per tale pratica al fine di visualizzare risultati di ricerca o "
-"pubblicità."
+msgstr "Tor ha rilevato che il provider DNS in uso sta fornendo false risposta per domini che non esistono. Alcuni ISPs ed altri provider DNS, come OpenDNS, sono risaputi adottare tale pratica al fine di visualizzare dei propri risultati di ricerca o annunci pubblicitari."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor ha rilevato che il server DNS utilizzato sta fornendo falsi responsi per"
-" domini noti. Poiché gli utenti si affidano ai relay della rete Tor per "
-"risolvere accuratamente le query ai DNS, il vostro relay non verrà "
-"configurato come un relay di uscita. "
+msgstr "Tor ha rilevato che il provider DNS in uso sta fornendo false risposta per domini ben noti. Poiché alcuni client si avvalgono dei relay di uscita della rete Tor per ottenere risoluzioni DNS accurate, il vostro relay non verrà configurato come un relay di uscita."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Controllo della raggiungibilità della porta server"
+msgstr "Controllo la raggiungibilità della Server Port"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"Tor sta cercando di rilevare se la porta del vostro server relay è "
-"raggiungibile dalla rete Tor connettendosi a %1:%2. L'operazione può "
-"richiedere diversi minuti."
+msgstr "Tor sta tentando di determinare se la vostra Server Port è raggiungibile dalla rete Tor connettendosi a %1:%2. Questo test può richiedere diversi minuti."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr ""
-"Il controllo della raggiungibilità della porta server ha avuto successo!"
+msgstr "Raggiungibilità della Server Port verificata."
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "La porta server del vostro relay è raggiungibile dalla rete Tor!"
+msgstr "La Server Port del vostro relay risulta raggiungibile dalla rete Tor!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr ""
-"Il controllo della raggiungibilità della porta server non ha avuto successo!"
+msgstr "Fallimento nella verifica di raggiungibilità della Server Port."
msgctxt "StatusEventWidget"
msgid ""
@@ -3551,34 +3310,26 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"La porta del vostro server relay non è raggiungibile dagli altri utenti Tor."
-" Questa condizione può verificarsi se ci si trova al di la di un router o di"
-" un firewall che richiede la configurazione del port forwarding. Se %1:%2 "
-"non è il vostro corretto indirizzo IP e porta del server, si prega di "
-"controllare la configurazione del proprio relay."
+msgstr "La Server Port del vostro relay non risulta raggiungibile da altri client nella rete Tor. Questo può succedere se si è dietro ad un router o ad un firewall che richiedono il setup del port-forwarding. Se %1:%2 non è il vostro corretto indirizzo IP e Server Port, si consiglia di controllare la configurazione del relay."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Controllo di raggiungibilità della Directory Port"
+msgstr "Controllo raggiungibilità diretta della porta."
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor sta tentando di determinare se la directory port configurata è "
-"raggiungibile dalla rete Tor connettendosi a %1:%2. Questa operazione può "
-"richiedere diversi minuti."
+msgstr "Tor sta provando a determinare se la Directory Port del vostro relay è raggiungibile dalla rete Tor connettendosi a %1:%2. Questo test potrebbe richiedere diversi minuti."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Test di raggiungibilità della Directory Port ultimato con successo!"
+msgstr "Raggiungibilità della Directory Port verificata con successo!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "La directory port del proprio relay è raggiungibile dalla rete Tor!"
+msgstr "La Directory Port del vostro relay risulta raggiungibile dalla rete Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
@@ -3590,29 +3341,21 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"La directory port del vostro relay non è raggiungibile dagli altri utenti "
-"Tor. Questa condizione può verificarsi se ci si trova al di la di un router "
-"o di un firewall che richiede la configurazione del port forwarding. Se "
-"%1:%2 non è il vostro corretto indirizzo IP e porta del server, si prega di "
-"controllare la configurazione del proprio relay."
+msgstr "La Directory Port del vostro relay non è raggiungibile dagli altri client Tor. Questo può succedere se si è dietro ad un router o ad un firewall che richiedono il setup del port-forwarding. Se %1:%2 non è il vostro corretto indirizzo IP e Server Port, si consiglia di controllare la configurazione del relay."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Descrizione del Relay rifiutata."
+msgstr "Descrizione del Relay Rifiutata"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"La descrizione del vostro relay, che permette agli altri utenti di "
-"connettervisi, è stata rifiutata dal directory server presso %1:%2. La "
-"ragione specificata è: %3"
+msgstr "Il descrittore del vostro relay, che permette agli altri client di connettersi al vostro relay, è stato rifiutato dal directory server presso %1:%2. La ragione specificata è stata: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Il vostro relay è online"
+msgstr "Il vostro Relay è Online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3620,11 +3363,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"Il vostro relay è ora online e disponibile per l'uso da parte dei client "
-"Tor. Dovreste vedere un aumento del traffico di rete mostrato dal Grafico "
-"dell'ampiezza di banda entro poche ore, quando più client si accorgeranno "
-"del vostro relay. Grazie per il vostro contributo alla rete Tor!"
+msgstr "Il vostro relay è ora online e disponibile per l'utilizzo da parte dei client Tor. Dovreste notare un incremento del traffico di rete mostrato dal grafico della banda nel giro di poche ore, quando diversi client verranno a conoscenza del vostro relay. Vi ringraziamo per il vostro contributo alla rete Tor!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Stato"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Log dei Messaggi"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Stato di Tor"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Mostra all'avvio"
msgctxt "Stream"
msgid "New"
@@ -3662,6 +3417,12 @@ 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 "Vidalia non ha avviato Tor. Sarà necessario terminare Tor attraverso l'interfaccia dalla quale è stato avviato."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Il processo %1 non è riuscito a terminare. [%2]"
@@ -3680,15 +3441,13 @@ msgstr "L'hash della password di controllo è fallito."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Modifica di torrc in corso"
+msgstr "Modifica il file di configurazione torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Salva la configurazione. Se non selezionato, i cambiamenti saranno applicati"
-" solamente all'istanza corrente di Tor."
+msgstr "Salva la configurazione. Se non selezionato, applicherà i cambiamenti solo all'istanza corrente di Tor."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3716,21 +3475,19 @@ msgstr "Seleziona tutto"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Applica tutti."
+msgstr "Applica tutte"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Applica solo i selezionati."
+msgstr "Applica solo quelle selezionate"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Errore durante la connessione a Tor"
+msgstr "Errore durante la connessione di Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Nessuna selezione effettuata. Si prega di selezionare del testo o di "
-"spuntare l'opzione \"Applica tutti\"."
+msgstr "La selezione è vuota. Per favore selezioni qualche opzione, o spunti \"Applica tutto\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3742,7 +3499,31 @@ msgstr "Errore"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Si è verificato un errore aprendo il file torrc"
+msgstr "Si è verificato un errore nell'apertura del file torrc"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
msgctxt "UPNPControl"
msgid "Success"
@@ -3804,17 +3585,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia non ha potuto controllare gli aggiornamenti software perché non ha "
-"trovato '%1'."
+msgstr "Vidalia non ha potuto controllare gli aggiornamenti software perché non ha trovato '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia non ha potuto controllare gli aggiornamenti software perché il "
-"processo di aggiurnamento di Tor si è interrotto inaspettatamente."
+msgstr "Vidalia non ha potuto controllare gli aggiornamenti software perché il processo di aggiurnamento di Tor si è interrotto inaspettatamente."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3876,6 +3653,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "versione"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Invio segnalazione errore in corso"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Impossibile inviare il report: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3969,10 +3754,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Non è stato possibile aprire il file di log '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Valore richiesto per il parametro:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Il codice della lingua indicato non è valido:"
@@ -3989,10 +3770,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n"
-"\n"
-"Vuoi continuare ed avviare Vidalia?"
+msgstr "Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n\nVuoi continuare ed avviare Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -4025,5 +3803,3 @@ 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 98e8628..e8a4552 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ko/qt_ko.po b/src/vidalia/i18n/po/ko/qt_ko.po
index 02a7095..60a1b26 100644
--- a/src/vidalia/i18n/po/ko/qt_ko.po
+++ b/src/vidalia/i18n/po/ko/qt_ko.po
@@ -1,13 +1,11 @@
#
-# Translators:
-# <cwt967 at naver.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-09-04 05:17+0000\n"
-"Last-Translator: cwt96 <cwt967 at naver.com>\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,189 +17,189 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "활성화"
+msgstr ""
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "%1를(을) 실행하기 위해서는 QT %2가 필요하지만, Qt %3이 발견되었습니다."
+msgstr ""
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "호환되지 않는 Qt 라이브러리 오류"
+msgstr ""
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr "QT_LAYOUT_DIRECTION"
+msgstr ""
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "프로그램의 메인 윈도우를 활성화"
+msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr "확인"
+msgstr ""
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "저장"
+msgstr ""
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr "열기"
+msgstr ""
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr "취소"
+msgstr ""
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr "닫기"
+msgstr ""
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr "적용"
+msgstr ""
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "리셋"
+msgstr ""
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr "도움말"
+msgstr ""
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "저장하지 마시오"
+msgstr ""
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "삭제"
+msgstr ""
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "예(&Y)"
+msgstr ""
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr "모두 예(&A)"
+msgstr ""
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr "아니오(&N)"
+msgstr ""
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "모두 아니오(&O)"
+msgstr ""
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr "모두 저장"
+msgstr ""
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr "취소"
+msgstr ""
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr "재시도"
+msgstr ""
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr "무시"
+msgstr ""
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr "기본값 복원"
+msgstr ""
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr "저장하지 않고 닫기"
+msgstr ""
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr "확인(&O)"
+msgstr ""
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr "이름"
+msgstr ""
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr "크기"
+msgstr ""
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "종류"
+msgstr ""
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr "형식"
+msgstr ""
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr "날짜 수정"
+msgstr ""
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr "모든 파일 (*)"
+msgstr ""
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "폴더"
+msgstr ""
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr "열기(&O)"
+msgstr ""
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr "저장 (&S)"
+msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr "열기"
+msgstr ""
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1은 (는) 이미 존재합니다. 덮어쓰시겠습니까?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,57 +207,57 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1 파일을 찾을 수 없습니다. 올바른 파일 이름을 입력하였는지 확인하십시오."
+msgstr ""
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "내 컴퓨터"
+msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "이름 바꾸기 (&R)"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "삭제 (&D)"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "숨김 파일 보임(&H)"
+msgstr ""
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr "뒤로"
+msgstr ""
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "상위 디렉토리"
+msgstr ""
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "목록보기"
+msgstr ""
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "상세보기"
+msgstr ""
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr "파일 형식 :"
+msgstr ""
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "디렉토리 :"
+msgstr ""
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
@@ -267,170 +265,168 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1 디렉토리가 없습니다. 올바른 디렉터리 이름이 주어졌는지 확인하십시오."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1'은 읽기 전용입니다. 그래도 삭제하시겠습니까?"
+msgstr ""
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr " '%1'을 삭제하시겠습니까?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "디렉토리를 삭제할 수 없습니다."
+msgstr ""
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr "모든 파일 (*.*)"
+msgstr ""
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "다른 이름으로 저장"
+msgstr ""
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "드라이브"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr "파일"
+msgstr ""
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr "알 수없음"
+msgstr ""
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "디렉토리 찾기"
+msgstr ""
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "표시"
+msgstr ""
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "앞으로"
+msgstr ""
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr "새 폴더"
+msgstr ""
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "새 폴더 (&N)"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "선택 (&C)"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "삭제"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "파일 이름 (&N) :"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "검색 위치:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "새 폴더 만들기"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "잘못된 파일 이름"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>이름은 \"%1\"을 사용할 수 없습니다.</b> <p> 더 짧고 구둣점이 없는 다른 이름을 시도해 보십시오."
+msgstr ""
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr "이름"
+msgstr ""
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr "크기"
+msgstr ""
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "종류"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr "유형"
+msgstr ""
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr "날짜 수정"
+msgstr ""
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "내 컴퓨터"
+msgstr ""
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr "컴퓨터"
+msgstr ""
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr "%1 TB"
+msgstr ""
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/ko/vidalia_ko.po b/src/vidalia/i18n/po/ko/vidalia_ko.po
index 4444f3e..47fe8ec 100755
--- a/src/vidalia/i18n/po/ko/vidalia_ko.po
+++ b/src/vidalia/i18n/po/ko/vidalia_ko.po
@@ -1,3891 +1,2681 @@
-#
-# Translators:
-# <contact at imfast.kr>, 2011.
-# <cwt967 at naver.com>, 2011, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-02-03 07:12+0000\n"
-"Last-Translator: cwt96 <cwt967 at naver.com>\n"
-"Language-Team: translations at vidalia-project.net\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2010-06-30 08:08-0600\n"
+"Last-Translator: Jaeic Lee <zeraxeal at gmail.com>\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"
-"Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"X-Generator: Pootle 1.1.0\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Vidalia에 대하여"
+msgstr "비달리아에 관하여"
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
-msgstr "라이센스"
+msgid "Vidalia"
+msgstr "비달리아"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "큐티"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "토르"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "중지됨"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgid "4.4.2"
+msgstr ""
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgid "License"
+msgstr "라이센스"
+#: aboutdialog.ui:163
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
-msgstr "브릿지 다운도드 중"
+msgid "version"
+msgstr "버젼"
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' 은 올바른 IP주소가 아닙니다."
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
-msgstr "당신은 '비밀 번호'인증을 선택하지만, 비밀 번호를 지정하지 않았습니다."
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "비밀번호 인증 방식을 선택하셨지만 비밀번호를 지정하지 않았습니다."
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Tor 설정 파일 선택."
+msgstr "토르 설정 파일 선택"
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "파일 찾을 수 없음"
+msgstr "파일을 찾지 못하였습니다."
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr "%1 이/가 존재하지 않습니다. 새로 생성하시겠습니까?"
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr "파일 생성 실패"
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr "%1 생성 실패 [2%]"
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Tor 데이터를 위한 폴더 선택"
+msgstr "토르 데이터를 위한 폴더를 선택해주세요."
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Tor 서비스를 제거할 수 없습니다."
+msgstr "토르 서비스 정지 실패"
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr "비달리아가 토르 서비스를 정지시킬 수 없었습니다. 수동으로 정지해야 할 수도 있습니다."
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Tor 서비스를 설치할 수 없습니다."
+msgstr "토르 서비스 설치 실패"
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia는 Tor 서비스를 설치하지 못했습니다."
+msgstr "비달리아가 토르 서비스를 설치 할 수 없었습니다."
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "조정용 포트"
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "인증:"
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "주소"
+msgstr "주소:"
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr "없음"
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr "쿠키"
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr "비밀번호"
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "무작위 선택"
+msgstr "무작위 생성"
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ":"
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Tor 설정 파일"
+msgstr "토르 설정 파일"
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "지정된 설정 파일 (torrc)로 Tor 소프트웨어를 시작합니다."
+msgstr "토르를 지정된 설정 파일로 실행 (torrc)"
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "귀하의 설정 파일의 경로를 지정하십시오."
+msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "찬아보기"
+msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "데이터 디렉토리"
+msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "다음의 디렉토리에 Tor 소프트웨어 데이터를 저장합니다."
+msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Tor 소프트웨어의 데이터를 저장하는데 사용될 폴더 선택"
-
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr "Tor 제어"
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "TCP 연결 사용 (제어포트)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "경로:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Unix 도메인 소켓(ControlSocket) 사용"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "현재 torrc 편집"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "주의 : 이것은 현재 로드된 torrc 파일을 수정할 수 있습니다."
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket 경로가 존재하지 않습니다."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr "지정된 토르 구성 파일의 위치는 시스템의 현재 8비트 문자 인코딩으로 표현할 수 없는 문자가 포함되어 있습니다."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr "지정된 토르 데이터 디렉토리 위치는 시스템의 현재 8비트 문자 인코딩으로 표현할 수 없는 문자가 포함되어 있습니다."
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "경고"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "torrc 경로를 바꾸었습니다. Tor를 다시 시작하기를 원하십니까?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor 환경설정 파일 (torrc);;All Files (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Tor 소켓 경로를 위해 사용될 파일 선택"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "제어 포트를 자동적으로 설정"
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
msgstr ""
-"Vidalia는 Tor 서비스를 제가하지 못했습니다.\n"
-"\n"
-"수동적으로 제거해 주십시오."
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
-msgstr "언어"
+msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Vidalia에서 사용될 언어 선택"
+msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
-msgstr "스타일"
+msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Vidalia의 인터페이스 스타일을 선택하십시오."
+msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia는 선택된 언어 번역을 읽지 못했습니다."
+msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "since:"
+msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "설정 숨기기"
+msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "설정 보이기"
+msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
-msgstr "Tor 대역폭 사용"
+msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "재시작"
+msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "비율 받기"
+msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "바율 보내기"
+msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "항상 위에"
+msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "스타일"
+msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "대역폭 그래프의 투명도 변경"
+msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% 불투명"
+msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "저장"
+msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "취소"
-
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr "HTTPS 브릿지 요청을 시작하는중..."
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr "%1:%2로 연결하는중..."
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr "브릿지를 위한 HTTPS 요청을 보내는중.."
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr "브릿지들의 리스트를 다운로드중..."
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr "브릿지 다운도드 중"
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr "브릿지들을 다운로드 하는데 실패 하였습니다: %1"
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr "브릿지 요청을 재시도중..."
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr "국가"
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr "# 클라이언트들"
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr "다음 국가의 고객은 %1 이후 릴레이를 사용해야 합니다."
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr "브리지 사용수 요약"
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr "클라이언트 요약"
+msgstr ""
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
-msgstr "새로운"
+msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
-msgstr "열기"
+msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
-msgstr "연결 중"
+msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
-msgstr "실패"
+msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
-msgstr "닫힌"
+msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
-msgstr "알 수 없는"
+msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<경로가 비어있음>"
+msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "연결"
+msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "상태"
+msgstr ""
+#: circuitlistwidget.cpp:87
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "회선 쪽을 확대"
+msgstr ""
+#: circuitlistwidget.cpp:89
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "회선 닫기 (Del)"
+msgstr ""
+#: circuitlistwidget.cpp:110
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "흐름 닫기 (Del)"
+msgstr ""
+#: configdialog.cpp:77
msgctxt "ConfigDialog"
msgid "General"
-msgstr "일반"
+msgstr ""
+#: configdialog.cpp:81
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "네트워크"
+msgstr ""
+#: configdialog.cpp:85
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "공유하는"
+msgstr ""
+#: configdialog.cpp:89
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "서비스들"
+msgstr ""
+#: configdialog.cpp:93
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "겉모습"
+msgstr ""
+#: configdialog.cpp:97
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "고급"
+msgstr ""
+#: configdialog.cpp:111
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "도움말"
+msgstr ""
+#: configdialog.cpp:196
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "설정을 저장하는데 실패"
+msgstr ""
+#: configdialog.cpp:198
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia는 당신의 %1 설정을 저장할수 없었습니다."
+msgstr ""
+#: configdialog.cpp:225
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "셋팅을 저장하는데 실패"
+msgstr ""
+#: configdialog.cpp:227
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vadalia는 Tor의 %1 설정을 적용할 수 없습니다."
+msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "설정"
+msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia는 토르에 연결할 수 없습니다. (%1)"
+msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "제어 소켓은 연결되지 않습니다."
+msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
-msgstr "비밀번호가 필요합니다."
+msgstr ""
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "나의 비밀번호를 저장"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr ""
+#: controlpasswordinputdialog.ui:99
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia는 비밀번호를 요구하는 Tor 프로세스 구동에 연결하려 합니다. 관리자 비밀번호를 입력하십시오:"
+msgid "Remember my password"
+msgstr ""
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "컨트롤 소켓이 연결되있지 않았습니다."
+msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "제어 명령 전달 오류 [%1]"
+msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "데이터의 라인을 읽는 동안 소켓 연결이 끊어졌습니다."
+msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "잘못된 제어 답신 [%1]"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Afghanistan"
-msgstr "아프가니스탄"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
-msgstr "안도라"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
-msgstr "앙골라"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
-msgstr "취소"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
-msgstr "아르메니아"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
-msgstr "호주"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
-msgstr "아제르바 이잔"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
-msgstr "바하마"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
-msgstr "방글라데쉬"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
-msgstr "바베이도스"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
-msgstr "벨라루스"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
-msgstr "벨기에"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
-msgstr "벨리즈"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
-msgstr "부탄"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
-msgstr "볼리비아"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
-msgstr "보스니아 헤르체고비나"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
-msgstr "보츠와나"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
-msgstr "브라질"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
-msgstr "브루나이"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
-msgstr "불가리아"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
-msgstr "부르 키 나 파소"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
-msgstr "부룬디"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
-msgstr "캄보디아"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
-msgstr "카메룬"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
-msgstr "캐나다"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
-msgstr "카보베르데"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
-msgstr "중앙 아프리카 공화국"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
-msgstr "차드"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
-msgstr "칠레"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
-msgstr "중국"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
-msgstr "콜롬비아"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
-msgstr "코모로스"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
-msgstr "콩고 민주 공화국"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
-msgstr "콩고"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
-msgstr "코스타리카"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
-msgstr "코트디부아르"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
-msgstr "크로아티아"
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cuba"
-msgstr "쿠바"
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cyprus"
-msgstr "키프로스"
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Czech Republic"
-msgstr "체코 공화국"
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Denmark"
-msgstr "덴마크"
-
-msgctxt "CountryInfo"
-msgid "Djibouti"
-msgstr "지부티"
-
-msgctxt "CountryInfo"
-msgid "Dominica"
-msgstr "도미니카"
-
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
-msgstr "도미니카 공화국"
-
-msgctxt "CountryInfo"
-msgid "Ecuador"
-msgstr "에콰도르"
-
-msgctxt "CountryInfo"
-msgid "Egypt"
-msgstr "이집트"
-
-msgctxt "CountryInfo"
-msgid "El Salvador"
-msgstr "엘살바도르"
-
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
-msgstr "적도 기니"
-
-msgctxt "CountryInfo"
-msgid "Eritrea"
-msgstr "에리트레아"
-
-msgctxt "CountryInfo"
-msgid "Estonia"
-msgstr "에스토니아"
-
-msgctxt "CountryInfo"
-msgid "France"
-msgstr "프랑스"
-
-msgctxt "CountryInfo"
-msgid "Gabon"
-msgstr "가봉"
-
-msgctxt "CountryInfo"
-msgid "Gambia"
-msgstr "감비아"
-
-msgctxt "CountryInfo"
-msgid "Georgia"
-msgstr "그루지야"
-
-msgctxt "CountryInfo"
-msgid "Germany"
-msgstr "독일"
-
-msgctxt "CountryInfo"
-msgid "Ghana"
-msgstr "가나"
-
-msgctxt "CountryInfo"
-msgid "Grenada"
-msgstr "그레나다"
-
-msgctxt "CountryInfo"
-msgid "Guatemala"
-msgstr "과테말라"
-
-msgctxt "CountryInfo"
-msgid "Guinea"
-msgstr "기니"
-
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
-msgstr "기니 비사우"
-
-msgctxt "CountryInfo"
-msgid "Guyana"
-msgstr "가이아나"
-
-msgctxt "CountryInfo"
-msgid "Hong Kong"
-msgstr "홍콩"
-
-msgctxt "CountryInfo"
-msgid "Haiti"
-msgstr "아이티"
-
-msgctxt "CountryInfo"
-msgid "Honduras"
-msgstr "온두라스"
-
-msgctxt "CountryInfo"
-msgid "Israel"
-msgstr "이스라엘"
-
-msgctxt "CountryInfo"
-msgid "Italy"
-msgstr "이탈리아"
-
-msgctxt "CountryInfo"
-msgid "Jamaica"
-msgstr "자마이카"
-
-msgctxt "CountryInfo"
-msgid "Japan"
-msgstr "일본"
-
-msgctxt "CountryInfo"
-msgid "Jordan"
-msgstr "요르단"
-
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
-msgstr "카자흐스탄"
-
-msgctxt "CountryInfo"
-msgid "Kenya"
-msgstr "케냐"
-
-msgctxt "CountryInfo"
-msgid "Kiribati"
-msgstr "키리바시"
-
-msgctxt "CountryInfo"
-msgid "Kuwait"
-msgstr "쿠웨이트"
-
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
-msgstr "키르 기스 스탄"
-
-msgctxt "CountryInfo"
-msgid "Laos"
-msgstr "라오스"
-
-msgctxt "CountryInfo"
-msgid "Latvia"
-msgstr "라트비아"
-
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr "레바논"
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr "레소토"
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr "라이베리아"
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr "리히텐슈타인"
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr "리투아니아"
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr "룩셈부르크"
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr "마케도니아"
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr "마다가스카"
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr "말라위"
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr "말레이시아"
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr "말리"
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr "몰타"
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr "마샬 군도"
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr "모리 타니"
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr "모리셔스"
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr "미크로네시아"
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr "몰르더바"
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr "모나코"
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr "몽골"
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr "몬테네그로"
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr "모로코"
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr "모잠비크"
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr "나미비아"
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr "나우루"
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr "네팔"
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr "네덜란드"
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr "뉴질랜드"
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr "니카라과"
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr "니제르"
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr "나이지리아"
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr "노르웨이"
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr "오만"
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr "파키스탄"
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr "팔라우"
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr "팔레스타인"
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr "파나마"
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr "파푸아 뉴 기니"
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr "파라과이"
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr "페루"
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr "필리핀"
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr "폴란드"
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr "포르투갈"
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr "콰타르"
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr "로마니아"
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr "러시아"
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr "르완다"
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr "세인트 키츠와 네이스"
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr "세인트 루시다"
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr "세인트 빈센트와 그레나딘"
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr "사모아"
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr "산마리노"
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr "상투메와 프린시페"
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr "사우디 아라비아"
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr "세네갈"
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr "세르비아"
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr "Seychelles"
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr "시에라 리온"
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr "싱가포르"
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr "슬로바키아"
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr "슬로베니아"
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr "솔로몬 제도"
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr "소말리아"
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr "남 아프리카"
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr "스페인"
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr "스리랑카"
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr "수단"
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr "수리남"
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr "스와질랜드"
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr "스웨덴"
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr "스위스"
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr "시리아"
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr "타지키스탄"
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr "탄자니아"
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr "태국"
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr "티모르 (동티모르)"
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr "토고"
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr "통가"
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr "트리니다드 & 토바고"
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr "튀니지"
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr "터키"
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr "투르크메니스탄"
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr "투발루"
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr "우간다"
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr "유크레인"
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr "아랍 에미리트"
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr "영국"
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr "미국"
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr "우르과이"
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr "우즈베키스탄"
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr "바누아투"
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr "바티칸"
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr "베네수엘라"
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr "베트남"
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr "서부 사하라"
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr "예멘"
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr "잠비아"
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr "짐바브웨"
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "자이르"
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr "알바니아"
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr "알제리"
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr "오스트리아"
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr "바레인"
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr "베냉"
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr "에토피아"
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr "피지"
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr "핀란드"
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr "그리스"
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr "괌"
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr "헝가리"
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr "아이슬란드"
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr "인도"
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr "인도네시아"
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr "이란"
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr "이라크"
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr "아일랜드"
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr "조선민주주의인민공화국"
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr "대한민국"
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr "리비아"
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr "몰디브"
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr "맥시코"
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr "미얀마"
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr "타이완"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "충돌 보고 제안"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia에 오류가 발생하여 프로그램 종료가 필요합니다."
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Vidalia 재시작"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "재시작 하지 않음"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Vidalia를 재시작 할 수 없음"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr "자동적으로 Vidalia를 재시작 할 수 없습니다. Vidalia를 수동적으로 재시작시켜주십시오."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "티켓(ticket)을 입력하십시오."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"문제를 식별하고 해결에 도움이 되는 충돌 보고서는 Vidalia 개발자에게 보낼 수 있게 만들어졌습니다. 제출된 보고서는 개인 식별 "
-"정보를 포함하지 않습니다."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr "충돌 보고서에 해당하는 다음과 같은 파일과 여러분이 응용 프로그램이 충돌되기 이전에 뭘하고 있었는지에 대한 설명과 함께 "
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr "실행 파일 (*.exe)"
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr "Tor의 경로를 선택"
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "프록시 실행파일을 선택하세요"
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr "Tor 실행파일의 이름을 적으셔야 합니다."
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr "Vidalia를 컴퓨터가 시작할때 자동 실행"
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr "찾기"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Vidalia가 실행될때 자동으로 Tor 실행"
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "프록시 프로그램 (옵션)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Tor가 실행될때 프록시 자동으로 프록시 프로그램을 시작하게 하기"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "프록시 프로그램 문제 발견."
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr "소프트웨어 업데이트"
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr "자동으로 새로운 소프트웨어 업데이트를 확인"
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr "지금 확인"
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr "%1 KB/s"
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr "%1 KB"
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr "%1 MB"
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr "%1 GB"
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr "받음:"
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr "보냄:"
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr "주신 XML 파일은 내용이 유효하지 않습니다."
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr "내용의 끝까지 도달하였습니다."
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr "내용의 시작까지 도달하였습니다."
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr "단어를 이 내용에서 찾을수 없습니다."
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr "%1의 결과를 발견"
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr "Vidalia 도움말"
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr "뒤로"
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr "이전 페이지로 가기 (Backspace)"
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr "Backspack"
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr "앞으로"
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr "다음 페이지로 가기 (Shift+Backspace)"
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr "Shift + Backspace"
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr "홈"
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr "홈페이지로 이동하기 (Ctrl+H)"
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr "Ctrl+H"
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr "찾기"
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "단어나 문장을 이 페이지에서 찾기 (Ctrl+F)"
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr "닫기"
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr "Vidalia 도움말 닫기"
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr "Esc"
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr "찾기:"
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr "이전 찾기"
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr ""
+#: helpbrowser.ui:187
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "다음 찾기"
+msgstr ""
+#: helpbrowser.ui:221
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "대소문자 구분"
+msgstr ""
+#: helpbrowser.ui:231
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "전체 단어 전용"
+msgstr ""
+#: helpbrowser.ui:305
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "도움말 항목"
+msgstr ""
+#: helpbrowser.ui:260
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "내용"
+msgstr ""
+#: helpbrowser.ui:350
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "검색"
+msgstr ""
+#: helpbrowser.ui:362
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "찾기 :"
+msgstr ""
+#: helpbrowser.ui:405
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "발견된 문서들"
+msgstr ""
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr "도움말 내용을 로딩하는데 실패함:"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+msgstr ""
+#: helptextbrowser.cpp:72
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "외부 링크 열기"
+msgstr ""
+#: helptextbrowser.cpp:76
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
-"Vidalia는 당신의 기본 브라우저에서 선택한 링크를 열수 있습니다. 만약 당신의 브라우저가 Tor를 사용할 수 있게 설정되어있다 "
-"않다면 링크의 요청은 익명화가 안 되있을수 있습니다."
+#: helptextbrowser.cpp:78
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Vidalia가 당신의 웹브라우저에서 링크를 열게 하고 싶습니까?"
+msgstr ""
+#: helptextbrowser.cpp:88
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "링크 열기 실패"
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia는 당신의 브라우저에서 선택한 링크를 여는데 실패하였습니다. 그래도 URL을 복사하여 브라우저로 여실 수 있습니다"
+#: helptextbrowser.cpp:90
msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr "도움말 파일을 여는데 실패함:"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+#: licensedialog.ui:13
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "라이센스 정보"
+msgstr ""
+#: licensedialog.ui:43
msgctxt "LicenseDialog"
msgid "License"
-msgstr "라이센스"
+msgstr ""
+#: licensedialog.ui:76
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "크레딧"
+msgstr ""
+#: logevent.cpp:57
msgctxt "LogEvent"
msgid "Debug"
-msgstr "디버그"
+msgstr ""
+#: logevent.cpp:58
msgctxt "LogEvent"
msgid "Info"
-msgstr "정보"
+msgstr ""
+#: logevent.cpp:59
msgctxt "LogEvent"
msgid "Notice"
-msgstr "통지"
+msgstr ""
+#: logevent.cpp:60
msgctxt "LogEvent"
msgid "Warning"
-msgstr "경고"
+msgstr ""
+#: logevent.cpp:61
msgctxt "LogEvent"
msgid "Error"
-msgstr "오류"
+msgstr ""
+#: logevent.cpp:62
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "알 수 없음"
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr "디버그"
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "정보"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "주의"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "경고"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "오이"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "알 수 없음"
+msgstr ""
+#: mainwindow.ui:233
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Tor 시작"
+msgstr ""
+#: mainwindow.ui:443
msgctxt "MainWindow"
msgid "Exit"
-msgstr "종료"
+msgstr ""
+#: mainwindow.ui:304
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "대역폭 그래프"
+msgstr ""
+#: mainwindow.ui:317
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "메시지 로그"
+msgstr ""
+#: mainwindow.cpp:348
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "네트워크 맵"
+msgstr ""
+#: mainwindow.cpp:354
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "제어판"
+msgstr ""
+#: mainwindow.ui:380
msgctxt "MainWindow"
msgid "Settings"
-msgstr "설정"
+msgstr ""
+#: mainwindow.ui:430
msgctxt "MainWindow"
msgid "About"
-msgstr "정보"
+msgstr ""
+#: mainwindow.ui:367
msgctxt "MainWindow"
msgid "Help"
-msgstr "도움말"
+msgstr ""
+#: mainwindow.cpp:1391
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "새로운 ip로..."
+msgstr ""
+#: mainwindow.cpp:437
msgctxt "MainWindow"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
+#: mainwindow.cpp:438
msgctxt "MainWindow"
msgid "Ctrl+B"
-msgstr "Ctrl+B"
+msgstr ""
+#: mainwindow.cpp:439
msgctxt "MainWindow"
msgid "Ctrl+L"
-msgstr "Ctrl+L"
+msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
-msgstr "Ctrl+N"
+msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
-msgstr "Ctrl+?"
+msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
-msgstr "Ctrl+I"
+msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
-msgstr "보기"
+msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
-msgstr "Vidalia 도움말"
+msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "웹 브라우저 실행을 실패함"
+msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia가 구성된 웹 브라우저를 시작할 수 없습니다"
+msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "IM 클라이언트 시작 실패"
+msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia가 구성된 IM 클라이언트를 시작할 수 없습니다"
+msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "프록시 서버 시작 실패"
+msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia가 구성된 프록시 서버를 시작할 수 없습니다"
+msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "릴레이 디렉토리에 연결"
+msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "암호화된 디렉터리 연결을 설정"
+msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "네트워크의 상태를 가져오는중"
+msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "네트워크의 상태를 요청중"
+msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "권한 인증서를 로딩중"
+msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "릴레이 정보를 요청중"
+msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "릴레이 정보를 로딩중"
+msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Tor 네트워크에 연결중"
+msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "토르 서킷의 연결을 성공"
+msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Tor 네트워크에 연결 성공!"
+msgstr ""
+#: mainwindow.cpp:612
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "알 수없는 시작 상태"
+msgstr ""
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "잡동사니"
+msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "계정 불일치"
+msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
-msgstr "완료"
+msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "연결이 거부됨"
+msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "연결 타임아웃"
+msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "읽기 / 쓰기 오류"
+msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "호스트로의 연결 경로가 없음"
+msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "리소스 부족"
+msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
-msgstr "알 수 없음"
+msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor가 실행중이지 않습니다"
+msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor는 종료중 입니다"
+msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
-msgstr "당장 Tor 중지"
+msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Tor 중지"
+msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Tor 소프트웨어 시작중"
+msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Tor 시작하기"
+msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Tor 시작 오류"
+msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
-msgstr "Vidalia에서 Tor를 시작할 수 없습니다. Tor 실행 파일의 이름과 위치가 올바른지 확인하십시오."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Tor에 연결"
+msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "연결 오류"
+msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "릴레이를 사용할 수 있습니다"
+msgstr ""
+
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "종료 오류"
+msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia는 Tor 소프트웨어를 멈출 수 없습니다."
+msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "예기치 않은 오류"
+msgstr ""
+
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Tor에 인증 중"
+msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "쿠키 인증을 요함"
+msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
-msgstr "Tor를 사용하기 위해 Vadalia에서 인증 쿠키 내용을 보내주어야 하지만, 쿠키를 찾을 수 없습니다."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "'control_auth_cookie' 파일을 직접 찾아보시겠습니까?"
+msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "데이터 디렉토리"
+msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "제어 쿠키 (control_auth_cookie)"
+msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "이벤트 등록 오류"
+msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-msgstr "Vidalia는 몇몇 이벤트를 등록 할 수 없습니다. Vidalia의 여러 기능은 작동되지 않습니다."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
-msgstr "인증 오류"
+msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia가 Tor 프로그램의 인증을 실패하였습니다. (%1)"
+msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
-msgstr "컨트롤 포트 인증 설정을 확인하여 주십시오."
+msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "토르 업데이트 가능"
+msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"지금 설치된 Tor의 버전은 날짜가 지나서 더이상 추천되지 않습니다. Tor 웹사이트에 접속하셔서 최신 버전을 받아 주십시오."
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "토르 웹사이트 : %1"
+msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
-msgstr "다음 연결은 기존의 연결과 다르게 나타납니다."
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "새로운 계정 생성 실패"
+msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "포트 포워딩 실패"
+msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia에서 자동 포트 포워딩을 구성할 수 없습니다"
+msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia 제어판"
+msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
-msgstr "상태"
+msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
-msgstr "Vidalia 단축 아이콘"
+msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "릴레이 설정"
+msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
-msgstr "중계 기능을 설정해서 네트워크를 키울 수 있게 돕기"
+msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
-msgstr "네트워크 보기"
+msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
-msgstr "Tor 네트워크 지도를 봅니다."
+msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
-msgstr "새 ID를 사용하기"
+msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
-msgstr "확인 이후의 연결은 새롭게 표시됩니다."
+msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
-msgstr "최근 대역폭 사용 보기"
+msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
msgid "View log message history"
-msgstr "로그 보기"
+msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
msgid "View help documentation"
-msgstr "도움말 보기"
+msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
msgid "Configure Vidalia"
-msgstr "Vidalia 설정"
+msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
msgid "View version and license information"
-msgstr "버전과 라이선스 정보 보기"
+msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
msgid "Exit Vidalia"
-msgstr "Vadalia 종료"
+msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
msgid "Show this window on startup"
-msgstr "시스템 시작시 이 화면 표시"
+msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
msgid "Hide"
-msgstr "숨기기"
+msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
msgid "Hide this window"
-msgstr "이 화면을 숨기기"
+msgstr ""
+#: mainwindow.cpp:1210
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 소프트웨어를 재시작 할 수 없습니다. 프로세스가 작동중인지 작업 "
-"관리자에서 확인하여 주십시오,."
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr "현재 설치된 Tor 버전의 유효 기간이 경과하거나 더 이상 권장되지 않습니다."
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr "설치할 최근의 패키지가 있는지 확읺애 보시겠습니까?"
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr "잠재적으로 안전하지 않은 연결"
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr "사용자의 익명성을 위해 Tor에서 자동으로 연결을 끊었습니다."
-
-msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr "업데이트 실패"
-
-msgctxt "MainWindow"
-msgid "Your software is up to date"
-msgstr "최신 소프트웨어 사용중"
-
-msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr "현재 버전이 최신 Tor 패키지 입니다."
-
-msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr "설치 실패"
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia는 소프트웨어 업데이트를 실패했습니다."
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
-msgstr "다음과 같은 오류가 발생하였습니다:"
-
-msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+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 ""
-"이 연결을 통해 보낸 아무것이나 모니터링 할 수 있습니다. 가능하면 응용 프로그램의 설정을 확인 SSL (Secure Socket "
-"Layer)같은 암호화된 프로토콜 만을 사용하시기 바랍니다."
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "실패 (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "현재 중계가 종료중입니다. 중계를 지금 종료하려면 멈춤 버튼을 다시 눌러주십시오."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1에서 %2로 부팅 "
-msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
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."
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
msgstr ""
-"Vidalia는 Tor가 예기치 못하게 종료된 것을 감지했습니다.\n"
-"\n"
-"최근의 경고나 오류 메시지를 확인하여 주십시오."
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probably Telnet)"
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(아마 이메일 클라이언트)"
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "응용 프로그램 %1 중 하나는 포트 %2에 잠재적으로 암호화되지 않고 안전하지 않은 연결을 만드는 것 같습니다."
+#: messagelog.cpp:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of "
+"interest to Tor developers."
+msgstr ""
+#: messagelog.cpp:189
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "필터 설정 오류"
+msgstr ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vadila는 Tor의 로그 이벤트에 등록할 수 없습니다."
+msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "로그 파일 열기 실패"
+msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia는 선택된 로그 파일을 열 수 없습니다."
+msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "로그 파일 이름 필요"
+msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "log 파일을 저장하려면 파일 이름을 적어 주십시오."
+msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "로그 파일 선택"
+msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "로그 메세지 저장"
+msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "텍스트 파일 (*.txt)"
+msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
+
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "메시지 로그 찾기"
+msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
-msgstr "찾기:"
+msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "발견되지 않음"
+msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "0개를 찾았습니다"
+msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "메세지 로그"
+msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "메세지 필터"
+msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "메세지 필터 설정"
+msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "히스토리 크기..."
+msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "표시할 메세지의 최댓값 설정"
+msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
-msgstr "초기화"
+msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "메세지 로그로부터 모든 메세지 초기화 (Ctrl+E)"
+msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
-msgstr "복사"
+msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "클립 보드에 선택한 메시지를 복사 (Ctrl-C)"
+msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
-msgstr "모두 선택"
+msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "모든 메시지 선택 (Ctrl + A)"
+msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
-msgstr "모두 저장"
+msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "파일에 모든 메시지를 저장"
+msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "선택한 것을 저장하기"
+msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "선택된 메시지를 파일에 저장"
+msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
-msgstr "설정"
+msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "메시지 로그 설정을 조정"
+msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
-msgstr "도움말"
+msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "도움말을 띄우기"
+msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
-msgstr "닫기"
+msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "메시지 기록 닫기"
+msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
-msgstr "ESC"
+msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
-msgstr "찾기"
+msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "검색어가 포함된 메시지 모두 찾기 (Ctrl-F)"
+msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
-msgstr "시간"
+msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
-msgstr "유형"
+msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
-msgstr "메시지"
+msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "메시지 로스 설정 저장"
+msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
-"중계가 현재 작동중 입니다. 중계를 중단하시면 클라이언트와의 결이 끊어집니다. 클라이언트가 새로운 릴레이를 찾을 수 있게 시간을 "
-"주시겠습니까?"
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "바뀐 설정 원래대로 돌리기"
+msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "취소"
+msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "메세지 필터"
+msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
-msgstr "오류"
+msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
-msgstr "경고"
+msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
-msgstr "알림"
+msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
-msgstr "정보"
+msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
-msgstr "디버그"
+msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "메시지 로그 역사"
+msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "메시지 로그 창에 표시할 메시지가 많습니다."
+msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
-msgstr "세시지"
-
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr "찾아보기"
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr "지금부터 새로운 로그 메시지를 파일에 자동 저장"
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr "자동으로 파일에 새 로그 메시지를 저장"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "기초"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor 상태"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "고급"
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "항상 새 로그 메시지를 저장합니다"
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr "무언가가 잘못되거나 Tor가 처리할 수 없는 경우 나타나는 메시지"
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr "Tor에 오류가 발생하면 나오는 메시지"
+msgstr ""
+#: messagelog.ui:356
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
-"during normal Tor operation and are \n"
-"not considered errors, but you may \n"
-"care about."
-msgstr "Tor가 정상적으로 작동할 때 가끔 나오는 살펴볼 만한 메시지"
+msgid "Always Save New Log Messages"
+msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
-msgstr "Tor 운용 동안 자주 나타나는 메시지"
+msgid "Browse"
+msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
-msgstr "Tor 개발자 분들이 흥미를 가질만한 길고 어려운 메시지"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+#: messagelog.ui:397
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
-"\n"
-"%2."
+msgid "Automatically save new log messages to a file"
msgstr ""
-"파일 %1를(을) 쓸 수 없습니다.\n"
-"\n"
-"%2."
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
-msgstr "Tor 네트워크 지도"
+msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "새로고침"
+msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "토르 릴레이와 연결 목록 새로고침"
+msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
-msgstr "도움말"
+msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "네트워크 지도 도움말 보이기"
+msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "네트워크 지도 도움말 보이기"
+msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
-msgstr "닫기"
+msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "네트워크 지도를 닫습니다"
+msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "확대"
+msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "네트워크 지도를 확대"
+msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "축소"
+msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "네트워크 지도를 축소"
+msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "화면에 맞추기"
+msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "화면에 맞게 크기 조정"
+msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl + Z"
-
-msgctxt "NetViewer"
-msgid "Relay Not Found"
-msgstr "릴레이를 찾을 수 없습니다."
-
-msgctxt "NetViewer"
-msgid "No details on the selected relay are available."
-msgstr "선택된 중계소의 정보를 볼 수 없습니다."
-
-msgctxt "NetViewer"
-msgid "Unknown"
-msgstr "알 수없음"
-
-msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr "전체 화면"
-
-msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr "네트워크 지도를 전체 화면으로 보기"
-
-msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "잘못된 브릿지"
+msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "주어진 Bridge 식별자는 불량입니다."
+msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "복사 (Ctrl+C)"
+msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
-msgstr "인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
-msgstr "방화벽에서 허용된 포트 하나는 입력하여야 합니다."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1'은 잘못된 포트 번호입니다."
+msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "인터넷에 접속할 때 프록시가 필요한지 확인해 보십시오."
+msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "인터넷에 연결할 때 프록시를 사용합니다"
+msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "프록시 설정"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "사용자 이름:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "비밀번호:"
+msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "포트"
+msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr "방화벽이 릴레이에 연결할 대 허용된 포트만들 사용하도록 확인합니다"
+msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "내 방화벽은 특정 포트에 연결할 수 있습니다"
+msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "방화벽 설정"
+msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "허용된 포트"
+msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
-msgstr "경로 요청을 암호화라려면 선택하십시오. 그리고, Tor 네트워크에 접속할 때 브릿지 중계를 사용하십시오."
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "내 ISP는 Tor 네트워크 연결을 막습니다."
+msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "브릿지 설정"
-
-msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr "브릿지 추가"
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr "선택된 브릿지를 목록에서 제외"
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr "선택된 브릿지를 복사하기"
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr "지금 브리지 찾기"
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">그럼 제가 어떻게 브릿지를 찾을 수 있습니까?</a>"
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">어떻게 브릿지를 찾을 수 있습니까?</a>"
-
-msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
-msgstr "현재 사용 가능한 새로운 브릿지가 없습니다. 기다렸다 다시 시도해 보시거나, 다른 브릿지를 찾아서 시도하십시오."
-
-msgctxt "NetworkPage"
-msgid "Click Help to see other methods of finding new bridges."
-msgstr "새로은 브릿지를 찾는 다른 방법 보기"
-
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "주소:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "유형:"
+msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "프록시 유형을 선택해 주십시오."
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+#: networkpage.ui:295
msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgid "Add a Bridge:"
+msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
+msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
-msgstr "동의"
+msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
-msgstr "거부"
+msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "온라인"
+msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "동면"
+msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "오프라인"
+msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "위치 :"
+msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP 주소 :"
+msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "플랫폼 :"
+msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "대역폭 :"
+msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "가동 시간 :"
+msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "최종 업데이트 :"
+msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr "복사"
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr "동면"
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr "온라인"
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
-msgstr "오프라인"
-
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr "알 수 없음"
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr "Relay 세부 사항"
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr "요약"
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr "이름:"
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr "상태:"
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr "위치:"
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr "IP 주소:"
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr "플랫폼:"
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr "대역폭:"
+msgid "%1 days "
+msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
-msgstr "가동 시간:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
-msgstr "연락처:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
-msgstr "마지막 업데이트:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
-msgstr "지시자:"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "오프라인"
+msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "동면중"
+msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "중계소"
+msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "중계소 확대"
+msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "중개로 %1개 라인"
+msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "복사"
+msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "별명"
+msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "인증번호"
+msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "브릿지 사용 불가"
+msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
-msgstr "검열당하고 있는 사용자가 사용 할 수 있는 브릿지를 만들도록 설정했지만, 사용하고 있는 Tor에서는 지원하지 않습니다."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
-msgstr "Tor을 업그레이드 하시거나 Tor가 일반적인 중계를 하도록 설정해 주십시오."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "브릿지 중계가 작동중"
+msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "중계소 이름과 포트는 필수입니다."
+msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "클라이언트만 작동"
+msgstr ""
+#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
-msgstr " Tor 네트워크를 위하여 트래픽을 중계합니다.(추천)"
+msgstr ""
+
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "중계 포트"
+msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "중계 디렉토리를 전달하는 것을 허용(추천)"
+msgstr ""
+
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "자동 포트 포워딩 구성"
+msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
-msgstr "테스트"
+msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "포트 포워딩에 대한 도움말 보기"
+msgstr ""
+
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "디렉토리 포트 :"
+msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "디렉토리 포트 번호"
+msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "연락처 :"
+msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "귀하의 중계 이름"
+msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr "사용자와 다른 중계소와 통신할 수 있는 포트"
+msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "별명:"
+msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "기본 설정"
+msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
-msgstr "인터넷 다운로드 속도는 빠르지만 업로드 속도가 느릴 경우, 업로드 속도를 입력해 주십시오."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
+msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
+msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
+msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
-msgstr "사용자 설정"
+msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "귀하의 인터넷 연결과 가장 비슷한 연결을 선택하여 주십시오."
+msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "대역폭 제한에 대한 도움말 보기"
+msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "평균 속도"
+msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "장기적 평균 대역폭 제한"
+msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "최대 속도"
+msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "최고 대역폭 제한"
+msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr "최대 대역폭은 평균 대역폭보다 같거나 더 커야 합니다. 최대 대역폭과 평균 대역폭은 20KB/S 이상이어야 합니다."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+#: serverpage.ui:400
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "대역폭 제한"
+msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "6660 - 6669, 6697번 포트"
+msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "110, 143, 993, 995번 포트"
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr "매일 수신 (POP. IMAP)"
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr "체크박스에 없는 포트"
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr "기타 서비스"
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "706 및 1863, 5050, 5190, 5222, 5223, 8300, 8888 포트"
-
-msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
-msgstr "인스턴트 메시징 (IM)"
-
-msgctxt "ServerPage"
-msgid "Port 443"
-msgstr "포트번호 443"
-
-msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
-msgstr "보안 연결된 웹사이트 (SSL)"
-
-msgctxt "ServerPage"
-msgid "Port 80"
-msgstr "포트번호 80"
-
-msgctxt "ServerPage"
-msgid "Websites"
-msgstr "일반적인 웹사이트"
-
-msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
-msgstr "출구 정책에 대한 도움말 보기"
-
-msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
-msgstr "귀하의 중계를 통하여 사용자가 어떤 인터넷 자원에 접근할 수 있도록 하시겠습니까?"
-
-msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
-msgstr "Tor는 악용과 스팸 방지를 위하여, 몇몇 메일 보내기와 파일 공유를 제한합니다."
-
-msgctxt "ServerPage"
-msgid "Exit Policies"
-msgstr "출구 정책"
+msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
-msgstr "이 문자열을 다른 사람에게 줌으로써 그들이 귀하의 중계에 접근할 수 있도록 합니다."
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+#: serverpage.ui:828
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
-msgstr "이것은 다른 사람에게 줄 수 있는 귀하의 브릿지 중계의 신분입니다."
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "귀하의 중계 신원을 클립보드로 복사합니다."
+msgid "Misc Other Services"
+msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid "No Recent Usage"
-msgstr "최근 사용 없음"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+#: serverpage.ui:844
msgctxt "ServerPage"
-msgid "No clients have used your relay recently."
-msgstr "최근 귀하의 중계를 사용한 클라이언트가 없습니다."
+msgid "Instant Messaging (IM)"
+msgstr ""
+#: serverpage.ui:854
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
-msgstr "클라이언트들이 쉽게 찾아 사용할 수 있도록 브릿지를 계속 켜 두십시오."
+msgid "Port 443"
+msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid "Bridge History"
-msgstr "브릿지 내역"
+msgid "Secure Websites (SSL)"
+msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia는 귀하의 브릿지 사용 내역을 불러올 수 없습니다."
+msgid "Port 80"
+msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
-msgstr "Vidalia는 귀하 브릿지 사용 내역을 요청했지만, Tor가 잘못된 답신을 보내왔습니다."
+msgid "Websites"
+msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "The returned response was: %1"
-msgstr "받아온 답신 : %1"
+msgid "Show help topic on exit policies"
+msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
-msgstr "검열된 유저들이 Tor 네트워키에 닿을 수 있도록 돕기"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+#: serverpage.ui:979
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">누가 제 브릿지를 썼나요?</a>"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+#: serverpage.ui:764
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">이것이 무엇인가?</a>"
+msgid "Exit Policies"
+msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "자동적으로 나의 브릿지 주소 배포"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
-msgstr "중계소 목록를 미러"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+#: serverpage.ui:1061
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgid "Copy your bridge relay's identity to the clipboard"
msgstr ""
-"귀하의 중계에 대한 문제가 있을 경우 연락을 받을 수 있는 이메일 주소:귀하는 또한 PGP나 GPG 인증번호를 포함할 수도 있습니다."
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "발행되지 않은 모든 서비스를 시도하는 중 오류"
+msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr "저장을 원하는 각각의 서비스에 대하여 가상 포트 번호와 서비스 주소를 입력하여 주십시오. 다른 것을 제거해 주십시오."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
-msgstr "오류"
+msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "서비스를 선택해 주십시오."
+msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "서비스 목록 선택"
+msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "가상 포트 번호는 실제 포트 번호(1~65535) 내에 포함되어야 합니다."
+msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "목표는 주소와 포트, 주소:포트만을 포함할 수 있습니다."
+msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "디렉토리가 이미 다른 서비스에서 사용중입니다."
+msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
-msgstr "~로부터"
+msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "제공되는 숨겨진 서비스"
+msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "양파 주소"
+msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "가상 포트"
+msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
-msgstr "목표"
+msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "디렉토리 경로"
+msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "허영"
+msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "새로운 서비스를 목록에 추가"
+msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "목록에서 선택된 서비스 제가"
+msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "선택된 서비스의 양파 주소(Onion address)를 클립보드로 복사"
+msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "로컬 파일 시스템에서 탐색하고 선택된 서비스의 디렉토리를 선택합니다."
+msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Tor에 의해 만들어짐"
-
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "클립보드로 복사"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Tor 소프트웨어 작동중"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "현재 Tor 버전 %1이 작동중 입니다."
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr "Tor 소프트웨어 작동하지 않음"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-"토르 소프트웨어를 다시 시작하려면 Vidalia 제어판에서 \"토르 시작\"을 클릭하십시오. 토르가 예기치 않게 종료한 경우, 발생한 "
-"오류에 대한 자세한 내용은 위의 \"고급\"탭을 선택합니다."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-"현재 더 이상 추천되지 않는 Tor 버전 \"%1\"을 사용하고 있습니다. 중요한 보안, 안정성 및 성능 수정을 포함할 수 있는 "
-"소프트웨어의 가장 최근 버전으로 업그레이드하십시오."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-"현재 더 이상 Tor 네트워크에 사용될 수 없는 Tor 버전 \"%1\"을 사용하고 있습니다. 중요한 보안, 안정성 및 성능 수정을 "
-"포함할 수 있는 소프트웨어의 가장 최근 버전으로 업그레이드하십시오 ."
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr "귀하의 Tor 소프트웨어는 \"지원 범위 밖입니다\"."
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Tor 네트워크에 연결됨"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr "성공적으로 토르 네트워크에 연결되었습니미. 이제 응용 프로그램이 익명으로 인터넷을 사용하도록 구성할 수 있습니다."
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Tor 소프트웨어 오류"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"토르 소프트웨어에 내부 버그가 발생했습니다. bugs.torproject.org에서 토르 개발자에게 다음과 같은 오류 메시지를 "
-"알려주십시오 : \"%1\""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-"토르는 컴퓨터의 시계가 원본 \"%2\"에 비해 과거로 %1 초로 설정되었다는 것을 확인했습니다. 시계가 정확하지 않으면 토르 기능 은 "
-"가능하지 않습니다. 컴퓨터가 정확한 시간을 표시하도록 확인하십시오."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-"토르는 컴퓨터의 시계가 원본 \"%2\"에 비해 미컽로 %1 초로 설정되었다는 것을 확인했습니다. 시계가 정확하지 않으면 토르 기능 은 "
-"가능하지 않습니다. 컴퓨터가 정확한 시간을 표시하도록 확인하십시오."
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "컴퓨터의 시계 가능성이 올바르지 않습니다"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-"컴퓨터에 있는 응용 프로그램 중 하나가 토르를 통해 %1 포트에 암호화되지 않은 연결을 하도록 시도 할 수 있습니다. 토르 네트워크를 "
-"통해 암호화되지 않은 정보를 보내는 것은 위험하고 추천되지 않습니다. 귀하의 정보를 보호하기 위해, 토르는 자동으로 이 연결을 "
-"닫았습니다."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"컴퓨터에 있는 응용 프로그램 중 하나가 토르를 통해 %1 포트에 암호화되지 않은 연결을 하도록 시도 할 수 있습니다. 토르 네트워크를 "
-"통해 암호화되지 않은 정보를 보내는 것은 위험하고 추천되지 않습니다."
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr "잠재적으로 위험한 연결!"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-"응용 프로그램 중 하나가 목적지에 대한 정보를 누설할 수 있는 프로토콜을 사용하여 \"%1\"에 토르를 통해 연결을 설립했습니다. 귀하의"
-" 응용 프로그램이 원격 호스트 이름 확인에 오직 SOCKS4a 혹은 SOCKS5를 사용하도록 구성하고 확인하시기 바랍니다."
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr "알 수 없는 SOCKS 프로트콜"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"응용 프로그램 중 하나는 토르가 이해할 수 없는 프로토콜을 사용하여 토르를 통해 연결을 설정하려 했습니다.. 귀하의 응용 프로그램이 원격"
-" 호스트 이름 확인에 오직 SOCKS4a 혹은 SOCKS5를 사용하도록 구성하고 확인하시기 바랍니다."
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr "잘못된 목적지 호스트 이름"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-"응용 프로그램 중 하나는 토르가 유효한 호스트 이름으로 인식하지 못하는 \"%1\"에 토르를 통해 연결을 설정하려 했습니다. 응용 "
-"프로그램의 설정을 확인하시기 바랍니다."
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr "외부 IP 주소가 변경됨"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-"토르는 릴레이의 공용 IP 주소가 현재 %1%2임을 확인했습니다. 그것이 정확하지 않은 경우, 귀하의 중계 구성에서 '주소'옵션을 "
-"설정하는 것을 고려해보십시오."
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr "DNS 하이제킹 감지"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor는 귀하의 DNS 제공자가 존재하지 않는 도메인에 대해 잘못된 응답을 하는 것을 감지하였습니다. 몇몇의 ISP와 OpenDNS와 "
-"같은 다른 DNS 제공자들은 그들의 검색이나 광고 페이지를 표시하기 위해 이러한 행위를 한다고 알려져 있습니다."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor는 귀하의 DNS 제공자가 존재하는 도메인에 대해 잘못된 응답을 하는 것을 발견했습니다. 클라이언트가 정확한 DNS의 응답을 "
-"제공하기 위해 Tor 네트워크에 의존하므로, 귀하의 중계는 출구 중계로 구성되지 않습니다."
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr "서버 포트 접근 가능성 확인"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-"Tor 는 %1:%2로 그들 스스로 연결함으로써 귀하의 중계 서버 포트가 Tor 네트워크에서 접근할 수 있는지 확인하고 있습니다. 이 "
-"테스트는 몇 분 정도 걸릴 수 있습니다."
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr "서버 포트 접근 테스트 성공!"
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "중계 서버 포트는 Tor 네트워크에서 접근 가능합니다!"
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr "서버 포트 접근 테스트 실패"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-"귀하의 중계 서버 포트는 다른 Tor 클라이언트에서 접근할 수 없습니다. 이것은 당신이 포트 포워딩을 설정해야하는 라우터 또는 방화벽 "
-"뒤에 있는 경우 이 문제가 발생할 수 있습니다. %1: %2이(가) 올바른 IP 주소와 서버 포트가 아닌 경우, 귀하의 중계의 구성을 "
-"확인하시기 바랍니다."
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr "디렉토리 포트 접근성 확인"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-"토르는 중계의 디렉토리 포트가 %1:: %2에 자체작으로 연결하여 토르 네트워크에서 연결할 수 있는지 확인하기 위해 노력하고 있습니다. "
-"이 테스트는 몇 분 정도 걸릴 수 있습니다."
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr "디렉토리 포트 접근 가능성 테스트 성공!"
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "중계의 디렉토리 포트는 Tor 네트워크에서 접근이 가능합니다."
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr "디렉토리 포트 접근성 테스트 실패"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-"귀하의 중계 서버 포트는 다른 Tor 클라이언트에서 접근할 수 없습니다. 이것은 당신이 포트 포워딩을 설정해야하는 라우터 또는 방화벽 "
-"뒤에 있는 경우 이 문제가 발생할 수 있습니다. %1:%2이(가) 올바른 IP 주소와 서버 포트가 아닌 경우, 귀하의 중계의 구성을 "
-"확인하시기 바랍니다."
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr "중계 설명자가 거부됨"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"클라이언트가 당신의 중계에 연결할 수 있도록 하는 귀하의 중계의 설명은, %1 : %2 디렉토리 서버에 의해 거부되었습니다. 주어진 "
-"이유는 다음과 같습니다 : %3"
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr "중계 온라인"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
msgstr ""
-"당신의 중계는 이제 온라인 상태이고 토르 클라이언트가 사용할 수 있습니다. 좀 더 클라이언트가 귀하의 중계에 대해 알게 됨으로 몇 시간 "
-"이내에 대역폭 그래프로 표시됨으로써 네트워크 트래픽의 증가가 나타납니다. 토르 네트워크에 기여해 주셔서 감사합니다!"
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
-msgstr "새로운 것"
+msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
-msgstr "풀기"
+msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
-msgstr "연결중"
+msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
-msgstr "열기"
+msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
-msgstr "실패 "
+msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
-msgstr "닫기"
+msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
-msgstr "시도"
+msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
-msgstr "리매핑"
+msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
-msgstr "알수없음"
+msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
-msgstr "프로세스 %1은(는) 멈추기를 실패했습니다. [%2]"
+msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Tor 서비스는 설치되지 않았습니다."
+msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Tor 서비스를 시작하지 못했습니다."
+msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "제어 비밀번호를 해시하지 못했습니다."
-
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "torrc 편집"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "설정을 저장합니다. 체크되지 않았다면 이것은 오직 현재 Tor 인스턴스에 설정될 것입니다."
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "잘라내기"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "복사"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "붙이기"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "되돌리기"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr "되돌리기"
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "모두 선택"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "모두 적용"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "데이타 파일을 위한 폴더 지정"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Tor 연결 오류"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "선택이 비었습니다. 몇몇 텍스트를 선택하거나, 모두 적용을 체크하여 주십시오."
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "%1번째 줄 오류 : \"%2\""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "오류"
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr "torrc 파일을 여는 중의 오류"
+msgstr ""
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
-msgstr "성공"
+msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "UPnP가 허용된 장치가 없습니다."
+msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "올바른 UPnP 인터넷 게이트웨이 장치를 찾지 못했습니다."
+msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSA 시작 실패"
+msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "포트 매핑 추가를 실패하였습니다."
+msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "포트 매핑을 찾는 것(retrieve)에 실패했습니다."
+msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "포트 매핑을 제거를 실패했습니다."
+msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "알 수 없는 오류"
+msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "UPnP 장치 찾기"
+msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "디렉토리 포트 매핑 업데이트"
+msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "중계 포트 매핑 업데이트"
+msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "테스트가 성공적으로 끝났습니다."
+msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "UPnP 지원 테스트"
+msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr " Universal Plug & Play 지원 테스트"
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr "'%1'을 찾을 수 없어서 Vidalia는 업데이트를 확인하지 못했습니다."
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr "Tor 업데이트 프로세스가 예상치 못하게 종료되어서 Vidalia는 업데이트를 확인하지 못했습니다."
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr "업데이트 확인 중..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr "숨기기"
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr "업데이트 다운로드 중..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr "업데이트된 소프트웨어 설치 중..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr "완료되었습니다! 귀하의 소프트웨어는 지원 범위 내입니다."
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr "확인"
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr "소프트웨어 업데이트"
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr "업데이트 확인 중..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr "취소"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr "소프트웨어 업데이트 가능"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr "나중에 알리기"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr "설치"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr "다음의 업데이트된 소프트웨어 패키지가 설치할 준비가 끝났습니다."
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr "패키지"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr "버전"
+msgstr ""
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
-msgstr "확인"
+msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "취소"
+msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "예"
+msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
-msgstr "아니오"
+msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
-msgstr "도움말"
+msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "재시도"
+msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "로그 보기"
+msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "설정 보기"
+msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "계속"
+msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "끝내기"
+msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "탐색"
+msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "잘못된 인수"
+msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia는 이미 작동중 입니다."
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "이 메시지를 표시하고 종료합니다."
+msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "\"모든\" Vidalia의 설정을 초기화합니다."
+msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "데이타 파일을 위한 폴더 지정"
+msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Vidalia Pidfile의 이름과 위치를 지정하십시오."
+msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Vidalia의 로그파일의 이름과 위치를 자정하십시오."
+msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Vidalia의 로깅의 다변을 설정합니다"
+msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Vidalia의 인터페이스 스타일 설정"
+msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Vidalia의 언어 설정"
+msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Vidalia 용법 정보"
-
-msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr "'%1' 로그 파일을 열지 못했습니다. : %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "매개 변수에 필요한 값 :"
+msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Invalid language code specified:"
-msgstr "무효 언어 코드가 지정됨:"
+msgid "Invalid language code specified: "
+msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
-msgstr "무효 GUI 스타일이 지정됨"
+msgid "Invalid GUI style specified: "
+msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
-msgstr "무효 로그 레벨이 지정됨"
+msgid "Invalid log level specified: "
+msgstr ""
+#: vidalia.cpp:257
msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
-"\n"
-"Would you like to continue starting Vidalia?"
+msgid "Unable to open log file '%1': %2"
msgstr ""
-"다른 Vidalia 프로세스가 이미 작동중입니다. 만약 정말 다른 Vidalia 프로세스가 없다면, 계속하도록 선택할 수 있습니다.\n"
-"\n"
-"Vidalia 시작을 계속하겠습니까?"
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr "%1 secs"
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr "%1 B/s"
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr "%1 KB/s"
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr "%1 MB/s"
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr "%1 GB/s"
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr "%1 일"
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr "%1 시간"
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
-msgstr "%1 분"
-
-
diff --git a/src/vidalia/i18n/po/lb/vidalia_lb.po b/src/vidalia/i18n/po/lb/vidalia_lb.po
index 8c59985..aaf69a2 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 38be79b..ebca324 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 9cff8a4..665ad26 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 3917746..515fae6 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 fe483a5..9ff589d 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 00a26ec..9d86930 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 61bcbad..0609e8d 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 0d2bf7e..fa090b3 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 1d86767..2188ff8 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 83d099d..e609e46 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 71325b4..52c4025 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 3430fac..d5a0806 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 503e511..8430936 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/my/qt_my.po b/src/vidalia/i18n/po/my/qt_my.po
index 9b16d12..9299ef7 100644
--- a/src/vidalia/i18n/po/my/qt_my.po
+++ b/src/vidalia/i18n/po/my/qt_my.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/my/vidalia_my.po b/src/vidalia/i18n/po/my/vidalia_my.po
index a7ea48b..a1d4a0f 100644
--- a/src/vidalia/i18n/po/my/vidalia_my.po
+++ b/src/vidalia/i18n/po/my/vidalia_my.po
@@ -1,11 +1,12 @@
#
+# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -42,9 +43,7 @@ msgstr "'%1' ဆိုသည္မွာ အိုင္ပီလိပ္စာ
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"'Password' ျဖင့္သာဝင္ရန္ဟုေရြးထားေသာ္လည္း၊ သင့္အေနျဖင့္ password အား "
-"မျပဳလုပ္ရေသးပါ။"
+msgstr "'Password' ျဖင့္သာဝင္ရန္ဟုေရြးထားေသာ္လည္း၊ သင့္အေနျဖင့္ password အား မျပဳလုပ္ရေသးပါ။"
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -234,10 +233,6 @@ msgid "Show Settings"
msgstr "Setting မ်ားအားျပရန္"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor bandwidth အသံုးျပဳမွဳအေျခအေန"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "အစမွျပန္စရန္"
@@ -277,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ထြက္ရန္"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -430,17 +429,26 @@ msgid "Control socket is not connected."
msgstr "ထိန္းခ်ဳပ္မွဳ socket အားခ်ိတ္ဆက္၍မရပါ။"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "လွ်ိဳ႕ဝက္ကုဒ္လိုအပ္သည္"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "ကၽြႏု္ပ္ လွ်ိဳ႕ဝက္ကုဒ္အားမွတ္ထားရန္"
+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 ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1336,10 +1344,6 @@ msgid "Browse"
msgstr "Browse"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Tor ေဆာ့ဝဲကို Vidalia စတင္ခ်ိန္တြင္ စတင္ပါ"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1367,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1457,8 +1465,7 @@ msgstr "ရွာေဖြရန္"
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-"စာလံုးတစ္ခု သို႕မဟုတ္ စာစုတစ္ခုကုိ လက္ရွိစာမ်က္ႏွာတြင္ ရွာေဖြရန္ (Ctrl+F)"
+msgstr "စာလံုးတစ္ခု သို႕မဟုတ္ စာစုတစ္ခုကုိ လက္ရွိစာမ်က္ႏွာတြင္ ရွာေဖြရန္ (Ctrl+F)"
msgctxt "HelpBrowser"
msgid "Ctrl+F"
@@ -1529,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို ပံုေသ Web browser တြင္ "
-"ဖြင့္လွစ္ႏိုင္ပါသည္။ အကယ္၍ သင္၏ browser သည္ Tor အသံုးျပဳရန္ "
-"ျပင္ဆင္သတ္မွတ္ထားျခင္း မရွိပါက ေတာင္းဆုိမႈသည္ အမည္မသိ ျဖစ္ႏုိင္မည္ မဟုတ္ပါ"
+msgstr "Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို ပံုေသ Web browser တြင္ ဖြင့္လွစ္ႏိုင္ပါသည္။ အကယ္၍ သင္၏ browser သည္ Tor အသံုးျပဳရန္ ျပင္ဆင္သတ္မွတ္ထားျခင္း မရွိပါက ေတာင္းဆုိမႈသည္ အမည္မသိ ျဖစ္ႏုိင္မည္ မဟုတ္ပါ"
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1546,10 +1550,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို Web browser တြင "
-"မဖြင့္လွစ္ႏုိင္ပါ။ URL ကုိ သင္၏ browser တြင္ ေကာ္ပီကူးယူ "
-"ျပန္ပြားယူႏိုင္ေသးပါသည္။"
+msgstr "Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို Web browser တြင မဖြင့္လွစ္ႏုိင္ပါ။ URL ကုိ သင္၏ browser တြင္ ေကာ္ပီကူးယူ ျပန္ပြားယူႏိုင္ေသးပါသည္။"
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1656,34 +1657,6 @@ 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"
@@ -1692,10 +1665,6 @@ msgid "View"
msgstr "ၾကည့္ရႈရန္"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia အကူအညီ"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Web browser စတင္ရာတြင္ မွားယြင္းမႈ"
@@ -1808,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr "Tor ပိတ္သိမ္းေနပါသည္"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Tor ကုိ ယခု ရပ္တန္႕ပါ"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor ကုိ ရပ္တန္႕ပါ"
@@ -1831,9 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia သည္ Tor ကုိ မ စတင္ႏုိင္ပါ။ သင္၏ လုပ္ေဆာင္ႏုိင္ေသာ Tor ၏ မွန္ကန္ေသာ "
-"အမည္ႏွင့္ ေနရာကို ခ်ိန္ညိႇထားေၾကာင္း ေသခ်ာေစရန္ စစ္ေဆးပါ။"
+msgstr "Vidalia သည္ Tor ကုိ မ စတင္ႏုိင္ပါ။ သင္၏ လုပ္ေဆာင္ႏုိင္ေသာ Tor ၏ မွန္ကန္ေသာ အမည္ႏွင့္ ေနရာကို ခ်ိန္ညိႇထားေၾကာင္း ေသခ်ာေစရန္ စစ္ေဆးပါ။"
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1871,9 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor ေဆာ့ဝဲသည္ Vidalia ေဆာ့ဝဲကုိ မွန္ကန္ေၾကာင္း cookie မ်ား ပို႕လႊတ္ရန္ "
-"လိုအပ္ပါသည္။ သို႕ေသာ္ Vidalia ရွာေဖြမေတြ႕ရွိႏုိင္ပါ"
+msgstr "Tor ေဆာ့ဝဲသည္ Vidalia ေဆာ့ဝဲကုိ မွန္ကန္ေၾကာင္း cookie မ်ား ပို႕လႊတ္ရန္ လိုအပ္ပါသည္။ သို႕ေသာ္ Vidalia ရွာေဖြမေတြ႕ရွိႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1895,24 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia အခ်ိဳ႕ event မ်ားအတြက္ မွတ္ပံုတင္မႈ မျပဳလုပ္ႏိုင္ပါ။ 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 မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ "
-"ခ်ိန္ညိွခ်က္မ်ားကို စစ္ေဆးပါ"
+msgstr "Vidalia အခ်ိဳ႕ event မ်ားအတြက္ မွတ္ပံုတင္မႈ မျပဳလုပ္ႏိုင္ပါ။ Vidalia ၏ လုပ္ေဆာင္ႏုိင္မႈမ်ား မရရွိႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1922,10 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"လက္ရွိ ထည့္သြင္းထားေသာ Tor ေဆာ့ဝဲသည္ ေခတ္မမီ၊ သို႕မဟုတ္ ထပ္မံ အၾကံဳျပဳ "
-"မေထာက္ခံေတာ့ပါ။ ေက်းဇူးျပဳ၍ Tor ဝက္ဘ္ဆုိက္သို႕ သြား၍ ေနာက္ဆံုး version ကို "
-"ေဒါင္းလုဒ္လုပ္ပါ။"
+msgstr "လက္ရွိ ထည့္သြင္းထားေသာ Tor ေဆာ့ဝဲသည္ ေခတ္မမီ၊ သို႕မဟုတ္ ထပ္မံ အၾကံဳျပဳ မေထာက္ခံေတာ့ပါ။ ေက်းဇူးျပဳ၍ Tor ဝက္ဘ္ဆုိက္သို႕ သြား၍ ေနာက္ဆံုး version ကို ေဒါင္းလုဒ္လုပ္ပါ။"
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1935,9 +1876,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"ေနာက္ပိုင္း ဆက္သြယ္မႈ အားလံုးသည္ ဆက္သြယ္မႈအေဟာင္းမ်ားႏွင့္ "
-"ျခားနားပါလိမ့္မည္။"
+msgstr "ေနာက္ပိုင္း ဆက္သြယ္မႈ အားလံုးသည္ ဆက္သြယ္မႈအေဟာင္းမ်ားႏွင့္ ျခားနားပါလိမ့္မည္။"
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1949,8 +1888,7 @@ msgstr "Port Forwarding မေအာင္ျမင္ပါ"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia သည္ အလိုအေလ်ာက္ port forwarding ကုိ ခ်ိန္ညိႇျခင္း မျပဳလုပ္ႏုိင္ပါ"
+msgstr "Vidalia သည္ အလိုအေလ်ာက္ port forwarding ကုိ ခ်ိန္ညိႇျခင္း မျပဳလုပ္ႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1961,85 +1899,11 @@ 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 ""
@@ -2099,13 +1963,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2123,6 +2005,16 @@ 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 ""
@@ -2130,14 +2022,27 @@ 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 "ခ်ိန္ညွိမႈမ်ား စိစစ္မႈ ခ်ိဳ႕ယြင္းခ်က္"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
-"Vidalia သည္ Tor ၏ မွတ္တမ္း အျဖစ္အပ်က္မ်ားသို႕ မွတ္ပံုတင္ျခင္း မျပဳႏုိင္ပါ"
+msgstr "Vidalia သည္ Tor ၏ မွတ္တမ္း အျဖစ္အပ်က္မ်ားသို႕ မွတ္ပံုတင္ျခင္း မျပဳႏုိင္ပါ"
msgctxt "MessageLog"
msgid "Error Opening Log File"
@@ -2153,9 +2058,7 @@ msgstr "မွတ္တမ္းဖုိင္အမည္ လိုအပ္
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"မွတ္တမ္း သတင္းေပးပို႕ခ်က္မ်ားကို ဖုိင္တစ္ခုသို႕ သိမ္းဆည္းႏုိင္ရန္ "
-"ဖုိင္အမည္တစ္ခု ေပးသြင္းရပါမည္"
+msgstr "မွတ္တမ္း သတင္းေပးပို႕ခ်က္မ်ားကို ဖုိင္တစ္ခုသို႕ သိမ္းဆည္းႏုိင္ရန္ ဖုိင္အမည္တစ္ခု ေပးသြင္းရပါမည္"
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2215,8 +2118,7 @@ msgstr "ရွင္းလင္းရန္"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr ""
-"သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ားမွ သတင္းေပးပို႕မ်ား အားလံုး ရွင္းလင္းရန္ (Ctrl+E)"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ားမွ သတင္းေပးပို႕မ်ား အားလံုး ရွင္းလင္းရန္ (Ctrl+E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2380,30 +2282,21 @@ msgstr "Browse"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကုိ ဖုိင္တစ္ခုသို႕ အျမဲတမ္း သိမ္းခြင့္ ျပဳပါ"
+msgstr "သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကုိ ဖုိင္တစ္ခုသို႕ အျမဲတမ္း သိမ္းခြင့္ ျပဳပါ"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
msgstr "သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကို အလိုအေလ်ာက္ ဖုိင္တစ္ခုသို႕ သိမ္းပါ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "သတင္းအခ်က္အလက္မွတ္တမ္းအသစ္မ်ားကို အျမဲတမ္း သိမ္းပါ"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "သတင္းအခ်က္အလက္မွတ္တမ္းအသစ္မ်ားကို အျမဲတမ္း သိမ္းပါ"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2443,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Network ေျမပံု"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "ျပန္လည္ အသစ္တင္ျပပါ"
@@ -2516,8 +2405,7 @@ msgstr "ျမင္ကြင္းကို သင့္ေလ်ာ္ေသ
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
-"လက္ရွိ ျပသထားေသာ ဆားကစ္မ်ား၏ ျမင္ကြင္းကုိ သင့္ေလ်ာ္ေသာ အေနအထားသို႕ ျပဳျပင္ပါ"
+msgstr "လက္ရွိ ျပသထားေသာ ဆားကစ္မ်ား၏ ျမင္ကြင္းကုိ သင့္ေလ်ာ္ေသာ အေနအထားသို႕ ျပဳျပင္ပါ"
msgctxt "NetViewer"
msgid "Ctrl+Z"
@@ -2547,6 +2435,22 @@ 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"
@@ -2563,17 +2467,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Tor ကုိ အသံုးျပဳ၍ အင္တာနက္ကုိ အသံုးျပဳရန္ အိုင္ပီလိပ္စာႏွင့္ hostname "
-"ႏွစ္ခုလံုးကုိ သတ္မွတ္ေဖာ္ျပေပးရမည္"
+msgstr "Tor ကုိ အသံုးျပဳ၍ အင္တာနက္ကုိ အသံုးျပဳရန္ အိုင္ပီလိပ္စာႏွင့္ hostname ႏွစ္ခုလံုးကုိ သတ္မွတ္ေဖာ္ျပေပးရမည္"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"သင္၏ firewall မွ သင့္ကုိ ဆက္သြယ္ခြင့္ရေစရန္ port တစ္ခုသို႕မဟုတ္ တစ္ခုထက္ပို၍"
-" သတ္မွတ္ေဖာ္ျပေပးရမည္"
+msgstr "သင္၏ firewall မွ သင့္ကုိ ဆက္သြယ္ခြင့္ရေစရန္ port တစ္ခုသို႕မဟုတ္ တစ္ခုထက္ပို၍ သတ္မွတ္ေဖာ္ျပေပးရမည္"
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2581,9 +2481,7 @@ msgstr "'%1' သည္ ဆီေလ်ာ္ေသာ port နံပါတ္မ
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"အင္တာနက္အသံုးျပဳခြင့္ရရွိရန္ သင္၏ local network သည္ proxy လိုအပ္မႈ ရွိမရွိ "
-"စစ္ေဆးပါ"
+msgstr "အင္တာနက္အသံုးျပဳခြင့္ရရွိရန္ သင္၏ local network သည္ proxy လိုအပ္မႈ ရွိမရွိ စစ္ေဆးပါ"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2607,9 +2505,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"သင္၏ firewall မွ ခြင့္ျပဳေသာ port မ်ားကုိသာအသံုးျပဳ၍ relay မ်ားကို "
-"ဆက္သြယ္ေစရန္ စစ္ေဆးပါ"
+msgstr "သင္၏ firewall မွ ခြင့္ျပဳေသာ port မ်ားကုိသာအသံုးျပဳ၍ relay မ်ားကို ဆက္သြယ္ေစရန္ စစ္ေဆးပါ"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2631,9 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Directory request မ်ားကုိ encrypt ျဖစ္ေစရန္၊ Tor Network ကုိ "
-"အသံုးျပဳႏုိင္ရန္ bridge relay မ်ားကို အသံုးျပဳႏုိင္ေၾကာင္း စစ္ေဆးပါ"
+msgstr "Directory request မ်ားကုိ encrypt ျဖစ္ေစရန္၊ Tor Network ကုိ အသံုးျပဳႏုိင္ရန္ bridge relay မ်ားကို အသံုးျပဳႏုိင္ေၾကာင္း စစ္ေဆးပါ"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2861,17 +2755,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"သင္ Tor ကုိ bridge ကဲ့သို႕ လုပ္ေဆာင္ရန္ သတ္မွတ္ထားပါသည္။ သို႕ေသာ္ သင္၏ Tor "
-"version သည္ bridges သို႕ အေထာက္အပ့ံမေပးႏုိင္ပါ"
+msgstr "သင္ Tor ကုိ bridge ကဲ့သို႕ လုပ္ေဆာင္ရန္ သတ္မွတ္ထားပါသည္။ သို႕ေသာ္ သင္၏ Tor version သည္ bridges သို႕ အေထာက္အပ့ံမေပးႏုိင္ပါ"
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"ေက်းဇူးျပဳ၍ သင္၏ Tor ေဆာ့ဝဲကုိ အဆင့္ျမႇင့္ပါ သို႕မဟုတ္ Tor ကို ပံုမွန္ Tor "
-"relay ကဲ့သို႕ ျပင္ဆင္မႈျပဳလုပ္ပါ"
+msgstr "ေက်းဇူးျပဳ၍ သင္၏ Tor ေဆာ့ဝဲကုိ အဆင့္ျမႇင့္ပါ သို႕မဟုတ္ Tor ကို ပံုမွန္ Tor relay ကဲ့သို႕ ျပင္ဆင္မႈျပဳလုပ္ပါ"
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2886,10 +2776,6 @@ 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:"
@@ -2899,8 +2785,7 @@ msgstr "Relay directory ကုိ mirror ျပဳလုပ္ႏုိင္ရ
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr ""
-"Port forwarding ကို ျပင္ဆင္သတ္မွတ္ျခင္း အလိုအေလ်ာက္ျပဳလုပ္ရန္ လုပ္ေဆာင္မႈ"
+msgstr "Port forwarding ကို ျပင္ဆင္သတ္မွတ္ျခင္း အလိုအေလ်ာက္ျပဳလုပ္ရန္ လုပ္ေဆာင္မႈ"
msgctxt "ServerPage"
msgid "Test"
@@ -2928,8 +2813,7 @@ msgstr "သင္၏ relay အမည္"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"အသံုးျပဳသူမ်ားႏွင့္ အျခား relay မ်ားမွ သင္၏ relay သို႕ ဆက္သြယ္ႏုိင္ေသာ port"
+msgstr "အသံုးျပဳသူမ်ားႏွင့္ အျခား relay မ်ားမွ သင္၏ relay သို႕ ဆက္သြယ္ႏုိင္ေသာ port"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2943,9 +2827,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"ေဒါင္းလုဒ္ျမန္ဆန္၍ upload ေႏွးေကြးေသာ အင္တာနက္ ဆက္သြယ္မႈမ်ားအတြက္ သင္၏ "
-"upload အျမန္ႏႈန္းကို ဤေနရာတြင္ ေဖာ္ျပပါ။"
+msgstr "ေဒါင္းလုဒ္ျမန္ဆန္၍ upload ေႏွးေကြးေသာ အင္တာနက္ ဆက္သြယ္မႈမ်ားအတြက္ သင္၏ upload အျမန္ႏႈန္းကို ဤေနရာတြင္ ေဖာ္ျပပါ။"
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -2973,8 +2855,7 @@ msgstr "စိတ္ၾကိဳက္ျပင္ဆင္ရန္"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"သင္၏ အင္တာနက္ ဆက္သြယ္မႈႏွင့္ အနီးစပ္ဆံုး ထည့္သြင္းထားခ်က္ကို ေရြးခ်ယ္ပါ"
+msgstr "သင္၏ အင္တာနက္ ဆက္သြယ္မႈႏွင့္ အနီးစပ္ဆံုး ထည့္သြင္းထားခ်က္ကို ေရြးခ်ယ္ပါ"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3004,9 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"သင္၏ အျမင့္ဆံုး bandwidth ႏႈန္း သည္ပ်မ္းမွ် bandwidth ႏႈန္း ထက္ ပိုျခင္း "
-"သို႕မဟုတ္ တူညီရပါမည္။ တန္ဖိုး ႏွစ္ခုလံုးသည္ အနည္းဆံုး 20 KB/s ရွိရပါမည္။"
+msgstr "သင္၏ အျမင့္ဆံုး bandwidth ႏႈန္း သည္ပ်မ္းမွ် bandwidth ႏႈန္း ထက္ ပိုျခင္း သို႕မဟုတ္ တူညီရပါမည္။ တန္ဖိုး ႏွစ္ခုလံုးသည္ အနည္းဆံုး 20 KB/s ရွိရပါမည္။"
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3067,18 +2946,13 @@ msgstr "အထြက္ေပၚလစီအတြက္ အကူအညီအ
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"သင္၏ relay မွ မည္သည့္ အင္တာနက္ အရင္းအျမစ္မ်ားကုိ အသံုးျပဳသူမ်ား "
-"အသံုးျပဳခြင့္ ရႏုိင္ေစပါသလဲ ?"
+msgstr "သင္၏ relay မွ မည္သည့္ အင္တာနက္ အရင္းအျမစ္မ်ားကုိ အသံုးျပဳသူမ်ား အသံုးျပဳခြင့္ ရႏုိင္ေစပါသလဲ ?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor သည္ အခ်ိဳ႕ေသာ ျပင္ပသို႕ ို႕လႊတ္သည့္ ေမးလ္မ်ားႏွင့္ ဖိုင္မွ်ေဝေသာ "
-"application မ်ားကို spam ႏွင့္ အျခား အလဲြသံုးမႈမ်ား ေလ်ာ့ခ်ႏုိင္ရန္အတြက္ "
-"တားျမစ္ထားပါသည္"
+msgstr "Tor သည္ အခ်ိဳ႕ေသာ ျပင္ပသို႕ ို႕လႊတ္သည့္ ေမးလ္မ်ားႏွင့္ ဖိုင္မွ်ေဝေသာ application မ်ားကို spam ႏွင့္ အျခား အလဲြသံုးမႈမ်ား ေလ်ာ့ခ်ႏုိင္ရန္အတြက္ တားျမစ္ထားပါသည္"
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3086,9 +2960,7 @@ msgstr "ေပၚလစီမွ ထြက္ရန္"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"အျခားသူမ်ားကုိ သင္၏ bridge ကုိ အသံုးျပဳခြင့္ရေစရန္ ေအာက္ပါစာသားကုိ "
-"၄င္းတို႕အား ေပးပါ :"
+msgstr "အျခားသူမ်ားကုိ သင္၏ bridge ကုိ အသံုးျပဳခြင့္ရေစရန္ ေအာက္ပါစာသားကုိ ၄င္းတို႕အား ေပးပါ :"
msgctxt "ServerPage"
msgid ""
@@ -3148,6 +3020,14 @@ 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 ""
@@ -3159,17 +3039,13 @@ msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
-"ဝန္ေဆာင္မႈမ်ား ထုတ္လုပ္ျဖန္႕ခ်ိမႈမ ရုပ္သိမ္းေနစဥ္ "
-"ခ်ိဳ႕ယြင္းမွားယြင္းမႈရွိပါသည္"
+msgstr "ဝန္ေဆာင္မႈမ်ား ထုတ္လုပ္ျဖန္႕ခ်ိမႈမ ရုပ္သိမ္းေနစဥ္ ခ်ိဳ႕ယြင္းမွားယြင္းမႈရွိပါသည္"
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"ေက်းဇူးျပဳ၍ သင္ သိမ္းဆည္းလိုေသာ ဝန္ေဆာင္မႈတစ္ခုစီအတြက္ အနည္းဆံုး service "
-"directory ႏွင့္ virtual port တစ္ခုစီ သတ္မွတ္ပါ။ အျခား အရာမ်ားကို ဖယ္ရွားပါ"
+msgstr "ေက်းဇူးျပဳ၍ သင္ သိမ္းဆည္းလိုေသာ ဝန္ေဆာင္မႈတစ္ခုစီအတြက္ အနည္းဆံုး service directory ႏွင့္ virtual port တစ္ခုစီ သတ္မွတ္ပါ။ အျခား အရာမ်ားကို ဖယ္ရွားပါ"
msgctxt "ServicePage"
msgid "Error"
@@ -3196,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr "Directory သည္ အျခား ဝန္ေဆာင္မႈတစ္ခုမွ အသံုးျပဳႏွင့္ျပီး ျဖစ္ပါသည္"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "ျဖည့္စြက္ပံုစံ"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "လွ်ိဳ႕ဝွက္ဝန္ေဆာင္မႈမ်ား ရရွိျပီး ျဖစ္ပါသည္"
@@ -3237,9 +3109,7 @@ msgstr "ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မ
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"local ဖိုင္ စနစ္အတြင္းတြင္ ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈအတြက္ directory "
-"ေရြးခ်ယ္ေပးပါ"
+msgstr "local ဖိုင္ စနစ္အတြင္းတြင္ ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈအတြက္ directory ေရြးခ်ယ္ေပးပါ"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3490,6 +3360,22 @@ 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 "အသစ္"
@@ -3526,6 +3412,12 @@ 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]"
@@ -3604,6 +3496,30 @@ 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 "ေအာင္ျမင္ပါသည္"
@@ -3614,9 +3530,7 @@ msgstr "UPnP လုပ္ေဆာင္ႏုိင္ေသာ ပစၥည္
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"သင့္ေလွ်ာ္ေသာ UPnP လုပ္ေဆာင္ႏုိင္ေသာ အင္တာနက္ gateway ပစၥည္းကိရိယာမ်ား "
-"မေတြ႕ရွိပါ"
+msgstr "သင့္ေလွ်ာ္ေသာ UPnP လုပ္ေဆာင္ႏုိင္ေသာ အင္တာနက္ gateway ပစၥည္းကိရိယာမ်ား မေတြ႕ရွိပါ"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3816,8 +3730,7 @@ msgstr "Vidalia ၏ မွတ္တမ္းဖုိင္ကုိ အမည
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
-"Vidalia ၏ မွတ္တမ္းတင္ျခင္း မည္မွ် ရွည္ၾကာစြာထားရွိမည္ဆိုသည္ကုိ သတ္မွတ္ပါ"
+msgstr "Vidalia ၏ မွတ္တမ္းတင္ျခင္း မည္မွ် ရွည္ၾကာစြာထားရွိမည္ဆိုသည္ကုိ သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
@@ -3885,5 +3798,3 @@ 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 844bdf6..d85f07d 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 b55a2f0..e29d861 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nb/qt_nb.po b/src/vidalia/i18n/po/nb/qt_nb.po
index 18ab098..42b5fc1 100644
--- a/src/vidalia/i18n/po/nb/qt_nb.po
+++ b/src/vidalia/i18n/po/nb/qt_nb.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/nb/vidalia_nb.po b/src/vidalia/i18n/po/nb/vidalia_nb.po
index a96f11f..e71bbd5 100644
--- a/src/vidalia/i18n/po/nb/vidalia_nb.po
+++ b/src/vidalia/i18n/po/nb/vidalia_nb.po
@@ -1,14 +1,13 @@
#
# Translators:
-# <kmdl at hotmail.no>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-28 03:27+0000\n"
-"Last-Translator: FreedomIsGreat <kmdl at hotmail.no>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,8 +43,7 @@ msgstr "'%1' er ikke en gyldig IP adresse."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Du valgte 'Passord' autentisering, men du spesifiserte ikke ett passord."
+msgstr "Du valgte 'Passord' autentisering, men du spesifiserte ikke ett passord."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -141,15 +139,15 @@ msgstr "Velg mappen der Tor lagrer data"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor kontroll"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Bruk TCP forbindelse (Kontroll Port)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Vei:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
@@ -157,11 +155,11 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Rediger nåværende torrc."
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "Advarsel: dette vil endre den nåværende lastede torcc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
@@ -178,12 +176,10 @@ msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
-"Den følgende mappe plasseringen inneholder tegn som ikke kan brukes i ditt "
-"system sitt 8-bit karakter kodifikasjon"
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
@@ -198,18 +194,11 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia klarte ikke å fjerne Tor-tjenesten.\n"
-"\n"
-"Du kan bli nødt til å måtte fjerne det manuelt."
+msgstr "Vidalia klarte ikke å fjerne Tor-tjenesten.\n\nDu kan bli nødt til å måtte fjerne det manuelt."
msgctxt "AppearancePage"
msgid "Language"
@@ -244,10 +233,6 @@ msgid "Show Settings"
msgstr "Vis innstillinger"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor båndbreddeforbruk"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Tilbakestill"
@@ -287,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Avbryt"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Starter HTTPS-broforespørsel"
@@ -440,20 +429,27 @@ msgid "Control socket is not connected."
msgstr "Kontroll-socket er ikke tilkoblet."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Passord kreves"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Husk passordet"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
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."
@@ -1269,52 +1265,58 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Send en feilrapport"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia støtte på et problem og måtte lukkes"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Start Vidalia på nytt"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Ikke gjenoppta"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Kunne ikke starte Vidalia på nytt"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+msgid "Restart Vidalia"
msgstr ""
-"Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia manuelt."
msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
+msgid "Don't Restart"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgid "Unable to restart Vidalia"
msgstr ""
msgctxt "CrashReportDialog"
msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
msgctxt "GeneralPage"
@@ -1342,10 +1344,6 @@ 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,6 +1371,10 @@ 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"
@@ -1534,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia kan åpne lenken du valgte i din standard nettleser. Hvis din "
-"nettleser er foreløpig ikke konfigurert til å bruke Tor vil forespørsel ikke"
-" bli anonym."
+msgstr "Vidalia kan åpne lenken du valgte i din standard nettleser. Hvis din nettleser er foreløpig ikke konfigurert til å bruke Tor vil forespørsel ikke bli anonym."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1551,9 +1550,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kunne ikke åpne den valgte lenken i nettleseren. Du kan kopiere URL-"
-"en og lime den inn i nettleseren."
+msgstr "Vidalia kunne ikke åpne den valgte lenken i nettleseren. Du kan kopiere URL-en og lime den inn i nettleseren."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1597,11 +1594,11 @@ msgstr "Ukjent"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Informasjon"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1609,11 +1606,11 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Feil"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
@@ -1660,34 +1657,6 @@ 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"
@@ -1696,10 +1665,6 @@ 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"
@@ -1812,10 +1777,6 @@ 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"
@@ -1835,9 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du "
-"har oppgitt Tor-programmets riktige navn og plassering."
+msgstr "Vidalia kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du har oppgitt Tor-programmets riktige navn og plassering."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1875,9 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor-programvaren trenger at Vidalia sender innholdet i en informasjonskapsel"
-" for autentisering, men Vidalia klarte ikke å finne én."
+msgstr "Tor-programvaren trenger at Vidalia sender innholdet i en informasjonskapsel for autentisering, men Vidalia klarte ikke å finne én."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1899,21 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia klarte ikke å registrere noen hendelser. Mange av Vidalias "
-"funksjoner kan være utilgjengelig."
-
-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"
+msgstr "Vidalia klarte ikke å registrere noen hendelser. Mange av Vidalias funksjoner kan være utilgjengelig."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1923,9 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Den installerte versjonen av Tor er utdatert eller ikke lengre anbefalt. "
-"Besøk nettsiden til Tor for å laste ned nyeste versjon."
+msgstr "Den installerte versjonen av Tor er utdatert eller ikke lengre anbefalt. Besøk nettsiden til Tor for å laste ned nyeste versjon."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1935,8 +1876,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser."
+msgstr "Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1959,89 +1899,14 @@ 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 ""
-"Den innstallerte versjonen av Tor er utdatert eller ikke lengre anbefalt."
+msgstr "Den innstallerte versjonen av Tor er utdatert eller ikke lengre anbefalt."
msgctxt "MainWindow"
msgid ""
@@ -2056,8 +1921,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor har automatisk lukket din forbindelse for å beskytte din anonymitet."
+msgstr "Tor har automatisk lukket din forbindelse for å beskytte din anonymitet."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2071,9 +1935,7 @@ msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"Det er ingen nye Tor-oppdateringer tilgjengelig for ditt system for "
-"øyeblikket."
+msgstr "Det er ingen nye Tor-oppdateringer tilgjengelig for ditt system for øyeblikket."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2089,22 +1951,40 @@ msgstr "Følgende feil skjedde:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "feilet (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"Din relé stenges ned.\n"
-"Trykk på \"Stopp\" igjen for å stenge din relé nå."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2115,33 +1995,45 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Du kjører for tiden en relé. Ved å avslutte din relé vil du avslutte alle åpne forbindelser til klienter.\n"
-"\n"
-"Vil du avslutte gradvis å la klientene få tid til å finne en annen relé?"
+msgstr "Du kjører for tiden en relé. Ved å avslutte din relé vil du avslutte alle åpne forbindelser til klienter.\n\nVil du avslutte gradvis å la klientene få tid til å finne en annen relé?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n"
-"\n"
-"Vennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
+msgstr "Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n\nVennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+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 "(probably an email client)"
-msgstr ""
+msgid "failed (%1)"
+msgstr "feilet (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", sannsynligvis Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", sannsynligvis en epostklient,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Din relé stenges ned.\nTrykk på \"Stopp\" igjen for å stenge din relé nå."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2397,36 +2289,24 @@ msgid "Automatically save new log messages to a file"
msgstr "Lagre automatisk nye loggmeldinger til en fil"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Status"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avansert"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Alltid lagre nye loggmeldinger"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Meldinger som oppstår når noe har gått\n"
-"veldig galt og Tor ikke kan fortsette."
+msgstr "Meldinger som oppstår når noe har gått\nveldig galt og Tor ikke kan fortsette."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Meldinger som kun oppstår når\n"
-"noe har gått veldig galt med Tor."
+msgstr "Meldinger som kun oppstår når\nnoe har gått veldig galt med Tor."
msgctxt "MessageLog"
msgid ""
@@ -2434,41 +2314,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Meldinger som oppstår av og til\n"
-"under en normal Tor-operasjon og\n"
-"er ikke ansett som feilmeldinger\n"
-"men som du kanskje vil bry deg om."
+msgstr "Meldinger som oppstår av og til\nunder en normal Tor-operasjon og\ner ikke ansett som feilmeldinger\nmen som du kanskje vil bry deg om."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Meldinger som ofte oppstår\n"
-"i en normal Tor-operasjon."
+msgstr "Meldinger som ofte oppstår\ni en normal Tor-operasjon."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Lange meldinger som er mest\n"
-"av interesse for Tor-utviklere."
+msgstr "Lange meldinger som er mest\nav interesse for Tor-utviklere."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Kan ikke skrive til fil %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Nettverkskart"
+msgstr "Kan ikke skrive til fil %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2570,6 +2435,22 @@ 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"
@@ -2586,17 +2467,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Du må spesifisere både IP adresse eller vertsnavn og et portnummer for å "
-"konfigurere Tor til å bruke en proxy for å koble til Internett."
+msgstr "Du må spesifisere både IP adresse eller vertsnavn og et portnummer for å konfigurere Tor til å bruke en proxy for å koble til Internett."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Du må spesifisere en eller flere porter som din brannmur tillater deg å "
-"koble til."
+msgstr "Du må spesifisere en eller flere porter som din brannmur tillater deg å koble til."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2604,8 +2481,7 @@ msgstr "'%1' er ikke ett gyldig portnummer."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Sjekk om ditt lokale nettverk krever en proxy for å koble til Internett"
+msgstr "Sjekk om ditt lokale nettverk krever en proxy for å koble til Internett"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2629,9 +2505,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Velg for kun å koble seg til reléer ved bruk av porter som er åpne i din "
-"brannmur"
+msgstr "Velg for kun å koble seg til reléer ved bruk av porter som er åpne i din brannmur"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2653,9 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Velg for å kryptere katalogforespørsler og, valgfritt, bruk broer for å "
-"skape en forbindelse til Tor-nettverket."
+msgstr "Velg for å kryptere katalogforespørsler og, valgfritt, bruk broer for å skape en forbindelse til Tor-nettverket."
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2693,9 +2565,7 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Ingen nye broer er for tiden tilgjengelige. Du kan enten vente og prøve "
-"igjen, eller prøve en annen metode for å finne nye broer."
+msgstr "Ingen nye broer er for tiden tilgjengelige. Du kan enten vente og prøve igjen, eller prøve en annen metode for å finne nye broer."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2703,7 +2573,7 @@ msgstr "Trykk på Hjelp for å se andre metoder for å finne nye broer."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Adresse:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
@@ -2711,7 +2581,7 @@ msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Du må velge proxy typen"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
@@ -2723,11 +2593,11 @@ msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2885,17 +2755,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Du har satt opp Tor til å være et bro-relé for sensurerte brukere, men din "
-"versjon av Tor støtter ikke broer."
+msgstr "Du har satt opp Tor til å være et bro-relé for sensurerte brukere, men din versjon av Tor støtter ikke broer."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Vennligst oppgrader din Tor programvare eller sett opp Tor som et vanlig "
-"relé."
+msgstr "Vennligst oppgrader din Tor programvare eller sett opp Tor som et vanlig relé."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2910,10 +2776,6 @@ msgid "Run as a client only"
msgstr "Kjør kun som klient"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Videresend trafikk for Tor-nettverket (Relé)"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Reléport:"
@@ -2965,9 +2827,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Vennligst oppgi din opplastningshastighet her hvis du har rask "
-"nedlastningshastighet med treg opplastningshastighet."
+msgstr "Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3025,9 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Din ratio på maksimal hastighet må være større eller like stor som din "
-"gjennomsnittlige hastighet. Begge verdiene må være minst 20 KB/s."
+msgstr "Din ratio på maksimal hastighet må være større eller like stor som din gjennomsnittlige hastighet. Begge verdiene må være minst 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3088,17 +2946,13 @@ msgstr "Vis hjelpeteksten for tillatte utgående forbindelser"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Hvilke ressurser skal brukere av ditt relé kunne få tilgang til på "
-"internett?"
+msgstr "Hvilke ressurser skal brukere av ditt relé kunne få tilgang til på internett?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor vil fortsatt blokkere utgående epost og fildelingsprogrammer med "
-"standardinstillinger for å redusere mengden søppelpost og andre misbruk."
+msgstr "Tor vil fortsatt blokkere utgående epost og fildelingsprogrammer med standardinstillinger for å redusere mengden søppelpost og andre misbruk."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3129,8 +2983,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"La din relé kjørende så klienter har større sjanse til å finne og bruke den."
+msgstr "La din relé kjørende så klienter har større sjanse til å finne og bruke den."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3144,9 +2997,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor returnerte en feilformatert respons når Vidalia sendte forespørsel om "
-"din bros historikk."
+msgstr "Tor returnerte en feilformatert respons når Vidalia sendte forespørsel om din bros historikk."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3154,8 +3005,7 @@ msgstr "Den returnerte responsen var: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
-"Hjelp sensurerte brukere å nå Tor nettverket (Tor 0.2.0.8-alpha eller nyere)"
+msgstr "Hjelp sensurerte brukere å nå Tor nettverket (Tor 0.2.0.8-alpha eller nyere)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3170,6 +3020,14 @@ 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"
@@ -3177,9 +3035,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Epostadressen du kan bli nådd på hvis det skulle være et\n"
-"problem med din relé. Du kan også inkludere ditt PGP eller GPG fingeravtrykk."
+msgstr "Epostadressen du kan bli nådd på hvis det skulle være et\nproblem med din relé. Du kan også inkludere ditt PGP eller GPG fingeravtrykk."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3189,9 +3045,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Vennligst konfigurer minst en tjenestekatalog og en virituell port for hver "
-"tjeneste du vil lagre. Fjern de andre."
+msgstr "Vennligst konfigurer minst en tjenestekatalog og en virituell port for hver tjeneste du vil lagre. Fjern de andre."
msgctxt "ServicePage"
msgid "Error"
@@ -3218,10 +3072,6 @@ 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"
@@ -3271,15 +3121,15 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor programmet kjører"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Du anvender deg nå av \"%1\" versjonen av Tor programmet."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor programmet kjører ikke"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3287,9 +3137,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"Klikk \"start Tor\" ved Vidalia kontroll panelet for og starte Tor "
-"programmet på nytt. Hvis Tor avsluttet uventet, Velg \"Avansert\" ovenfor, "
-"for informasjon om eventuelle feil som oppstod. "
msgctxt "StatusEventWidget"
msgid ""
@@ -3513,6 +3360,22 @@ 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"
@@ -3549,6 +3412,12 @@ 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]"
@@ -3627,6 +3496,30 @@ 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"
@@ -3687,17 +3580,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi den kunne "
-"ikke finne '%1'"
+msgstr "Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi den kunne ikke finne '%1'"
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi Tor sin "
-"oppdateringsprosess ble uventet avbrutt."
+msgstr "Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi Tor sin oppdateringsprosess ble uventet avbrutt."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3759,6 +3648,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Versjon"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3852,10 +3749,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Kunne ikke åpne loggfil '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Ugyldig språkkode angitt:"
@@ -3872,10 +3765,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Det er mulig en annen Vidalia-prosess kjører. Hvis du er sikker på at det ikke kjører andre Vidalia-prosesser, kan du velge å fortsette allikevel.\n"
-"\n"
-"Vil du fortsatt starte Vidalia?"
+msgstr "Det er mulig en annen Vidalia-prosess kjører. Hvis du er sikker på at det ikke kjører andre Vidalia-prosesser, kan du velge å fortsette allikevel.\n\nVil du fortsatt starte Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3908,5 +3798,3 @@ 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 1336ea5..32a07d6 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nl/qt_nl.po b/src/vidalia/i18n/po/nl/qt_nl.po
index e26a896..17d74f9 100644
--- a/src/vidalia/i18n/po/nl/qt_nl.po
+++ b/src/vidalia/i18n/po/nl/qt_nl.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
-# Shondoit Walker <shondoit+transifex at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-10-12 20:28+0000\n"
-"Last-Translator: Shondoit Walker <shondoit+transifex at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +27,7 @@ msgstr "Programma '%1' heeft Qt %2 nodig, Qt %3 is gevonden."
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Fout: incompatibele Qt bibliotheek."
+msgstr "Fout : onverenigbare Qt bibliotheek."
#: qapplication.cpp:2095
msgctxt "QApplication"
@@ -135,7 +132,7 @@ msgstr "Negeren"
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr "Standaard terugzetten"
+msgstr "Oorspronkelijke terugplaatsen"
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
@@ -204,7 +201,7 @@ msgid ""
"Do you want to replace it?"
msgstr ""
"%1 bestaat al.\n"
-"Wilt u het vervangen?"
+"Wil U het vervangen?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -215,12 +212,12 @@ msgid ""
msgstr ""
"%1\n"
"Bestand niet gevonden.\n"
-"Controleer of de bestandsnaam correct is."
+"Controlleer of de bestandsnaam correct was."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "Deze computer"
+msgstr "Mijn computer"
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
@@ -276,7 +273,7 @@ msgid ""
msgstr ""
"%1\n"
"Map niet gevonden.\n"
-"Gelieve te controleren of de juiste mapnaam werd gegeven."
+"Gelieve te controlleren of de juiste mapnaam werd gegeven."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -285,17 +282,17 @@ msgid ""
"Do you want to delete it anyway?"
msgstr ""
"'%1' is beschermd tegen overschrijven.\n"
-"Wilt u het toch verwijderen?"
+"Wilt U het toch verwijderen?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Bent u zeker dat u '%1' wilt verwijderen ?"
+msgstr "Bent U zeker dat U '%1' wilt verwijderen ?"
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "De map kon niet worden verwijderd."
+msgstr "De map kon niet verwijderd worden."
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
@@ -383,7 +380,7 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>De naam \"%1\" kan niet worden gebruikt.</b><p>Probeer een andere naam te"
+"<b>De naam \"%1\" kan niet gebruikt worden.</b><p>Probeer een andere naam te"
" gebruiken met minder letters of zonder punten of komma's."
#: qfilesystemmodel.cpp:832
@@ -445,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/nl/vidalia_nl.po b/src/vidalia/i18n/po/nl/vidalia_nl.po
index b5488f1..ab83aef 100644
--- a/src/vidalia/i18n/po/nl/vidalia_nl.po
+++ b/src/vidalia/i18n/po/nl/vidalia_nl.po
@@ -1,18 +1,14 @@
#
# Translators:
-# <Erik_Bos at usa.net>, 2011.
-# <flabber at online.be>, 2011.
-# <louisboy at msn.com>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
# Shondoit Walker <shondoit+transifex at gmail.com>, 2011.
-# <zero.point.transifex at tweebs.nl>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-09 13:28+0000\n"
-"Last-Translator: Zero.Point <zero.point.transifex at tweebs.nl>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"Last-Translator: Shondoit Walker <shondoit+transifex at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,8 +44,7 @@ msgstr "'%1' is geen geldig IP adres."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"U heeft voor wachtwoordauthenticatie gekozen maar geen wachtwoord opgegeven."
+msgstr "U heeft voor paswoordauthenticatie gekozen maar geen paswoord opgegeven."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -69,11 +64,11 @@ msgstr "Maken van bestand mislukt"
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Aanmaken %1 niet mogelijk [%2]"
+msgstr "Aanmaken %1 [%2] niet mogelijk"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Selecteer een map voor Tor gegevens"
+msgstr "Selecteer een map voor de gegevens van Tor"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
@@ -97,7 +92,7 @@ msgstr "Adres:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Geen"
+msgstr "geen"
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -105,11 +100,11 @@ msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "wachtwoord"
+msgstr "paswoord"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Genereer willekeurig"
+msgstr "willekeurig gegenereerd"
msgctxt "AdvancedPage"
msgid ":"
@@ -145,11 +140,11 @@ msgstr "Selecteer de map om de gegevens van Tor op te slaan"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor Control"
+msgstr "Tor beheer"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Gebruik TCP-verbinding (ControlPort)"
+msgstr "Gebruik TCP verbinding (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
@@ -161,11 +156,11 @@ msgstr "Gebruik Unix domein socket (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Bewerk huidige torrc"
+msgstr "Pas huidige torrc aan"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "LET OP: dit zal de momenteel geladen torrc bewerken"
+msgstr "LET OP: dit past de momenteel geladen torrc aan"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
@@ -175,17 +170,13 @@ msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Het opgegeven Tor configuratie locatie bestand bevat tekens die niet kunnen "
-"worden weergegeven in uw huidige systeem 8-bits tekenset codering."
+msgstr "De opgegeven locatie van het Tor configuratiebestand bevat karakters die niet weergegeven kunnen worden in de huidige 8-bit karaktercodering van je systeem."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"De opgegeven data Tor directory bevat tekens die niet kunnen worden "
-"weergegeven in uw huidige systeem 8-bits tekenset codering."
+msgstr "De opgegeven locatie van de Tor datafolder bevat karakters die niet weergegeven kunnen worden in de huidige 8-bit karaktercodering van je systeem."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -193,29 +184,22 @@ msgstr "Waarschuwing"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "U hebt uw torrc pad veranderd, wilt u Tor opnieuw opstarten? "
+msgstr "Je hebt het torrc pad aangepast. Wil je Tor herstarten?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Configuratie Bestand (torrc);;Alle bestanden (*)"
+msgstr "Tor configuratie bestand (torrc);;Alle bestanden (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Selecteer een bestand om te gebruiken voor Tor socket pad"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configureer ControlPort automatisch"
+msgstr "Selecteer een bestande om als Tor socket pad te gebruiken."
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia kon de Tor service niet verwijderen.\n"
-"\n"
-"De service moet misschien handmatig verwijderd worden."
+msgstr "Vidalia kon de Tor service niet verwijderen.\n\nDe service moet misschien manueel verwijderd worden."
msgctxt "AppearancePage"
msgid "Language"
@@ -223,7 +207,7 @@ msgstr "Taal"
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Kies de taal voor Vidalia"
+msgstr "Kies de taal voor gebruik binnen Vidalia"
msgctxt "AppearancePage"
msgid "Style"
@@ -231,7 +215,7 @@ msgstr "Stijl"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Kies de stijl voor de Vidalia interface"
+msgstr "Kies de stijl voor de interface van Vidalia"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
@@ -247,11 +231,7 @@ msgstr "Instellingen verbergen"
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Instellingen weergeven"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor bandbreedte gebruik"
+msgstr "Instellingen Weergeven"
msgctxt "BandwidthGraph"
msgid "Reset"
@@ -293,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annuleren"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Bandbreedte grafiek"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "HTTPS bridge verzoek is gestart..."
@@ -303,23 +287,23 @@ msgstr "Verbinden met %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Sturen van een HTTPS verzoek voor bridges..."
+msgstr "Sturen van een HTTPS bridge-verzoek..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Bezig met downloaden van een lijst met bridges..."
+msgstr "Laden van een lijst met bridges..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Bezig met downloaden van bridges"
+msgstr "Laden van bridges"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Downloaden van bridges mislukt: %1"
+msgstr "Laden van bridges mislukt: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Bezig met opnieuw proberen bridge verzoek..."
+msgstr "Hernieuwen bridge-verzoek..."
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -331,7 +315,7 @@ msgstr "# gebruikers"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Gebruikers van de volgende landen hebben uw relay gebruikt sinds %1"
+msgstr "Gebruikers van de volgende landen hebben uw realy gebruikt sinds %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
@@ -367,7 +351,7 @@ msgstr "Onbekend"
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Leeg Pad>"
+msgstr "<Pad Leeg>"
msgctxt "CircuitListWidget"
msgid "Connection"
@@ -383,11 +367,11 @@ msgstr "Zoom in op circuit"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Circuit sluiten (Del)"
+msgstr "Circuit sluiten (del)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Stream sluiten (Del)"
+msgstr "Stream sluiten (del)"
msgctxt "ConfigDialog"
msgid "General"
@@ -446,20 +430,27 @@ msgid "Control socket is not connected."
msgstr "Control socket is niet verbonden."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Wachtwoord noodzakelijk"
+msgid "Problem connecting to Tor"
+msgstr "Probleem tijdens verbinding maken met Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Onthoud mijn wachtwoord"
+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 "Tor draait al, maar Vidalia kan geen verbinding maken.\n\nDit kan gebeuren wanneer iets anders (zoals een ander actief Vidalia proces, of een gecrasht Vidalia proces) Tor heeft gestart."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia probeert een verbinding op te zetten met een gestart Tor proces dat "
-"een wachtwoord nodig heeft. Gelieve het wachtwoord op te geven: "
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Je zult het Tor proces af moeten sluiten voordat Vidalia een nieuwe kan starten."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia kan proberen om Tor voor je te herstarten. Dit zal alle momenteel actieve verbindingen via je Tor process afsluiten."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -471,9 +462,7 @@ msgstr "Fout bij het verzenden van het beheer commando. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-"Socket verbrak de verbinding bij poging tot het lezen van een regel met "
-"data."
+msgstr "Socket verbrak de verbinding bij poging tot het lezen van een regel met data."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
@@ -589,7 +578,7 @@ msgstr "Kaap Verdië"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centraal Afrikaanse Republiek"
+msgstr "Centraal Afrikaanse republiek"
msgctxt "CountryInfo"
msgid "Chad"
@@ -1277,11 +1266,29 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Verstuur een Crash Rapport"
+msgstr "Verstuur crashrapport"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "In Vidalia is een fout opgetreden en moest afsluiten"
+msgstr "Vidalia is een fout tegengekomen en moest afgesloten worden"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Er is een crashrapportage gemaakt die je automatisch naar de Vidalia ontwikkelaars kan versturen om problemen te helpen te identificeren en op te lossen. De verstuurde rapportage bevat geen persoonlijk identificeerbare informatie, maar de verbinding met de crashraportage server mag niet anoniem zijn."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Beschrijf wat je deed voordat de applicatie crashte (optioneel):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Stuur mijn crashraportage naar de Vidalia ontwikkelaars"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
@@ -1289,49 +1296,29 @@ msgstr "Herstart Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Niet opnieuw opstarten"
+msgstr "Herstart niet."
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Kan Vidalia niet opnieuw herstarten "
+msgstr "Kon Vidalia niet herstarten"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"We waren niet in staat om Vidalia automatisch te herstarten. Start Vidalia "
-"a.u.b. handmatig op."
+msgstr "We waren niet in staat om Vidalia automatisch te herstarten. Start Vidalia handmatig opnieuw op."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Vul a.u.b. een ticket in:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Verbinden..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Er is een crash report gegenereerd dat u naar de Vidalia ontwikkelaars kunt "
-"verzenden om hen te helpen het probleem te identificeren en op te lossen. "
-"Het ingediende report bevat geen persoonlijk gegevens."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Bezig met crashraport versturen..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"met een beschrijving van waarmee u bezig was, samen met de volgende "
-"bestanden aan het crash report gerelateerd zijn:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Bezig met antwoord ontvangen..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1347,7 +1334,7 @@ msgstr "Proxy-toepassing selecteren"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Er moet een naam gekozen worden voor uw Tor-toepassing"
+msgstr "Er moet een naam gekozen worden voor de tor-toepassing"
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
@@ -1358,10 +1345,6 @@ 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"
@@ -1383,12 +1366,16 @@ msgstr "Software Updates"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Automatisch op nieuwe software updates controleren"
+msgstr "Automatisch nieuwe software updates controleren"
msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Nu controleren"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Verbind automatisch met Tor"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1515,7 +1502,7 @@ msgstr "Hoofdlettergevoelig"
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Alleen volledige woorden"
+msgstr "Enkel volledige woorden"
msgctxt "HelpBrowser"
msgid "Help Topics"
@@ -1543,33 +1530,28 @@ msgstr "Fout tijdens het laden van de helpinhoud"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Open externe link"
+msgstr "Openen externe link"
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia kan de geselecteerde link openen in uw standaard browser. Als uw "
-"browser niet ingesteld is om via Tor te werken, dan zal de vraag niet "
-"anoniem zijn."
+msgstr "Vidalia kan de geselecteerde link openen in uw standaard browser. Als deze browser niet ingesteld is om via Tor te werken, dan zal de vraag niet anoniem zijn."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Mag Vidalia deze link openen in uw browser ?"
+msgstr "Mag vidalia deze link openen in uw browser ?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Openen van de link is niet mogelijk"
+msgstr "Openen van de link niet mogelijk"
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kon de geselecteerde link niet in uw browser openen. U kunt de URL "
-"wel kopiëren en daarna plakken in uw browseradresbalk."
+msgstr "Vidalia kon de geselecteerde link niet in uw browser openen. De URL kan nog steeds gekopieerd worden en daarna geplakt worden in de browseradresbalk."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1585,7 +1567,7 @@ msgstr "Licentie"
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Met dank aan"
+msgstr "Dank aan"
msgctxt "LogEvent"
msgid "Debug"
@@ -1633,7 +1615,7 @@ msgstr "Fout"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Onbekende"
+msgstr "Onbekend"
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1676,34 +1658,6 @@ 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"
@@ -1712,10 +1666,6 @@ 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"
@@ -1725,11 +1675,11 @@ msgstr "Vidalia kon de geconfigureerde browser niet starten"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Fout tijdens het starten van de IM-client"
+msgstr "Fout tijdens het starten van de IM-toepassing"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia kon de geconfigureerde IM-client niet starten"
+msgstr "Vidalia kon de geconfigureerde IM-toepassing niet starten"
msgctxt "MainWindow"
msgid "Error starting proxy server"
@@ -1813,7 +1763,7 @@ msgstr "geen route naar de server"
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "onvoldoende resources"
+msgstr "onvoldoende resourcen"
msgctxt "MainWindow"
msgid "unknown"
@@ -1828,10 +1778,6 @@ 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"
@@ -1851,9 +1797,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia was niet in staat om Tor te starten. Raadpleeg uw instellingen om te"
-" zien of de naam en locatie van uw Tor executable juist is ingesteld."
+msgstr "Vidalia was niet in staat om Tor te starten. Raadpleeg uw instellingen om te zien of de naam en locatie van uw Tor executable juist is ingesteld."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1877,7 +1821,7 @@ msgstr "Vidalia kon de Tor software niet afsluiten"
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Onverwachte fout"
+msgstr "Overwachte fout"
msgctxt "MainWindow"
msgid "Authenticating to Tor"
@@ -1891,9 +1835,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"De Tor software verlangt van Vidalia om een authenticatiecookie te sturen "
-"maar Vidalia heeft er geen gevonden."
+msgstr "De Tor software verlangt van Vidalia om een authenticatiecookie te sturen maar Vidalia heeft er geen gevonden."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1915,21 +1857,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia kon bepaalde gebeurtenissen niet registreren. Hierdoor zijn "
-"verschillende functies van Vidalia niet beschikbaar."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Authenticatiefout"
-
-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."
+msgstr "Vidalia kon bepaalde gebeurtenissen niet registreren. Hierdoor zijn verschillende functies van Vidalia niet beschikbaar."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1939,9 +1867,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"De huidige geïnstalleerde versie van Tor is verlopen en niet langer "
-"aangeraden. Bezoek de Tor website om de nieuwste versie te laden."
+msgstr "De huidige geïnstalleerde versie van Tor is verlopen en niet langer aangeraden. Bezoek de Tor website om de nieuwste versie te laden."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1951,9 +1877,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Alle eerstvolgende verbindingen zullen anders lijken dan uw oude "
-"verbindingen."
+msgstr "Alle eerstvolgende verbindingen zullen anders lijken dan uw oude verbindingen."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1976,98 +1900,19 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Snelkoppeling"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Relaying Instellen"
-
-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 verbergen"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Wachtwoord resetten mislukt"
-
-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."
+msgstr "Wachtwoord reset faalde"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr ""
-"De huidige geïnstalleerde versie van Tor is gedateerd of wordt niet meer "
-"aangeraden."
+msgstr "De huidige geïnstalleerde versie van Tor is gedateerd of wordt niet meer aangeraden."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Wilt u controleren of er een nieuwere versie beschikbaar is om te "
-"installeren?"
+msgstr "Wilt u controleren of er een nieuwere versie beschikbaar is om te installeren?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
@@ -2077,9 +1922,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor heeft uw verbinding automatisch verbroken om uw anonimiteit te "
-"beschermen."
+msgstr "Tor heeft uw verbinding automatisch verbroken om uw anonimiteit te beschermen."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2087,15 +1930,13 @@ msgstr "Update Mislukt"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Uw software is up-to-date"
+msgstr "Uw software is up to date"
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"Er zijn op dit moment geen nieuwe Tor software pakketten beschikbaar voor uw"
-" computer."
+msgstr "Er zijn op dit moment geen nieuwe Tor software pakketten beschikbaar voor uw computer."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2107,78 +1948,102 @@ msgstr "Vidalia was niet in staat om de software updates te installeren."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "De volgende fout is opgetreden:"
+msgstr "De volgende fout vond plaats:"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Eén van je applicaties%1a lijkt een mogelijk onversleutelde en onveilige verbinding te maken naar poort %2."
msgctxt "MainWindow"
msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Alles wat worden verzonden via deze verbinding zou kunnen worden "
-"afgeluisterd. Controleer uw applicatie configuratie en gebruik, indien "
-"mogelijk, alleen gecodeerde protocollen zoals SSL."
+msgstr "Alles wat verzonden wordt via deze verbinding zou gemonitord kunnen worden. Controleer de configuratie van je applicatie en gebruik alleen versleutelde protocollen, zoals SSL, indien mogelijk."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "mislukt (%1)"
+msgid "toolBar"
+msgstr "Werkbalk"
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."
+msgid "Start"
+msgstr "Start"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Stop"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Herstart"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Herlaad Tor's configuratie"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Acties"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Opstarten van torrc van %1 tot %2"
+msgstr "Bezig met bootstrappen van torrc van %1 naar %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"U draait momenteel een relay. Het beëindigen hiervan zal clientverbindingen met een open verbinding direct afbreken.\n"
-"\n"
-"Wilt u uw relay normaal beëindigen en cliënten de tijd geven om een nieuwe relay te zoeken?"
+msgstr "U draait momenteel een relay. Het beëindigen hiervan zal de clientverbindingen met open connecties abrupt stopzetten.\n\nWilt u uw relay sierlijk beëindigen en cliënten de tijd geven om een nieuwe relay te zoeken?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia heeft vastgesteld dat de Tor software onverwacht is afgesloten.\n"
-"\n"
-"Controleert u alstublieft het berichtenlog voor recente waarschuwingen of foutmeldingen."
+msgstr "Vidalia ontdekte dat de Tor software onverwacht stopte.\n\nControleert u alstublieft de berichtenlog voor recente waarschuwingen of foutmeldingen."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(waarschijnlijk Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia probeerde Tor te herstarten, maar was daartoe niet in staat. Controleer je taakbeheer om er voor te zorgen dat er geen andere Tor processen uitgevoerd worden."
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(waarschijnlijk een e-mail client)"
+msgid "failed (%1)"
+msgstr "mislukt (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", mogelijk Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", mogelijk een email cliënt,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Een van uw applicaties %1 lijkt een potentieel onveilige en niet-"
-"versleutelde verbinding met poort %2 te maken."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Uw relay is aan het afsluiten.\nKlik opnieuw op 'Stop' om uw relay nu te stoppen."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Fout tijdens laden van configuratie"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia was niet in staat om Tor's configuratie te herladen."
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "Fout bij Filter Instellen"
+msgstr "Fout bij Instellen Filter"
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr ""
-"Vidalia was niet in staat zich aan te melden bij Tor's voor log meldingen."
+msgstr "Vidalia was niet in staat zich aan te melden voor Tor's log meldingen."
msgctxt "MessageLog"
msgid "Error Opening Log File"
@@ -2194,9 +2059,7 @@ msgstr "Log Bestandsnaam Vereist"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"U dient een bestandsnaam op te geven om logberichten op te kunnen slaan in "
-"een bestand."
+msgstr "U dient een bestandsnaam op te geven om logberichten op te kunnen slaan in een bestand."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2228,7 +2091,7 @@ msgstr "Niet Gevonden"
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "De zoekopdracht heeft niets opgeleverd."
+msgstr "Zoekopdracht heeft niets gevonden."
msgctxt "MessageLog"
msgid "Message Log"
@@ -2236,11 +2099,11 @@ msgstr "Berichten Logboek"
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Berichtfilters..."
+msgstr "Berichten Filters..."
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Stel berichtfilters in"
+msgstr "Stel berichten filters in"
msgctxt "MessageLog"
msgid "History Size..."
@@ -2292,7 +2155,7 @@ msgstr "Alles Opslaan"
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Sla alle berichten op in een bestand"
+msgstr "Sla alle berichten op naar een bestand"
msgctxt "MessageLog"
msgid "Save Selected"
@@ -2372,7 +2235,7 @@ msgstr "Instellingen Opslaan"
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Veranderingen in de instellingen ongedaan maken"
+msgstr "Maakt veranderingen in de instellingen ongedaan"
msgctxt "MessageLog"
msgid "Cancel"
@@ -2380,7 +2243,7 @@ msgstr "Annuleren"
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Berichtfilter"
+msgstr "Berichten Filter"
msgctxt "MessageLog"
msgid "Error"
@@ -2408,7 +2271,7 @@ msgstr "Berichten Log Geschiedenis"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Aantal berichten dat wordt weergeven in berichtenlog scherm"
+msgstr "Aantal berichten dat tegelijk wordt weergeven in berichtenlog scherm"
msgctxt "MessageLog"
msgid "messages"
@@ -2424,39 +2287,27 @@ msgstr "Schakel automatisch opslaan van nieuwe log berichten naar bestand in"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Sla nieuwe logberichten automatisch op in een bestand"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Basis"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor status"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Geavanceerd"
+msgstr "Automatisch nieuwe log berichten opslaan naar bestand"
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Altijd Nieuwe Log Berichten Opslaan"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr "werkbalk"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Bericht dat verschijnt wanneer iets\n"
-"helemaal is fout gegaan en daardoor Tor niet meer kan doorgaan. "
+msgstr "Berichten die weergegeven worden wanneer iets erg fout is gegaan en Tor niet verder kan gaan."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Berichten die alleen verschijnen wanneer \n"
-"iets is fout gegaan met Tor."
+msgstr "Berichten die alleen verschijnen wanneer er iets mis is gegaan met Tor."
msgctxt "MessageLog"
msgid ""
@@ -2464,38 +2315,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Berichten die onregelmatig verschijnen tijdens normaal Tor-gebruik en worden"
-" niet beschouwd als fouten, maar die wel interessant voor u kunnen zijn. "
+msgstr "Berichten die onregelmatig verschijnen gedurende normaal Tor gebruik en worden niet beschouwd als fouten, maar waar je misschien wel wat aan hebt."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Berichten die regelmatig verschijnen \n"
-"tijdens normaal Tor-gebruik."
+msgstr "Berichten die vaak voorkomen tijdens normaal gebruik van Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Hyper-uitgebreide berichten, met name van belang voor Tor ontwikkelaars."
+msgstr "Erg uitgebreide berichten die met name van belang zijn voor Tor ontwikkelaars."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Kan niet schrijven naar het bestand %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Netwerk Kaart"
+msgstr "Kan niet schrijven naar het bestand %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2503,7 +2342,7 @@ msgstr "Ververs"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Vernieuw de lijst met Tor relays en verbindingen"
+msgstr "Ververs de lijst met Tor relays en verbindingen"
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2579,7 +2418,7 @@ msgstr "Bestand Niet Gevonden"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Geen details over het geselecteerde relay beschikbaar."
+msgstr "Geen details over de geselecteerde relay beschikbaar."
msgctxt "NetViewer"
msgid "Unknown"
@@ -2597,52 +2436,61 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Netwerkmap"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Relay"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Verbinding"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Status"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "Ongeldige Bridge"
+msgstr "Ongeldige Brug"
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "De opgegeven bridge identificatie is niet geldig."
+msgstr "De opgegeven bridge identifier is niet geldig."
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Kopieër (Ctrl+C)"
+msgstr "Kopieer (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 ""
-"U moet zowel over een IP-adres of hostnaam en een poortnummer beschikken "
-"voor het configureren van Tor om een proxy te gebruiken voor toegang tot "
-"internet."
+msgstr "Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een proxy te gebruiken om toegang te krijgen tot het internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"U moet over één of meer poorten beschikken waarop uw firewall u in staat "
-"stelt verbinding te maken."
+msgstr "Je moet een of meer poorten opgeven die je firewall toestaat om verbinding mee te maken."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' is geen geldige poort nummer "
+msgstr "'%1' is geen geldig poort nummer."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Controleer of uw lokale netwerk een proxyserver vereist voor toegang tot het"
-" internet"
+msgstr "Vink aan als het lokale netwerk een proxy vereist om toegang tot het internet te krijgen"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Ik gebruik een proxy voor de toegang tot het internet"
+msgstr "Ik gebruik een proxy om verbinding te maken met het Internet"
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Proxy-instellingen"
+msgstr "Proxy instellingen"
msgctxt "NetworkPage"
msgid "Username:"
@@ -2658,22 +2506,19 @@ msgstr "Poort:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Vink aan om alleen verbinding te maken met relays die poorten gebruiken die "
-"door uw firewall zijn toegestaan."
+msgstr "Vink aan om alleen verbinding te maken met relays via poorten die toegestaan zijn door je firewall"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr ""
-"Mijn firewall staat me alleen toe verbinding te maken met bepaalde poorten"
+msgstr "Mijn firewall laat me alleen verbinding maken met bepaalde poorten."
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Firewall-instellingen"
+msgstr "Firewall instellingen"
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Toegestane Poorten:"
+msgstr "Toegestane poorten:"
msgctxt "NetworkPage"
msgid "80, 443"
@@ -2683,55 +2528,49 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Vink aan om directory verzoeken te versleutelen, en optioneel, gebruik maken"
-" van brigde relays om toegang te krijgen tot het Tor netwerk"
+msgstr "Vink aan om directory verzoeken te versleutelen en, optioneel, gebruik bridge relays om toegang tot het Tor netwerk te krijgen"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Mijn ISP blokkeert verbindingen met het Tor netwerk"
+msgstr "Mijn ISP blokkeert verbindingen naar het Tor netwerk"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Bridge-instellingen"
+msgstr "Bridge isntellingen"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Voeg een Bridge toe:"
+msgstr "Voeg een bridge toe:"
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Verwijder de geselecteerde bridges uit de lijst"
+msgstr "Verwijder de geselecteerde bridge van de lijst"
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Kopieër de geselecteerde bridges naar het klembord"
+msgstr "Kopieer de geselecteerde bridge naar het klembord."
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Nu bridges zoeken"
+msgstr "Vind bridges"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Hoe kan ik anders bridges vinden?</a>"
+msgstr "<a href=\"bridges.finding\">Hoe kan ik nog meer bridges vinden?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Hoe vind ik bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Hoe kan ik bridges vinden?</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 ""
-"Er zijn geen nieuwe bridges beschikbaar op dit moment. U kunt een tijdje "
-"wachten of het opnieuw proberen, of probeer een andere methode voor het "
-"vinden van nieuwe bridges."
+msgstr "Geen nieuwe bruggen zijn momenteel beschikbaar. Je kunt een tijdje wachten en opnieuw proberen, of een andere methode voor het vinden van nieuwe bridges proberen."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Klik op Help om andere methoden voor het vinden van nieuwe bridges te zien."
+msgstr "Klik Help om andere methoden te zien om nieuwe bridges te vinden."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2743,7 +2582,7 @@ msgstr "Type:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "U moet de proxy-type selecteren."
+msgstr "Je moet het proxy-type kiezen."
msgctxt "NetworkPage"
msgid "SOCKS 4"
@@ -2827,11 +2666,11 @@ msgstr "Onbekend"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Relay Details"
+msgstr "Relay details"
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Overzicht"
+msgstr "Samenvatting"
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2871,7 +2710,7 @@ msgstr "Laatst Bijgewerkt:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descriptor"
+msgstr "Beschrijving"
msgctxt "RouterListItem"
msgid "Offline"
@@ -2891,11 +2730,11 @@ msgstr "Relay"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zoom naar Relay"
+msgstr "Zoom in op relay"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 relay's online"
+msgstr "%1 relays online"
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2903,47 +2742,39 @@ msgstr "Kopiëren"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Nickname"
+msgstr "Bijnaam"
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Afdruk"
+msgstr "Fingerprint"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Bridge Ondersteuning niet beschikbaar"
+msgstr "Bridge 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 heeft Tor geconfigureerd als een bridge relay voor gecensureerde "
-"gebruikers, maar uw versie van Tor ondersteunt geen bridges."
+msgstr "Je hebt Tor geconfigureerd om als een bridge relay te fungeren voor gecensureerde gebruikers, maar je versie van Tor ondersteunt geen bridges."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Upgrade uw Tor software of stel Tor in om als een normale Tor relay te "
-"laten fungeren."
+msgstr "Upgrade je Tor software of stel Tor in om als een normaal Tor relay te fungeren."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Uw bridge relay is niet actief"
+msgstr "Je bridge relay draait niet."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "U moet in ieder geval een relay nickname en een poort opgeven."
+msgstr "Je moet tenminste een relay bijnaam en poort opgeven"
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Alleen als client uitvoeren"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Verwerk het verkeer van het Tor netwerk"
+msgstr "Draai alleen als client"
msgctxt "ServerPage"
msgid "Relay Port:"
@@ -2951,11 +2782,11 @@ msgstr "Relay poort:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "De relay directory spiegelen"
+msgstr "Schakel in om de relay directory te mirroren."
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Poging om port forwarding automatisch in te stelen."
+msgstr "Probeer automatisch poort forwarding te configureren"
msgctxt "ServerPage"
msgid "Test"
@@ -2963,7 +2794,7 @@ msgstr "Test"
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Toon Help-onderwerp voor poort forwarding"
+msgstr "Toon help onderwerp over poort forwarding"
msgctxt "ServerPage"
msgid "Directory Port:"
@@ -2979,12 +2810,11 @@ msgstr "Contact Info:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Naam van uw relay"
+msgstr "Naam van je relay"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Poort waarop gebruikers en andere relays kunnen communiceren met uw relay"
+msgstr "Poort waarop gebruikers en andere relays kunnen communiceren met jouw relay"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2998,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Voor internetverbindingen met een snelle download, maar langzame upload "
-"snelheid, stel hier alstublieft de upload snelheid in."
+msgstr "Voor internetverbindingen met een snelle download, maar langzame upload snelheid, stel hier alstublieft de upload snelheid in."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3028,7 +2856,7 @@ msgstr "Aangepast"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Kies de optie die het meeste lijkt op uw Internetverbinding"
+msgstr "Kies de optie die het best gelijkt op uw Internetverbinding"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3058,9 +2886,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Uw maximale bandbreedte dient groter of gelijk te zijn aan uw gemiddelde "
-"bandbreedte. Beide waarden dienen tenminste 20 KB/s te zijn."
+msgstr "Uw maximale bandbreedte dient groter dan of gelijk aan uw gemiddelde bandbreedte te zijn. Beide waarden dienen tenminste 20 KB/s te zijn."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3084,7 +2910,7 @@ msgstr "Ophalen E-mail (POP, IMAP)"
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Poorten die niet zijn aangegeven bij andere aanvinkvakjes"
+msgstr "Poorten die niet zijn opgegeven door andere aanvinkvakjes"
msgctxt "ServerPage"
msgid "Misc Other Services"
@@ -3092,9 +2918,7 @@ msgstr "Overige Andere Diensten"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"Poorten 706, 1863, 5050, 5190, 5222, 8300 en 8888 {706, 1863, 5050, 5190, "
-"5222, 5223, 8300 ?}"
+msgstr "Poorten 706, 1863, 5050, 5190, 5222, 8300 en 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3123,17 +2947,13 @@ msgstr "Laat het helponderwerp zien over uitgaand beleid"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Welke Internet-bronnen moeten gebruikers in staat zijn te gebruiken vanuit u"
-" relay?"
+msgstr "Welke internet services moeten gebruikers in staat zijn om toegang tot te krijgen via jouw relay?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor zal sommige uitgaande e-mail en toepassingen voor bestandsdeling nog "
-"steeds blokkeren om spam en ander misbruik te verminderen."
+msgstr "Tor zal sommige uitgaande e-mail- en file-sharingprogramma's standaard blokkeren om spam en ander misbruik te verminderen."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3141,34 +2961,30 @@ msgstr "Uitgaand Beleid"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Verleen anderen toegang tot uw bridge door hen deze lijn te geven:"
+msgstr "Laat anderen uw je bridge benaderen door hen deze regel te geven:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Dit is de identiteit van uw bridge relay die u aan andere mensen kunt geven"
+msgstr "Dit is de identiteit van je bridge relay dat je aan andere mensen kunt geven"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Kopieer uw bridge relay's identiteit naar het klembord"
+msgstr "Kopieer de identiteit van je bridge relay naar het klembord"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Geen recente Gebruik"
+msgstr "Geen recent gebruik"
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr ""
-"Er zijn geen cliënten die onlangs gebruik gemaakt hebben van uw relay ."
+msgstr "Geen clients hebben recentelijke gebruik gemaakt van je relay."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Laat uw relay aan staan zodat cliënten dan een betere kans hebben op het "
-"vinden en het gebruiken van uw relay."
+msgstr "Laat je relay draaien zodat klanten een betere kans hebben om het te vinden en te gebruik."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3176,28 +2992,25 @@ msgstr "Berichten Log Geschiedenis"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
-"Vidalia was niet in staat zich aan te melden voor Tor's log meldingen."
+msgstr "Vidalia was niet in staat zich aan te melden voor Tor's log meldingen."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor ontving een onjuiste geformatteerd reactie toen Vidalia uw bridge's "
-"gebruiksgeschiedenis opvroeg. "
+msgstr "Tor heeft een ongeldig geformatteerd antwoord gestuurd toen Vidalia een verzoek voor bridge-gebruiksgeschiedenis stuurde."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "De ontvangen reactie was: %1"
+msgstr "Het ontvangen antwoord was: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Help gecensureerde gebruikers het Tor netwerk te bereiken"
+msgstr "Help gecensureerde gebruikers het Tor netwerk te bereiken."
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href\"#bridgeUsage\">Wie heeft mijn bridge gebruikt?</a>"
+msgstr "<a href=\"#bridgeUsage\">Wie heeft mijn bridge gebruikt?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
@@ -3205,31 +3018,35 @@ msgstr "<a href=\"#bridgeHelp\">Wat is dit?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Verdeel automatisch mijn bridge adres"
+msgstr "Deel mijn bridge adres automatisch uit"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Herleid verkeer binnen het Tor-netwerk (non-exit relay)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Herleid verkeer voor het Tor-netwerk (exit relay)"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Spiegel van de Relay Directory"
+msgstr "Mirror de relay directory"
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"E-mailadres waarop u kan worden bereikt als er een probleem is met uw "
-"server. U kunt ook uw PGP of GPG fingerprint toevoegen."
+msgstr "E-mailadres waarop u kan worden bereikt als er een probleem is met uw server. Je kan ook je PGP of GPG fingerprint toevoegen."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Fout bij het weghalen van alle diensten"
+msgstr "Fout tijdens depubliceren van services"
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Configureer tenminste één dienst directory en één virtuele poort voor elke "
-"dienst die u wilt opslaan. Verwijder alle andere."
+msgstr "Configureer tenminste één service directory en een virtuele poort voor elke dienst die je wilt opslaan. Verwijder de andere."
msgctxt "ServicePage"
msgid "Error"
@@ -3237,39 +3054,35 @@ msgstr "Fout"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Selecteer een dienst."
+msgstr "Selecteer een Service."
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Selecteer Service Directory"
+msgstr "Kies service directory"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtuele Poort mag alleen geldig poortnummers bevatten [1..65535]."
+msgstr "Virtuele poort mag alleen geldige poortnummers bevatten [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Het doel mag alleen adres:poort, adres of poort bevatten"
+msgstr "Doel kan alleen adres:port, adres of poort bevatten."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Directory al in gebruik door een andere dienst."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulier"
+msgstr "Folder is al in gebruik door een andere service."
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Bied verborgen diensten aan"
+msgstr "Aangeboden hidden services"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Onion Adres"
+msgstr "Onion-adres"
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Virtuele Poort"
+msgstr "Virtuele poort"
msgctxt "ServicePage"
msgid "Target"
@@ -3277,7 +3090,7 @@ msgstr "Doel"
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Pad van directory"
+msgstr "Directory pad"
msgctxt "ServicePage"
msgid "Enabled"
@@ -3285,21 +3098,19 @@ msgstr "Ingeschakeld"
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Voeg een nieuwe dienst aan de lijst toe"
+msgstr "Voeg een nieuwe service toe aan de lijst"
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Verwijder de geselecteerde diensten uit de lijst"
+msgstr "Verwijder geselecteerde service uit de lijst"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopieer onion adres van de geselecteerde dienst naar het klemboard"
+msgstr "Kopieer onion-adres van de geselecteerde service naar het klembord"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Blader in het lokale bestandssysteem en kies een directory voor de gekozen "
-"dienst"
+msgstr "Blader in het lokale bestandssysteem en folder voor de gekozen service"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3307,7 +3118,7 @@ msgstr "Gemaakt door Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Kopieër naar klembord"
+msgstr "Kopieer naar klembord"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
@@ -3315,21 +3126,18 @@ msgstr "De Tor software wordt uitgevoerd"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "U gebruikt momenteel versie \"%1\" van de Tor software."
+msgstr "Je draait momenteel versie \"%1\" van de Tor-software."
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "De Tor-software is niet actief"
+msgstr "De Tor software is niet actief"
msgctxt "StatusEventWidget"
msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Klik op \"Start Tor\" in het Vidalia Configuratiescherm om de Tor software "
-"opnieuw te starten. Als Tor onverwacht getstopt is, selecteer dan hierboven "
-"het tabblad \"Geavanceerd\" voor meer informatie over de opgetreden fouten."
+msgstr "Klik \"Start Tor\" in het Vidalia configuratiescherm om de Tor-software te herstarten. Als Tor onverwacht afsloot, selecteert het tabblad \"Geavanceerd\" hierboven voor meer informatie over de eventueel tegengekomen fouten."
msgctxt "StatusEventWidget"
msgid ""
@@ -3337,9 +3145,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"U gebruikt momenteel versie \"%1\" van de Tor software, deze versie wordt niet meer aangeraden. Upgrade alstublieft naar de meest recente versie van de software die belangrijke beveiliging, betrouwbaarheids- en prestatie-updates kunnen bevatten.\n"
-" "
+msgstr "Je bent draait momenteel versie \"%1\" van de Tor-software, deze wordt niet langer aanbevolen. Update naar de meest recente versie van de software, die belangrijke veiligheids-, betrouwbaarheid- en performancefixes bevat."
msgctxt "StatusEventWidget"
msgid ""
@@ -3347,15 +3153,11 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"U gebruikt momenteel versie \"%1\" van de Tor software, die mogelijk niet "
-"meer werkt met het huidige Tor netwerk. Upgrade alstublieft naar de meest "
-"recente versie van de software die belangrijke beveiliging, "
-"betrouwbaarheids- en prestatie-updates kunnen bevatten."
+msgstr "Je draait momenteel versie \"%1\" van de Tor-software, deze kan niet meer werken met het huidige Tor-netwerk. Update naar de meest recente versie van de software, die belangrijke veiligheids-, betrouwbaarheids- en performancefixes bevat."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Uw Tor Software is niet meer up-to-date."
+msgstr "Je Tor Software is verouderd"
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
@@ -3365,21 +3167,17 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"We hebben succesvol verbinding met het Tor-netwerk gemaakt. U kunt nu uw "
-"toepassingen configureren om anoniem het internet te gebruiken."
+msgstr "We waren in staat om succesvol een verbinding met het Tor-netwerk te maken. Je kunt nu je toepassingen instellen om het internet anoniem te gebruiken."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Tor Software fout"
+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 a.u.b. de volgende "
-"fout aan de Tor ontwikkelaars op bugs.torproject.org:\"%1\""
+msgstr "De Tor software heeft een internet fout aangetroffen. Meld de volgende foutmelding aan de Tor-ontwikkelaars op bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3387,11 +3185,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor heeft opgemerkt dat de klok van uw computer is ingesteld op %1 seconden "
-"in het verleden in vergelijking tot de bron \"%2\". Als uw klok onjuist is, "
-"zal Tor niet kunnen functioneren. Stel a.u.b. uw computer in zodat deze "
-"altijd de juiste tijd weergeeft."
+msgstr "Tor heeft vastgesteld dat je computerklok mogelijk %1 seconde in het verleden is ingesteld ten opzichte van de bron \"%2\". Als je klok niet juist is, zal Tor niet kunnen functioneren. Controleer dat je computer de juiste tijd aangeeft."
msgctxt "StatusEventWidget"
msgid ""
@@ -3399,15 +3193,11 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor heeft opgemerkt dat de klok van uw computer is ingesteld op %1 seconden "
-"in de toekomst in vergelijking tot de bron \"%2\". Als uw klok onjuist is, "
-"zal Tor niet kunnen functioneren. Stel a.u.b. uw computer in zodat deze "
-"altijd de juiste tijd weergeeft."
+msgstr "Tor heeft vastgesteld dat je computerklok mogelijk %1 seconde in de toekomst is ingesteld ten opzichte van de bron \"%2\". Als je klok niet juist is, zal Tor niet kunnen functioneren. Controleer dat je computer de juiste tijd aangeeft."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "De klok van uw computer is mogelijk onjuist "
+msgstr "De klok van je computer is mogelijk incorrect"
msgctxt "StatusEventWidget"
msgid ""
@@ -3415,25 +3205,18 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"Een van uw applicaties op uw computer heeft geprobeerd om een niet-"
-"beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde "
-"informatie over het Tor netwerk is gevaarlijk en word niet aangeraden. Voor "
-"uw veiligheid, heeft Tor automatisch deze verbinding geblokkeerd."
+msgstr "Een van de toepassingen op uw computer heeft mogelijk geprobeerd een onversleutelde verbinding via Tor naar poort %1 te maken. Het verzenden van onversleutelde informatie over het Tor netwerk is gevaarlijk en niet aanbevolen. Voor je eigen bescherming heeft Tor automatisch deze verbinding gesloten."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Een van uw applicaties op uw computer heeft geprobeerd om een niet-"
-"beveiligde verbinding te maken met poort %1. Het zenden van niet-beveiligde "
-"informatie over het Tor netwerk is gevaarlijk en word niet aangeraden."
+msgstr "Een van de toepassingen op uw computer heeft mogelijk geprobeerd een onversleutelde verbinding via Tor naar poort %1 te maken. Het verzenden van onversleutelde informatie over het Tor netwerk is gevaarlijk en niet aanbevolen."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potentieel gevaarlijke verbinding!"
+msgstr "Mogelijk gevaarlijke verbinding!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3441,11 +3224,7 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Een van uw applicaties heeft een verbinding opgezet via Tor naar \"%1\" "
-"gebruik makend van een protocol dat informatie over uw bestemming kan "
-"lekken. Controleer dat uw applicaties zo zijn ingesteld dat ze alleen "
-"SOCKS4a of SOCKS5 met een remote hostname resolution gebruiken."
+msgstr "Een van je applicaties heeft een verbinding gemaakt via Tor met \"%1\" gebruikmakend van een protocol dat informatie over je bestemming kan lekken. Zorg er voor dat je je toepassingen instelt om alleen SOCKS4a of SOCKS5 gebruikt met remote hostname resolution."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
@@ -3456,91 +3235,70 @@ msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Een van uw applicaties heeft geprobeerd om een verbinding via Tor gebruik "
-"makend met een protocol dat Tor niet begrijpt. Zorg ervoor dat uw "
-"toepassingen ingesteld zijn om alleen SOCKS4a of SOCKS5 te gebruiken met "
-"remote hostnaam resolutie."
+msgstr "Een van je applicaties heeft een verbinding geprobeerd te maken via Tor, gebruikmakend van een protocol dat Tor niet begrijpt. Zorg er voor dat je je toepassingen instelt om alleen SOCKS4a of SOCKS5 gebruikt met remote hostname resolution."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Ongeldige bestemmingshostnaam"
+msgstr "Ongeldige bestemming hostnaam"
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Een van uw applicaties heeft een verbinding opgezet door Tor naar \"%1\", "
-"Tor herkend deze hostname niet als een geldige hostname. Controleer "
-"alstublieft de instellingen van uw applicaties."
+msgstr "Een van je applicaties heeft een verbinding geprobeerd te maken via Tor naar \"%1\", maar Tor herkend dit niet als een geldige hostnaam. Controleer de configuratie van je applicatie."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Extern IP-adres veranderd"
+msgstr "Externe IP-adres veranderd"
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"Tor heeft vastgesteld dat uw relay's openbare IP-adres momenteel %1%2 is. "
-"Als dit niet correct is, raadpleeg alstublieft de instelling 'Adres' in uw "
-"relay's instellingen."
+msgstr "Tor heeft bepaald dat het openbare IP-adres van je relay momenteel %1%2 is. Als dit niet klopt, overweeg de 'Adres' optie in te stellen in de configuratie van je relay."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS Hijacking gedetecteerd"
+msgstr "DNS-kaping gedetecteerd"
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor heeft gedetecteerd dat uw DNS-provider onjuiste antwoorden geeft over "
-"domeinen die niet bestaan. Sommige ISP's en andere DNS-aanbieders, zoals "
-"OpenDNS, staan bekend om dit te doen om hun eigen zoekmachines of reclame "
-"weer te geven."
+msgstr "Tor heeft gedetecteerd dat je DNS-provider valse reacties teruggeeft voor domeinen die niet bestaan. Sommige ISP's en andere DNS-aanbieders, zoals OpenDNS, staan bekend om dit te doen om hun eigen zoek- of reclamepagina's weer te geven."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor heeft gedetecteerd dat uw DNS-provider onjuiste antwoorden geeft over "
-"zeer bekende domeinen. Aangezien de cliënten vertrouwen op Tor netwerk "
-"relays om nauwkeurige DNS reacties, zul uw relay niet worden geconfigureerd "
-"als een exit relay."
+msgstr "Tor heeft gedetecteerd dat je DNS-provider valse reacties teruggeeft voor goed bekende domeinen. Omdat clients er op vertrouwen dat Tor netwerk relays correcte DNS teruggeven zal je relay niet worden ingesteld als exit relay."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Controle Server Port Bereikbaarheid"
+msgstr "Bezig met bereikbaarheid server poort te controleren."
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"Tor probeert vast te stellen of uw relay's server poort te bereiken is via "
-"het Tor netwerk door zichzelf te verbinden naar %1:%2. Deze test kan een "
-"paar minuten in beslag nemen. "
+msgstr "Tor probeert te bepalen of de server poort van je relay bereikbaar is vanaf het Tor-netwerk door naar zichzelf te verbinden op %1:%2. Deze test kan enkele minuten duren."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Server Poort Bereikbaarheid test geslaagd!"
+msgstr "Server poort bereikbaarheidstest geslaagd!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Uw relay server poort is bereikbaar vanaf het Tor netwerk!"
+msgstr "Je relay's server poort is bereikbaar vanaf het Tor netwerk!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Server Port Bereikbaarheid Test mislukt"
+msgstr "Server poort bereikbaarheidstest mislukt"
msgctxt "StatusEventWidget"
msgid ""
@@ -3548,37 +3306,30 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"Uw relay's server poort is niet bereikbaar voor andere Tor cliënten. Dit kan"
-" gebeuren als u achter een router of een firewall zit die portfowarding "
-"vereist. Als %1:%2 niet uw correcte IP-adres en serverpoort is, controleer "
-"dan alstublieft uw relay's instellingen. "
+msgstr "De server poort van je relay is niet bereikbaar voor andere Tor clients. Dit kan gebeuren als je achter een router of firewall zit waarvoor het nodig is dat je poort forwarding opzet. Als %1:%2 is niet de juiste IP-adres en server poort combinatie is, controleer dan je relay configuratie."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Controleert Directory Poort Bereikbaarheid"
+msgstr "Bezig met bereikbaarheid Directory poort te controleren"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor probeert vast te stellen of uw relay's directory poort beschikbaar is "
-"vanaf het Tor netwerk door zichzelf te verbinden naar %1:%2. Deze test kan "
-"een paar minuten in beslag nemen."
+msgstr "Tor probeert te bepalen of de directory poort van je relay bereikbaar is vanaf het Tor-netwerk door naar zichzelf te verbinden op %1:%2. Deze test kan enkele minuten duren."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Directory Poort Bereikbaarheid test geslaagd!"
+msgstr "Directory Poort bereikbaarheid test succesvol!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Uw relay's directory poort is bereikbaar vanaf het Tor netwerk!"
+msgstr "Je relay's directory poort is bereikbaar vanaf het Tor netwerk!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Directory Poort Bereikbaarheid Test mislukt"
+msgstr "Directory Poort bereikbaarheid test mislukt"
msgctxt "StatusEventWidget"
msgid ""
@@ -3586,11 +3337,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"Uw relay's directory poort is niet bereikbaar voor andere cliënten. Dit kan "
-"gebeuren als u achter een router of een firewall zit die een poort fowarding"
-" vereist. Als %1:%2 niet uw correcte IP-adres en directory poort is, "
-"controleer alstublieft uw relay's instellingen. "
+msgstr "De directory poort van je relay is niet bereikbaar voor andere Tor clients. Dit kan gebeuren als je achter een router of firewall zit waarvoor het nodig is dat je poort forwarding opzet. Als %1:%2 is niet de juiste IP-adres en server poort combinatie is, controleer dan je relay configuratie."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
@@ -3600,14 +3347,11 @@ msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Uw relay's descriptor, die het mogelijk maakt voor cliënten om verbinding te"
-" maken met uw relay, is verworpen door de directory server op %1/%2. De "
-"reden daarvoor was: %3 "
+msgstr "De beschrijving van je relay, die clients in staat stelt om verbinding te maken met je relay, werd afgekeurd door de directory server op %1:%2. De opgegeven reden was: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Uw Relay is online"
+msgstr "Je relay is online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3615,11 +3359,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"Uw relay is nu online en beschikbaar voor het gebruik door Tor-clients. U "
-"zou binnen een paar uur een toename van het netwerkverkeer in de bandbreedte"
-" Graph moeten zien als meer en meer gebruikers kennis nemen van uw relay. "
-"Dank u voor het bijdragen aan het Tor netwerk!"
+msgstr "Je relay is nu online en beschikbaar voor Tor clients om te gebruiken. Je zou binnen een paar uur een toename van het netwerkverkeer moeten zien, weergegeven door de bandbreedte grafiek, zodra meer clients van je relay afweten. Dank j wel voor het bijdragen aan het Tor netwerk!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Berichtenlog"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Tor status"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Tonen bij opstarten"
msgctxt "Stream"
msgid "New"
@@ -3647,7 +3403,7 @@ msgstr "Gesloten"
msgctxt "Stream"
msgid "Retrying"
-msgstr "Opnieuw proberen"
+msgstr "Opnieuw"
msgctxt "Stream"
msgid "Remapped"
@@ -3657,13 +3413,19 @@ 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 "Vidalia heeft Tor niet gestart. Je moet Tor stoppen de interface waarmee je het gestart hebt."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Stoppen van proces %1 mislukt. [%2]"
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "De Tor service is niet geïnstalleerd."
+msgstr "De Tor service is niet geínstalleerd."
msgctxt "TorService"
msgid "Unable to start the Tor service."
@@ -3671,7 +3433,7 @@ msgstr "Starten Tor service mislukt."
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Het hashen van het controle wachtwoord is mislukt."
+msgstr "Hashen control wachtwoord mislukt."
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3681,9 +3443,7 @@ msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Instellingen opslaan. Indien niet aangevinkt zal alleen instellingen van het"
-" huidige Tor instantie toevoegt worden."
+msgstr "Instellingen opslaan. Indien niet aangevinkt zal het alleen toegepast worden op de huidige Tor instantie."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3703,7 +3463,7 @@ msgstr "Ongedaan maken"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Vorige ingave herstellen"
+msgstr "Opnieuw"
msgctxt "TorrcDialog"
msgid "Select All"
@@ -3711,20 +3471,19 @@ msgstr "Alles selecteren"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Pas alles toe"
+msgstr "Alles toepassen"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Pas alleen de selectie toe "
+msgstr "Alleen selectie toepassen"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Fout bij verbinding maken met Tor"
+msgstr "Fout tijdens verbinden met Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Selectie is leeg. Selecteer een stuk tekst of vink \"Voeg alles toe\" aan "
+msgstr "Selectie is leeg. Selecteer een stuk tekst, of vink \"Alles toepassen\" aan"
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3736,7 +3495,31 @@ msgstr "Fout"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Er is een fout opgetreden tijdens het openen van het torrc bestand"
+msgstr "Er is een fout opgetreden tijdens openen van torrc bestand"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
msgctxt "UPNPControl"
msgid "Success"
@@ -3748,7 +3531,7 @@ msgstr "Geen UPnP-apparaten gevonden"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Er is geen geldig UPnP-internet gateway-apparaten gevonden"
+msgstr "Geen geldig UPnP-internet-gateway apparaat gevonden"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3756,15 +3539,15 @@ msgstr "WSAStartup mislukt"
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Niet in geslaagd om een poort indeling toe te voegen"
+msgstr "Poort mapping toevoegen mislukt"
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Niet in geslaagd om een poort indeling op te halen"
+msgstr "Poort mapping ophalen mislukt"
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Niet in geslaagd om een poort indeling te verwijderen"
+msgstr "Poort mapping verwijderen mislukt"
msgctxt "UPNPControl"
msgid "Unknown error"
@@ -3772,15 +3555,15 @@ msgstr "Onbekende fout"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Bezig met ontdekken van UPnP-apparaten"
+msgstr "Bezig met ontdekken van UPnP-compatibele apparaten"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Bezig met updaten directory poort indeling"
+msgstr "Bezig met updaten van directory poort mapping"
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Bezig met updaten van relay poort indeling"
+msgstr "Bezig met updaten van relay poort mapping"
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
@@ -3788,7 +3571,7 @@ msgstr "Test succesvol afgerond!"
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Bezig met testen UPnP Ondersteuning"
+msgstr "Bezig met testen UPnP ondersteuning"
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
@@ -3798,21 +3581,17 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia kon niet controleren op beschikbare software updates omdat het '%1' "
-"niet kon vinden."
+msgstr "Vidalia was niet in staat om op beschikbare software-updates te controleren, omdat het '%1' niet kon vinden."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia was niet in staat om te controleren op beschikbare software-updates,"
-" want Tor's update-proces stopte onverwacht."
+msgstr "Vidalia was niet in staat om op beschikbare software-updates te controleren, omdat Tor's update-proces onverwachts afsloot."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Controleren op beschikbare updates ..."
+msgstr "Bezig met controleren van beschikbare updates..."
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3820,7 +3599,7 @@ msgstr "Verbergen"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Downloaden van updates ..."
+msgstr "Bezig met downloaden van updates..."
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
@@ -3828,7 +3607,7 @@ msgstr "Bezig met installeren van software update..."
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Klaar! Uw software is nu up-to-date."
+msgstr "Klaar! Je software is nu up-to-date."
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3840,7 +3619,7 @@ msgstr "Software-updates"
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Controleren op updates ..."
+msgstr "Bezig met controleren op updates..."
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3852,7 +3631,7 @@ msgstr "Software-updates beschikbaar"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Herinner mij later"
+msgstr "Herinner me later"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3860,17 +3639,24 @@ msgstr "Installeren"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"De volgende bijgewerkte software pakketten zijn klaar voor installatie:"
+msgstr "De volgende bijgewerkte software-pakketten zijn klaar voor installatie:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Pakket"
+msgstr "Backspace"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Versie"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Bezig met uploaden van crashraportage"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Kan rapport niet verzenden: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3893,7 +3679,7 @@ msgstr "Help"
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Opnieuw proberen"
+msgstr "Opnieuw"
msgctxt "VMessageBox"
msgid "Show Log"
@@ -3905,7 +3691,7 @@ msgstr "Instellingen Weergeven"
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Doorgaan"
+msgstr "Verder"
msgctxt "VMessageBox"
msgid "Quit"
@@ -3945,7 +3731,7 @@ msgstr "Stelt de naam en locatie in van Vidalia's logbestand."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Stelt de detailering van Vidalia's loggedrag in."
+msgstr "Stelt de uitgebreidheid in van Vidalia's loggedrag."
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
@@ -3961,36 +3747,30 @@ msgstr "Vidalia Gebruiks Informatie"
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Kan het log bestand '%1' niet openen: %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Vereiste waarde voor parameter :"
+msgstr "Openen mislukt van log bestand '%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Ongeldige taal code:"
+msgstr "Ongeldige taalcode opgegeven:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Ongeldig GUI-stijl:"
+msgstr "Ongeldige GUI-stijl opgegeven:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Ongeldige log niveau opgegeven:"
+msgstr "Ongeldige logniveau opgegeven:"
msgctxt "Vidalia"
msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Een ander Vidalia proces is mogelijk reeds actief is. Als er geen andere Vidalia proces actief is, kunt u ervoor kiezen om toch door te gaan. \n"
-"Wilt u doorgaan met het starten van Vidalia?"
+msgstr "Een ander Vidalia proces is mogelijk reeds actief is. Als er werkelijk geen ander Vidalia proces actief is, kun je ervoor kiezen om toch verder te gaan. Wilt je verder gaan met het starten van Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 sec"
+msgstr "%1 seconden"
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -4019,5 +3799,3 @@ 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 90ebc20..24c55b4 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 944508b..b966b2a 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:41+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 f3ace62..ed69d19 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 b40ee73..67b1b2c 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 b0ed7e9..965c5e9 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pl/qt_pl.po b/src/vidalia/i18n/po/pl/qt_pl.po
index c2f3146..620a6fc 100644
--- a/src/vidalia/i18n/po/pl/qt_pl.po
+++ b/src/vidalia/i18n/po/pl/qt_pl.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-04-18 09:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 b"
-
-
diff --git a/src/vidalia/i18n/po/pl/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po
index 4a60630..614fba8 100644
--- a/src/vidalia/i18n/po/pl/vidalia_pl.po
+++ b/src/vidalia/i18n/po/pl/vidalia_pl.po
@@ -1,13 +1,14 @@
#
# Translators:
+# <brosper at gmail.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: Brosper <brosper 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"
@@ -115,9 +116,7 @@ msgstr "Plik konfiguracyjny Tora"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Uruchom oprogramowanie Tora używając wybranego pliku konfiguracyjnego "
-"(torrc)"
+msgstr "Uruchom oprogramowanie Tora używając wybranego pliku konfiguracyjnego (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -181,7 +180,7 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
@@ -196,18 +195,11 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia nie mogła usunąć usługi Tor.\n"
-"\n"
-"Będziesz musiał usunąć ją ręcznie."
+msgstr "Vidalia nie mogła usunąć usługi Tor.\n\nBędziesz musiał usunąć ją ręcznie."
msgctxt "AppearancePage"
msgid "Language"
@@ -242,10 +234,6 @@ msgid "Show Settings"
msgstr "Pokaż ustawienia"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Użycie Łącza"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Resetuj"
@@ -285,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Anuluj"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Wykres przepustowości"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Wysyłanie żądania HTTPS do mostu..."
@@ -438,20 +430,27 @@ msgid "Control socket is not connected."
msgstr "Gniazdo sterujące nie jest podłączone."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Wymagane hasło"
+msgid "Problem connecting to Tor"
+msgstr "Problem połączenia z siecią Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Zapamiętaj hasło"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
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."
@@ -1267,52 +1266,59 @@ msgstr "Tajwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Wyślij raport błędów"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Wyślij raport błędów do developerów Vidalia"
msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
+msgid "Restart Vidalia"
+msgstr "Restart Vidalia"
msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
+msgid "Don't Restart"
+msgstr "Nie restartuj"
msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
+msgid "Unable to restart Vidalia"
+msgstr "Nie można zrestartować Vidalia"
msgctxt "CrashReportDialog"
msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Łączę..."
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Wysyłam raport błędów..."
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Otrzymuję odpowiedź..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1339,10 +1345,6 @@ 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"
@@ -1370,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Sprawdź teraz"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Połącz z siecią Tor automatycznie"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1531,10 +1537,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia może otworzyć wskazany link w domyślnej przeglądarce. Jeśli Twoja "
-"przeglądarka nie jest skonfigurowana na używanie sieci Tor, żądanie nie "
-"będzie anonimowe."
+msgstr "Vidalia może otworzyć wskazany link w domyślnej przeglądarce. Jeśli Twoja przeglądarka nie jest skonfigurowana na używanie sieci Tor, żądanie nie będzie anonimowe."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1548,9 +1551,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia nie mogła otworzyć linku w Twojej przeglądarce. Jednakże możesz "
-"skopiować adres URL i wkleić bezpośrednio do przeglądarki."
+msgstr "Vidalia nie mogła otworzyć linku w Twojej przeglądarce. Jednakże możesz skopiować adres URL i wkleić bezpośrednio do przeglądarki."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1598,7 +1599,7 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1606,11 +1607,11 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Błąd"
msgctxt "LogTreeItem"
msgid "Unknown"
@@ -1657,34 +1658,6 @@ 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"
@@ -1693,10 +1666,6 @@ 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"
@@ -1809,10 +1778,6 @@ 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"
@@ -1832,9 +1797,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia nie mogła uruchomić Tora. Proszę sprawdzić ustawienia, aby upewnić "
-"się co do ścieżki dostępu do pliku wykonywalnego Tora."
+msgstr "Vidalia nie mogła uruchomić Tora. Proszę sprawdzić ustawienia, aby upewnić się co do ścieżki dostępu do pliku wykonywalnego Tora."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1872,9 +1835,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Oprogramowanie Tor wymaga od Vidalii wysłania zawartości ciasteczka "
-"uwierzytelniającego, jednakże Vidalia nie znalazła żadnego."
+msgstr "Oprogramowanie Tor wymaga od Vidalii wysłania zawartości ciasteczka uwierzytelniającego, jednakże Vidalia nie znalazła żadnego."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1896,21 +1857,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia nie mogła zarejestrować się w systemie do obsługi zdarzeń. Wiele "
-"funkcji może być niedostępnych."
-
-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ą."
+msgstr "Vidalia nie mogła zarejestrować się w systemie do obsługi zdarzeń. Wiele funkcji może być niedostępnych."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1920,9 +1867,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Zainstalowana obecnie wersja Tora jest przestarzała lub nie polecana. Proszę"
-" odwiedzić stronę Tora i ściągnąć najnowszą wersję."
+msgstr "Zainstalowana obecnie wersja Tora jest przestarzała lub nie polecana. Proszę odwiedzić stronę Tora i ściągnąć najnowszą wersję."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1944,8 +1889,7 @@ msgstr "Przekierowanie portu zawiodło"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia nie zdołała automatycznie skonfigurować przekierowania portów."
+msgstr "Vidalia nie zdołała automatycznie skonfigurować przekierowania portów."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1956,90 +1900,14 @@ 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 ""
-"Zainstalowana obecnie wersja Tora jest przestarzała lub nie polecana. Proszę"
-" odwiedzić stronę Tora i ściągnąć najnowszą wersję."
+msgstr "Zainstalowana obecnie wersja Tora jest przestarzała lub nie polecana. Proszę odwiedzić stronę Tora i ściągnąć najnowszą wersję."
msgctxt "MainWindow"
msgid ""
@@ -2054,8 +1922,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor automatycznie zamknął Twoje połączenie, aby chronić Twoją anonimowość."
+msgstr "Tor automatycznie zamknął Twoje połączenie, aby chronić Twoją anonimowość."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2085,22 +1952,40 @@ msgstr "Wystąpił następujący błąd:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "nie powiodło się (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr "Start"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Stop"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Restart"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
msgstr ""
-"Twój węzeł zostanie wyłączony.\n"
-"\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2111,33 +1996,45 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Posiadasz uruchomiony węzeł Tora. Wyłączenie węzła przerwie wszystkie otwarte połączenia z klientami.\n"
-"\n"
-"Czy chciałbyś uprzedzić ich o tym fakcie i dać czas na znalezienie nowego serwera?"
+msgstr "Posiadasz uruchomiony węzeł Tora. Wyłączenie węzła przerwie wszystkie otwarte połączenia z klientami.\n\nCzy chciałbyś uprzedzić ich o tym fakcie i dać czas na znalezienie nowego serwera?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia wykryła, że Tor nieoczekiwanie zakończył działanie.\n"
-"\n"
-"Proszę sprawdzić logi w celu poznania przyczyny."
+msgstr "Vidalia wykryła, że Tor nieoczekiwanie zakończył działanie.\n\nProszę sprawdzić logi w celu poznania przyczyny."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+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 "(probably an email client)"
-msgstr ""
+msgid "failed (%1)"
+msgstr "nie powiodło się (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", prawdopodobnie Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", prawdopodobnie klient e-mail,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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"
@@ -2393,36 +2290,24 @@ msgid "Automatically save new log messages to a file"
msgstr "Automatycznie zapisuj wiadomości do pliku"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Zawsze zapisuj nowe wiadomości"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Zawsze zapisuj nowe wiadomości"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Wiadomości, które pojawiają się, gdy \n"
-"pojawił się poważny błąd i Tor nie mógł kontynuować."
+msgstr "Wiadomości, które pojawiają się, gdy \npojawił się poważny błąd i Tor nie mógł kontynuować."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Wiadomości, które pojawiają się, gdy\n"
-"coś poszło źle z Torem."
+msgstr "Wiadomości, które pojawiają się, gdy\ncoś poszło źle z Torem."
msgctxt "MessageLog"
msgid ""
@@ -2430,40 +2315,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Wiadomości, które pojawiają się rzadko \n"
-"podczas normalnej pracy i nie są uważane za błędy,\n"
-"ale mogą Cię zainteresować."
+msgstr "Wiadomości, które pojawiają się rzadko \npodczas normalnej pracy i nie są uważane za błędy,\nale mogą Cię zainteresować."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Wiadomości, które często pojawiają się \n"
-"podczas normalnej pracy Tora."
+msgstr "Wiadomości, które często pojawiają się \npodczas normalnej pracy Tora."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Bardzo szczegółowe wiadomości, będące\n"
-"zainteresowaniem programistów Tora."
+msgstr "Bardzo szczegółowe wiadomości, będące\nzainteresowaniem programistów Tora."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Nie można zapisywać do pliku %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa Sieci"
+msgstr "Nie można zapisywać do pliku %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2565,6 +2436,22 @@ 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"
@@ -2581,17 +2468,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Musisz określić adres IP lub nazwę hosta oraz numer portu, aby Tor mógł "
-"używać serwera proxy w dostępie do Internetu."
+msgstr "Musisz określić adres IP lub nazwę hosta oraz numer portu, aby Tor mógł używać serwera proxy w dostępie do Internetu."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Musisz określić jeden lub kilka portów, na których Twój firewall akceptuje "
-"przychodzące połączenia."
+msgstr "Musisz określić jeden lub kilka portów, na których Twój firewall akceptuje przychodzące połączenia."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2623,9 +2506,7 @@ msgstr "Port"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Zaznacz, aby łączyć się do węzłów używając portów dozwolonych w Twoim "
-"firewallu"
+msgstr "Zaznacz, aby łączyć się do węzłów używając portów dozwolonych w Twoim firewallu"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2647,9 +2528,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Zaznacz aby zaszyfrować żądania dostępu do katalogu i, opcjonalnie, używać "
-"węzłów-mostów w dostępie do sieci Tor"
+msgstr "Zaznacz aby zaszyfrować żądania dostępu do katalogu i, opcjonalnie, używać węzłów-mostów w dostępie do sieci Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2687,9 +2566,7 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Nowe węzły-mosty nie są dostępne. Możesz poczekać i spróbować ponownie, albo"
-" użyć innej metody znalezienia nowych węzłów-mostów."
+msgstr "Nowe węzły-mosty nie są dostępne. Możesz poczekać i spróbować ponownie, albo użyć innej metody znalezienia nowych węzłów-mostów."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2879,9 +2756,7 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Skonfigurowałeś swojego Tora jako węzeł-most dla zablokowanych użytkowników,"
-" ale Twoja wersja Tora nie obsługuje tej funkcji."
+msgstr "Skonfigurowałeś swojego Tora jako węzeł-most dla zablokowanych użytkowników, ale Twoja wersja Tora nie obsługuje tej funkcji."
msgctxt "ServerPage"
msgid ""
@@ -2902,10 +2777,6 @@ msgid "Run as a client only"
msgstr "Działaj tylko jako klient"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Udostępnij moje łącze dla sieci Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Port węzła:"
@@ -2957,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Dla połączeń o wysokiej prędkości ściągania a niskiej wysyłania, proszę "
-"wybrać typ o zbliżonej prędkości wysyłania."
+msgstr "Dla połączeń o wysokiej prędkości ściągania a niskiej wysyłania, proszę wybrać typ o zbliżonej prędkości wysyłania."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3017,9 +2886,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Twoja maksymalna przepustowość musi być większa lub równa średniej "
-"przepustowości. Obie wartości muszą wynosić co najmniej 20 KB/s."
+msgstr "Twoja maksymalna przepustowość musi być większa lub równa średniej przepustowości. Obie wartości muszą wynosić co najmniej 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3080,18 +2947,13 @@ msgstr "Pokazuje pomoc dotyczącą reguł"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Jakie zasoby Internetu będą dostępne dla użytkowników korzystających z "
-"twojego serwera ?"
+msgstr "Jakie zasoby Internetu będą dostępne dla użytkowników korzystających z twojego serwera ?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor będzie domyślnie blokował niektóre wychodzące połączenia poczty "
-"elektronicznej i aplikacji p2p, aby zredukować liczbę spamu i innych "
-"nadużyć."
+msgstr "Tor będzie domyślnie blokował niektóre wychodzące połączenia poczty elektronicznej i aplikacji p2p, aby zredukować liczbę spamu i innych nadużyć."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3099,8 +2961,7 @@ msgstr "Polityka połączeń"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Pozwalaj innym na dostęp do Twojego mostu poprzez użycie następującej linii:"
+msgstr "Pozwalaj innym na dostęp do Twojego mostu poprzez użycie następującej linii:"
msgctxt "ServerPage"
msgid ""
@@ -3137,9 +2998,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor zwrócił odpowiedź w niepoprawnym formacie, gdy Vidalia poprosiła o "
-"historię użycia Twojego węzła."
+msgstr "Tor zwrócił odpowiedź w niepoprawnym formacie, gdy Vidalia poprosiła o historię użycia Twojego węzła."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3147,9 +3006,7 @@ msgstr "Zwrócona odpowiedź: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
-"Pomóż użytkownikom z ograniczeniami uzyskać dostęp do sieci Tor (Tor "
-"0.2.0.8-alpha i nowsze)"
+msgstr "Pomóż użytkownikom z ograniczeniami uzyskać dostęp do sieci Tor (Tor 0.2.0.8-alpha i nowsze)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3164,6 +3021,14 @@ 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"
@@ -3171,9 +3036,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Adres e-mail, pod którym jesteś dostępny w przypadku\n"
-"problemów z działaniem Twojego węzła. Możesz również zamieścić sygnatury PGP lub GPG."
+msgstr "Adres e-mail, pod którym jesteś dostępny w przypadku\nproblemów z działaniem Twojego węzła. Możesz również zamieścić sygnatury PGP lub GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3183,9 +3046,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Proszę skonfigurować przynajmniej katalog usług oraz wirtualny port dla "
-"każdej usługi. Inne proszę usunąć."
+msgstr "Proszę skonfigurować przynajmniej katalog usług oraz wirtualny port dla każdej usługi. Inne proszę usunąć."
msgctxt "ServicePage"
msgid "Error"
@@ -3212,10 +3073,6 @@ 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"
@@ -3304,7 +3161,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Połączono z siecią Tor"
msgctxt "StatusEventWidget"
msgid ""
@@ -3314,7 +3171,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr ""
+msgstr "Błąd programu Tor"
msgctxt "StatusEventWidget"
msgid ""
@@ -3504,6 +3361,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Status sieci Tor"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Nowe"
@@ -3540,6 +3413,12 @@ 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]"
@@ -3588,19 +3467,19 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Wybierz wszystko"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr ""
+msgstr "Zaznacz wszystko"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr ""
+msgstr "Zaznacz wybrane"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Błąd połączenia z siecią Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
@@ -3612,12 +3491,36 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Błąd"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Sukces"
@@ -3678,17 +3581,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia nie mogła sprawdzić dostępności nowej wersji oprogramowania ponieważ"
-" nie znalazła '%1'."
+msgstr "Vidalia nie mogła sprawdzić dostępności nowej wersji oprogramowania ponieważ nie znalazła '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia nie mogła sprawdzić dostępności nowej wersji oprogramowania, "
-"ponieważ składnik Tora nieoczekiwanie zakończył działanie."
+msgstr "Vidalia nie mogła sprawdzić dostępności nowej wersji oprogramowania, ponieważ składnik Tora nieoczekiwanie zakończył działanie."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3750,6 +3649,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "wersja"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Wyślij raport błędów"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Nie można wysłać raportu: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3843,10 +3750,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Nie udało się otworzyć pliku logu '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Niepoprawny kod języka:"
@@ -3863,10 +3766,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Inny proces Vidalii jest prawdopodobnie już uruchomiony. Jeśli jesteś pewien że nie, możesz kontynuować.\n"
-"\n"
-"Czy chcesz kontynuować uruchamianie Vidalii?"
+msgstr "Inny proces Vidalii jest prawdopodobnie już uruchomiony. Jeśli jesteś pewien że nie, możesz kontynuować.\n\nCzy chcesz kontynuować uruchamianie Vidalii?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3899,5 +3799,3 @@ 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 9ebe381..a0f7ffb 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 3ced494..52baa3f 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pt/qt_pt.po b/src/vidalia/i18n/po/pt/qt_pt.po
index 8b14d9e..e7234c5 100644
--- a/src/vidalia/i18n/po/pt/qt_pt.po
+++ b/src/vidalia/i18n/po/pt/qt_pt.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# <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: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-06-06 22:43+0000\n"
-"Last-Translator: miguelmacedo <miguelmacedo at netcabo.pt>\n"
+"PO-Revision-Date: 2011-03-18 11:06+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +22,12 @@ msgstr "Activar"
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "O executável '%1' requer Qt %2, Qt %3 encontrado."
+msgstr "O executável '%1' requere Qt %2, Qt %3 encontrado."
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Biblioteca Qt incompatível. Erro."
+msgstr "Erro de Incompatibilidade da Biblioteca Qt"
#: qapplication.cpp:2095
msgctxt "QApplication"
@@ -75,7 +72,7 @@ msgstr "Aplicar"
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "Restaurar definições"
+msgstr "Restaurar"
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
@@ -160,7 +157,7 @@ msgstr "Tamanho"
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "Espécie"
+msgstr "Tipo"
#: qdirmodel.cpp:429
msgctxt "QDirModel"
@@ -204,7 +201,7 @@ msgid ""
"Do you want to replace it?"
msgstr ""
"%1 já existe.\n"
-"Deseja substituí-lo?"
+"Deseja substituir?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -215,7 +212,7 @@ msgid ""
msgstr ""
"%1\n"
"Ficheiro não encontrado.\n"
-"Por favor verifique que foi dado o nome correcto do ficheiro."
+"Por favor verifique o nome do ficheiro."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -245,12 +242,12 @@ msgstr "Recuar"
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "Pasta Parental"
+msgstr "Pasta Principal"
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "Vista da Lista"
+msgstr "Vista em Lista"
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
@@ -275,8 +272,8 @@ msgid ""
"Please verify the correct directory name was given."
msgstr ""
"%1\n"
-"Directoria não encontrada.\n"
-"Por favor verifique que foi dado o nome correcto da pasta."
+"Pasta não encontrada.\n"
+"Por favor verifique o nome da pasta."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -383,8 +380,8 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>O nome \"%1\" não pode ser usado.</b><p>Tente utilizar outro nome, com "
-"menos caractéres ou sem pontuação."
+"<b>O nome \"%1\" não pode ser usado.</b><p>Tente utilizar outro nome, como "
+"menos caracteres ou sem pontuação."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
@@ -399,7 +396,7 @@ msgstr "Tamanho"
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Espécie"
+msgstr "Tipo"
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
@@ -445,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/pt/vidalia_pt.po b/src/vidalia/i18n/po/pt/vidalia_pt.po
index 8462a69..b632a00 100644
--- a/src/vidalia/i18n/po/pt/vidalia_pt.po
+++ b/src/vidalia/i18n/po/pt/vidalia_pt.po
@@ -1,15 +1,14 @@
#
# Translators:
-# <miguelmacedo at netcabo.pt>, 2011.
+# Filipe <nfscp at walla.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# Zeca Gatilho <paulo.mosh at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-24 04:31+0000\n"
-"Last-Translator: Zeca Gatilho <paulo.mosh at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: Filipe <nfscp at walla.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +27,7 @@ msgstr "Licença"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr "Vidalia"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
@@ -45,9 +44,7 @@ msgstr "'%1' não é um endereço de IP válido."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr ""
-"Você seleccionou autenticação de 'Password' , mas não especificou uma "
-"password."
+msgstr "Você seleccionou 'Password' para autenticação, mas não especificou uma senha."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -103,7 +100,7 @@ msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Password"
+msgstr "Senha"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
@@ -119,8 +116,7 @@ msgstr "Ficheiro de Configuração do Tor"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Iniciar o software Tor com o ficheiro de configuração especificado (torrc)"
+msgstr "Iniciar o software Tor com o ficheiro de configuração especificado (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -144,48 +140,43 @@ msgstr "Seleccione o directório usado para guardar os do software Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Controle Tor"
+msgstr "Tor Control"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Usar ligação TCP (ControlPort)"
+msgstr "Use conexão TCP (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Endereço:"
+msgstr "Caminho:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Usar ficha de domínio Unix (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Editar o torrc actual"
+msgstr "Editar torrc corrente"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTA: isto vai editar o torrc carregado actualmente"
+msgstr "NOTA: O torrc carregado actualmente vai ser editado"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "O endereço ControlSocket não existe"
+msgstr "O caminho 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."
+msgstr "A localização do ficheiro de configuração Tor especificada contém caracteres que não podem ser representadas no seu sistema actual de codificação de caracteres de 8 bits."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"O directório de dados Tor especificado, contém caracteres que não podem ser "
-"representados no seu actual sistema de codificação de caracteres de 8 bits."
+msgstr "A localização da directoria de dados Tor especificada contém caracteres que não podem ser representadas no seu sistema actual de codificação de caracteres de 8 bits."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -193,29 +184,22 @@ msgstr "Aviso"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Mudou o endereço torrc, quer reiniciar o Tor?"
+msgstr "Mudou o caminho torrc, deseja reiniciar o Tor ?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Ficheiro de Configuração do Tor (torrc);;Todos os ficheiros(*)"
+msgstr "Tor Ficheiro de Configuração (torrc);; Todos os Ficheiros(*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Escolha um ficheiro para usar como endereço da ficha Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configurar automaticamente o ControlPort"
+msgstr "Selecione um arquivo para usar no caminho do socket Tor "
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"O Vidalia falhou na remoção do serviço Tor.\n"
-"\n"
-"Pode ter que o remover manualmente."
+msgstr "O Vidalia falhou na remoção do serviço Tor.\n\nPode ter que o remover manualmente."
msgctxt "AppearancePage"
msgid "Language"
@@ -250,10 +234,6 @@ 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"
@@ -293,9 +273,13 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Gráfico de Banda"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "A iniciar o pedido de ponte HTTPS..."
+msgstr "A iniciar o pedido de bridge HTTPS..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -303,23 +287,23 @@ msgstr "A estabelecer ligação com %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "A enviar o pedido de pontes HTTPS..."
+msgstr "A enviar o pedido de bridges HTTPS..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "A descarregar a lista de pontes..."
+msgstr "A descarregar a lista de bridges..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "A descarregar as Pontes"
+msgstr "A descarregar as Bridges"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Impossível descarregar as pontes: %1"
+msgstr "Impossível descarregar as bridges: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "A tentar novamente o pedido de ponte..."
+msgstr "A tentar novamente o pedido de bridge..."
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -335,7 +319,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 Ponte"
+msgstr "Relatório de utilização da Bridge"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
@@ -446,20 +430,27 @@ msgid "Control socket is not connected."
msgstr "O socket de controle não está conectado."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Necessário palavra-passe"
+msgid "Problem connecting to Tor"
+msgstr "Poblemas a ligar a Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Memorizar a minha palavra-passe"
+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 "Tor já está em execução, mas Vidalia não se consegue conectar.\n\nIsto pode acontecer quando outra coisa (como outro processo activo Vidalia, ou um processo Vidalia que deu erro) já iniciou também o Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Temos que desligar o processo Tor antes que Vidalia lance um novo."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"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."
@@ -507,7 +498,7 @@ msgstr "Austrália"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaidjão "
+msgstr "Azerbaijão "
msgctxt "CountryInfo"
msgid "Bahamas"
@@ -515,7 +506,7 @@ msgstr "Bahamas"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr "Bangladeche "
msgctxt "CountryInfo"
msgid "Barbados"
@@ -523,7 +514,7 @@ msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielo-rússia"
+msgstr "Bielorrússia"
msgctxt "CountryInfo"
msgid "Belgium"
@@ -555,7 +546,7 @@ msgstr "Brasil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Principado do Brunei"
+msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
@@ -587,7 +578,7 @@ msgstr "Cabo Verde"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "República Centro Africana"
+msgstr "República central Africana"
msgctxt "CountryInfo"
msgid "Chad"
@@ -611,7 +602,7 @@ msgstr "Comores"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, A República Democrática do"
+msgstr "Congo, A República Democrática de"
msgctxt "CountryInfo"
msgid "Congo"
@@ -623,7 +614,7 @@ msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Costa do Marfim"
+msgstr "Cote dâ Ivoire"
msgctxt "CountryInfo"
msgid "Croatia"
@@ -647,11 +638,11 @@ msgstr "Dinamarca"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibuti"
+msgstr "Djibouti"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr "Domínica"
msgctxt "CountryInfo"
msgid "Dominican Republic"
@@ -771,11 +762,11 @@ msgstr "Kiribati"
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Koweit"
+msgstr "Kuweit"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Quirziguistão"
+msgstr "Quirguistão"
msgctxt "CountryInfo"
msgid "Laos"
@@ -799,7 +790,7 @@ msgstr "Libéria"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr "Licença"
msgctxt "CountryInfo"
msgid "Lithuania"
@@ -819,7 +810,7 @@ msgstr "Madagáscar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr "Malavi"
msgctxt "CountryInfo"
msgid "Malaysia"
@@ -827,7 +818,7 @@ msgstr "Malásia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Malí"
+msgstr "Mali"
msgctxt "CountryInfo"
msgid "Malta"
@@ -843,7 +834,7 @@ msgstr "Mauritânia"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Maurícias"
+msgstr "Maurício"
msgctxt "CountryInfo"
msgid "Micronesia"
@@ -855,7 +846,7 @@ msgstr "Moldávia"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Mónaco"
+msgstr "Monaco"
msgctxt "CountryInfo"
msgid "Mongolia"
@@ -907,7 +898,7 @@ msgstr "Nigéria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Noruega"
+msgstr "Prosseguir"
msgctxt "CountryInfo"
msgid "Oman"
@@ -931,7 +922,7 @@ msgstr "Panamá"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua-Nova Guiné"
+msgstr "Papua Nova Guiné"
msgctxt "CountryInfo"
msgid "Paraguay"
@@ -955,11 +946,11 @@ msgstr "Portugal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr "Catar"
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Roménia"
+msgstr "Romênia"
msgctxt "CountryInfo"
msgid "Russia"
@@ -979,7 +970,7 @@ msgstr "Santa Lúcia"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "São Vicente e Grenadinas"
+msgstr "São Vicente e Granadinas"
msgctxt "CountryInfo"
msgid "Samoa"
@@ -987,19 +978,19 @@ msgstr "Samoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "São Marino"
+msgstr "San Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "São Tomé e Príncipe"
+msgstr "São Tomé & Príncipe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Arábia Saudita"
+msgstr "Arabia Saudita"
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr "Geral"
msgctxt "CountryInfo"
msgid "Serbia"
@@ -1007,7 +998,7 @@ msgstr "Sérvia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr "Seicheles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
@@ -1015,7 +1006,7 @@ msgstr "Serra Leoa"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapura"
+msgstr "Cingapura"
msgctxt "CountryInfo"
msgid "Slovakia"
@@ -1071,7 +1062,7 @@ msgstr "Síria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadjiquistão"
+msgstr "Tajiquistão"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1095,7 +1086,7 @@ msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad e Tobago"
+msgstr "Trinidad & Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
@@ -1107,7 +1098,7 @@ msgstr "Turquia"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistão"
+msgstr "Turquemenistão"
msgctxt "CountryInfo"
msgid "Tuvalu"
@@ -1123,7 +1114,7 @@ msgstr "Ucrânia"
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Emiratos Árabes Unidos"
+msgstr "Emirados Árabes Unidos"
msgctxt "CountryInfo"
msgid "United Kingdom"
@@ -1191,7 +1182,7 @@ msgstr "Áustria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr "Barém"
msgctxt "CountryInfo"
msgid "Benin"
@@ -1203,7 +1194,7 @@ msgstr "Etiópia"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fidji"
+msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
@@ -1271,65 +1262,63 @@ msgstr "Mianmar"
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan (Formosa)"
+msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Enviar um relatório de erro"
+msgstr "Envie um relatório do erro."
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "O Vidalia encontrou um erro e irá encerrar"
+msgstr "Vidalia encontrou um erro e necessita fechar."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Um relatório de erros foi criado para que você pode enviar automaticamente para os programadores Vidalia para ajudar a identificar e corrigir o problema. O relatório apresentado não contém qualquer informação de identificação pessoal, mas a sua conexão com o servidor de relatórios de erros pode não ser anônima."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Por favor descreva o que estava a fazer antes de a aplicação dar erro. (opcional):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Envie o meu relatório de erro para os programadores de Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Reiniciar o Vidalia"
+msgstr "Reinicar Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Não reiniciar"
+msgstr "Não Reiniciar"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Incapaz de reiniciar o Vidalia"
+msgstr "Impossível de reiniciar 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."
+msgstr "impossivel de reiniciar automaticamente Vidalia. Por favor proceda ao reinicio manualmente."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Por favor preencha um bilhete em:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Ligando-se..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Foi criado um relatório de erro que pode enviar para os programadores do "
-"Vidalia ajudando-os a identificar e corrigir o problema. O relatório "
-"submetido não contém qualquer informação pessoal."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "A enviar relatório de erros..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"com a descrição do que estava fazendo antes da aplicação parar, a par com os"
-" ficheiros seguintes que correspondem ao relatório de erro:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "A receber resposta..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1337,7 +1326,7 @@ msgstr "Executáveis (*.exe)"
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Selecione endereço para o Tor"
+msgstr "Selecione o Diretório para o Tor"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
@@ -1356,10 +1345,6 @@ 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"
@@ -1387,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Verificar Agora"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Ligar Tor automaticamente"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1405,15 +1394,15 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Recebido:"
+msgstr "Receber:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Enviado:"
+msgstr "Enviar:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "O Arquivo XML fornecido não é um documento de Conteúdos válido."
+msgstr "O Arquivo XML de Conteúdo fornecido não é válido."
msgctxt "HelpBrowser"
msgid "Search reached end of document"
@@ -1449,7 +1438,7 @@ msgstr "Backspace"
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Avançar"
+msgstr "Prosseguir"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
@@ -1509,7 +1498,7 @@ msgstr "Encontrar Próximo"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Sensível a maiúsculas/minúsculas"
+msgstr "Sensível a Caixa Alta/Baixa"
msgctxt "HelpBrowser"
msgid "Whole words only"
@@ -1521,11 +1510,11 @@ msgstr "Tópicos de Ajuda"
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Conteúdos"
+msgstr "Conteúdo"
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Procura"
+msgstr "Busca"
msgctxt "HelpBrowser"
msgid "Searching for:"
@@ -1541,17 +1530,14 @@ msgstr "Erro ao Carregar os Conteúdos de Ajuda:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr " A Abrir Ligação Externa"
+msgstr "Abrir Hiperligação Externa"
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"O Vidalia pode abrir a hiperligação que escolheu no seu navegador padrão. Se"
-" o seu navegador não estiver configurado para utilizar o Tor então os seus "
-"pedidos não serão anónimos."
+msgstr "O Vidalia pode abrir a hiperligação que escolheu no seu browser padrão. Se o seu browser não estiver configurado para utilizar o Tor então os seus pedidos não serão anónimos."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1559,15 +1545,13 @@ msgstr "Deseja que o Vidalia abra a ligação no seu Navegador Web?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Incapaz de Abrir Hiperligação"
+msgstr "Incapaz de Abrir Hiperlizaçã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 seleccionada no seu Navegador Web. "
-"Pode ainda copiar o URL e colá-lo no seu Navegador Web."
+msgstr "O Vidalia foi incapaz de abrir a ligação no seu Navegador Web. Pode ainda copiar o endereço (URL) e colá-lo no seu Navegador Web."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1611,7 +1595,7 @@ msgstr "Desconhecido"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Limpando erros"
+msgstr "Depurar"
msgctxt "LogTreeItem"
msgid "Info"
@@ -1619,7 +1603,7 @@ msgstr "Informação"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Nota"
+msgstr "Notificação"
msgctxt "LogTreeItem"
msgid "Warning"
@@ -1635,7 +1619,7 @@ msgstr "Desconhecido"
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Iniciar Tor"
+msgstr "Iníciar Tor"
msgctxt "MainWindow"
msgid "Exit"
@@ -1647,7 +1631,7 @@ msgstr "Gráfico de Largura de Banda"
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Registo de Mensagens"
+msgstr "Log de Mensagens"
msgctxt "MainWindow"
msgid "Network Map"
@@ -1674,48 +1658,16 @@ 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 "Ver"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ajuda do Vidalia"
+msgstr "Visualizar"
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"
@@ -1755,7 +1707,7 @@ msgstr "A carregar o estado da rede"
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "A carregar o certificados de autoridade"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
@@ -1779,7 +1731,7 @@ msgstr "Conectado à rede Tor"
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Estado de inicialização não reconhecido"
+msgstr "Estado de inicialização desconhecido"
msgctxt "MainWindow"
msgid "miscellaneous"
@@ -1807,7 +1759,7 @@ msgstr "Erro de leitura/escrita "
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "sem rota para o hospedeiro"
+msgstr "sem rota para o host"
msgctxt "MainWindow"
msgid "insufficient resources"
@@ -1826,10 +1778,6 @@ 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"
@@ -1849,10 +1797,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"O Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para "
-"garantir o nome e a localização correta do executável do Tor foram "
-"especificados."
+msgstr "O Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para garantir o nome e a localização correta do executável do Tor especificado."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1890,9 +1835,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"O software Tor requer que o Vidalia envie o conteúdo de um cookie de "
-"autenticação, mas o Vidalia foi incapaz de encontrar um."
+msgstr "O software Tor requer que o Vidalia envie o conteúdo de um cookie de autenticação, mas o Vidalia foi incapaz de encontrar um."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1904,33 +1847,17 @@ msgstr "Diretório de Dados"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Cookie de Controlo (control_auth_cookie)"
+msgstr "Controlo de Cookie (control_auth_cookie)"
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Erro ao Registar-se para Eventos"
+msgstr "Erro ao se Registar 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-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."
+msgstr "O Vidalia foi incapaz de registar alguns eventos. Muitas das suas características podem estar indisponível."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1940,9 +1867,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"A versão instalada do Tor está desactualizada ou deixou de ser recomendada. "
-"Por favor, visite o página do Tor para descarregar a última versão."
+msgstr "A versão instalada do Tor está desactualizada ou deixou de ser recomendada. Por favor, visite o página do sítio do Tor para descarregar a última versão."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1952,8 +1877,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Todas as ligações seguintes irão parecer diferentes das ligações antigas."
+msgstr "As novas conexões irão parecer diferentes das conexões antigas."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1965,8 +1889,7 @@ msgstr "Falha na Porta de Reencaminhamento"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"O Vidalia foi incapaz de configurar o reencaminhamento automático da porta."
+msgstr "O Vidalia foi incapaz de configurar o reencaminhamento automático da porta."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1977,123 +1900,43 @@ 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 ""
-"A versão instalada do Tor está desactualizada ou deixou de ser recomendada."
+msgstr "A versão instalada do Tor está desactualizada ou deixou de ser recomendada."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Gostaria de verificar se um novo pacote está disponível para instalação? "
+msgstr "Gostaria de verificar se um novo pacote está disponível para instalação? "
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Ligação Potencialmente Insegura"
+msgstr "Conexã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 ligação a fim de proteger o seu "
-"anonimato."
+msgstr "O Tor encerrou automaticamente a sua conexão a fim de proteger o seu anonimato."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Falhou actualização"
+msgstr "Falhou"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "O seu software está actualizado"
+msgstr "O seu siftware está actualizado"
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"Neste momento não estão disponíveis novos pacotes de software Tor para o seu"
-" computador."
+msgstr "Neste momento não existem disponíveis novos pacotes de software Tor para o seu computador."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2101,7 +1944,7 @@ msgstr "Falha na Instalação"
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "O Vidalia não conseguiu instalar as suas actualizações de software."
+msgstr "O Vidalia não conseguiu instalar o serviço do Tor."
msgctxt "MainWindow"
msgid "The following error occurred:"
@@ -2109,65 +1952,90 @@ msgstr "Ocorreu o seguinte erro:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
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 "failed (%1)"
-msgstr "Falhou (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"O seu retransmissor está a encerrar.\n"
-"Clique 'Stop' novamente para parar o seu retransmissor agora."
+msgid "Start"
+msgstr "Iniciar"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Parar"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Recarregar configuração Tor"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Acções"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Iniciando torrc de %1 para %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"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?"
+msgstr "Está actualmete a executar um retransmissor. Encerrando o seu retransmissor irá interromper qualquer conexão aberta de clientes.\n\nGostaria de encerrar graciosamente e dar tempo aos clientes para encontrar um novo retransmissor?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
+msgstr "Vidalia detectou que o software Tor encerrou inesperadamente.\n\nPor favor, verifique no seu 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 ""
-"Vidalia detectou que o software Tor encerrou inesperadamente.\n"
-"\n"
-"Por favor, verifique no seu registo de mensagens se há mensagens de aviso ou de erro."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
+msgid "failed (%1)"
+msgstr "Falhou (%1)"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de email)"
+msgid ", probably Telnet,"
+msgstr ", provavelmente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", provavelmente um cliente de email,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "O seu retransmissor está a encerrar.\nClique 'Stop' novamente para parar o seu retransmissor agora."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
-"Uma das suas aplicações %1 parece estar a fazer uma potencial conexão "
-"desincriptada e insegura ao porto %2"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2175,37 +2043,35 @@ 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 registar-se no registo de eventos do Tor."
+msgstr "O Vidalia foi incapaz de registrar os eventos de log do Tor."
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Erro ao Abrir o Ficheiro de Registo"
+msgstr "Erro ao Abrir o Arquivo de Log"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "O Vidalia foi incapaz de abrir o arquivo de registo especificado."
+msgstr "O Vidalia foi incapaz de abrir o arquivo especificado."
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "O Nome do Arquivo de Registo é Requerido"
+msgstr "O Nome do Arquivo de Log é Requerido"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Tem de escrever um nome de ficheiro para ser capaz de salvar o registo "
-"mensagens para um ficheiro."
+msgstr "Você deve entrar com um nome de arquivo para ser capaz de salvar o log de mensagens para um arquivo."
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Selecione o Arquivo de Registo"
+msgstr "Selecione o Arquivo de Log"
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Salve as Mensagens do Registo"
+msgstr "Salve as Mensagens do Log"
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Ficheiros de Texto (*.txt)"
+msgstr "Arquivos Texto (*.txt)"
msgctxt "MessageLog"
msgid "Vidalia"
@@ -2213,7 +2079,7 @@ msgstr "Vidalia"
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Procurar no Registo de Mensagens"
+msgstr "Procurar no Log de Mensagens"
msgctxt "MessageLog"
msgid "Find:"
@@ -2225,11 +2091,11 @@ msgstr "Não Encontrado"
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "A procura encontrou 0 correspondências."
+msgstr "A procura encontrou 0 ocorrências."
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Registo de Mensagens"
+msgstr "Log de Mensagens"
msgctxt "MessageLog"
msgid "Message Filters..."
@@ -2245,7 +2111,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 mostrar"
+msgstr "Definir o número máximo de mensagens a serem visualizadas"
msgctxt "MessageLog"
msgid "Clear"
@@ -2253,7 +2119,7 @@ msgstr "Limpar"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Limpar todas as mensagens do Registo de Mensagens (Ctrl+E)"
+msgstr "Limpar todas as mensagens do Log de Mensagens (Ctrl+E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2265,8 +2131,7 @@ msgstr "Copiar"
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr ""
-"Copiar as mensagens seleccionadas para a área de transferência (Ctrl+C)"
+msgstr "Copiar as mensagens selecionadas para a área de transferência (Ctrl+C)"
msgctxt "MessageLog"
msgid "Ctrl+C"
@@ -2274,11 +2139,11 @@ msgstr "Ctrl+C"
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Seleccionar Todos"
+msgstr "Selecionar Todos"
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Seleccionar todas as mensagens (Ctrl+A)"
+msgstr "Selecionar todas as mensagens (Ctrl+A)"
msgctxt "MessageLog"
msgid "Ctrl+A"
@@ -2290,15 +2155,15 @@ msgstr "Salvar Todas"
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Salvar todas as mensagens para um ficheiro"
+msgstr "Salvar todas as mensagens para um arquivo"
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Salvar as Seleccionadas"
+msgstr "Salvar as Selecionadas"
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Salvar as mensagens seleccionadas para um ficheiro"
+msgstr "Salvar as mensagens selecionadas para um arquivo"
msgctxt "MessageLog"
msgid "Settings"
@@ -2306,7 +2171,7 @@ msgstr "Configurações"
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Ajustar a Configuração do Registo de Mensagens"
+msgstr "Ajustar a Configuração do Log de Mensagens"
msgctxt "MessageLog"
msgid "Ctrl+T"
@@ -2330,7 +2195,7 @@ msgstr "Fechar"
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Fechar o Registo de Mensagens"
+msgstr "Fechar o Log de Mensagens"
msgctxt "MessageLog"
msgid "Esc"
@@ -2342,7 +2207,7 @@ msgstr "Procurar"
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Procurar todas as mensagens contendo o texto da procura(Ctrl+F)"
+msgstr "Procurar todas as mensagens contendo o texto (Ctrl+F)"
msgctxt "MessageLog"
msgid "Ctrl+F"
@@ -2362,7 +2227,7 @@ msgstr "Mensagem"
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Salvar a configuração do Registo de Mensagens actual"
+msgstr "Salvar a configuração do Log de Mensagens corrente"
msgctxt "MessageLog"
msgid "Save Settings"
@@ -2370,7 +2235,7 @@ msgstr "Salvar as Configurações"
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Cancela as mudanças efectuadas na configuração"
+msgstr "Cancela as mudanças efetuadas na configuração"
msgctxt "MessageLog"
msgid "Cancel"
@@ -2394,7 +2259,7 @@ msgstr "Nota"
msgctxt "MessageLog"
msgid "Info"
-msgstr "Informação"
+msgstr "Info"
msgctxt "MessageLog"
msgid "Debug"
@@ -2402,11 +2267,11 @@ msgstr "Depuração"
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Histórico de Registo de Mensagens"
+msgstr "Histórico de Mensagens do Log"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Número de mensagens mostradas na janela do Registo de mensagens"
+msgstr "Número de mensagens mostradas na janela de mensagens do log"
msgctxt "MessageLog"
msgid "messages"
@@ -2418,45 +2283,31 @@ msgstr "Navegar"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Habilitar o salvamento automático de todas as mensagens novas do registo "
-"para um ficheiro"
+msgstr "Habilitar o salvamento automatico de todas as mensagens de log para arquivo"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Salvar automaticamente as novas mensagens do registo para um ficheiro"
+msgstr "Salvar automaticamente as novas mensagens de log para arquivo"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Básico"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Estado do Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avançado"
+msgid "Always Save New Log Messages"
+msgstr "Sempre Salvar Novas Mensagens de Log"
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Salvar Sempre Mensagens do Registo Novas"
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Mensagens que aparecem quando algo\n"
-"de muito errado aconteceu e o Tor não consegue prosseguir."
+msgstr "Mensagens que aparecem quando algo de muito errado \nacontecem e o Tor não consegue prosseguir."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Mensagens que apenas aparecem quando \n"
-"algo está errado com o Tor."
+msgstr "Mensagens que apenas aparecem quando \nalgo está errado com o Tor."
msgctxt "MessageLog"
msgid ""
@@ -2464,49 +2315,34 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Mensagens que aparecem pouco frequentemente\n"
-"durante o funcionamento normal do Tor e não \n"
-"são considerados erros, mas você podem\n"
-"interessar-lhe."
+msgstr "Mensagens que raramente aparecem \ndurante a operação normal do Tor e não \nsão considerados erros, mas você pode \npreocupar-se."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Mensagens que aparecem frequentemente \n"
-"durante o normal funcionamento do Tor."
+msgstr "Mensagens que aparecem frequentemente \ndurante o normal funcionamento do Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Mensagens Hiper-palavrosas de interesse, \n"
-"principalmente, para os programadores do Tor."
+msgstr "Mensagens Hiper-palavrosas de interesse, \nprincipalmente, para os programadores do Tor."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Não é possível guardar o ficheiro %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa da Rede Tor"
+msgstr "Não é possível guardar o ficheiro %1\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Actualizar"
+msgstr "Atualizar"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Refrescar a lista de retransmissões e ligações do Tor"
+msgstr "Refrescar a lista de retransmissões e conexões do Tor"
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2566,11 +2402,11 @@ msgstr "-"
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Zoom para enquadrar"
+msgstr "Ajustar o Zoom"
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Zoom para enquadrar todos os circuitos mostrados"
+msgstr "Ajustar o Zoom para conter todos os circuitos mostrados"
msgctxt "NetViewer"
msgid "Ctrl+Z"
@@ -2578,7 +2414,7 @@ msgstr "Ctrl+Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Retransmissor Não Encontrado"
+msgstr "Arquivo Não Encontrado"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
@@ -2600,13 +2436,29 @@ 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 "Ponte inválida"
+msgstr "Bridge inválida"
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "A ponte especificada não é válida."
+msgstr "A bridge especificada não é válida."
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
@@ -2616,17 +2468,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Deve especificar tanto um endereço IP ou nome do hospedeiro como um número "
-"de porta para configurar o Tor a utilizar um proxy para aceder à Internet."
+msgstr "Deve especificar tanto um endereço IP ou hostname como um número de porta para configurar o Tor a utilizar um proxy para aceder à Internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Deve especificar uma ou mais portas para que o seu firewall permita a sua "
-"ligação."
+msgstr "Deve especificar uma ou mais portas para que o seu firewall permita a sua conexão."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2658,9 +2506,7 @@ msgstr "Porta:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Verificar se apenas se conecta a retransmissores que utilizam as portas "
-"permitidas pela firewall"
+msgstr "Verificar se apenas se conecta a retransmissores que utilizam as portas permitidas pela firewall"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2682,9 +2528,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Verificar pedidos para criptografar pastas e, opcionalmente, utilizar uma "
-"bridge de retransmissão para aceder à rede Tor"
+msgstr "Verificar pedidos para criptografar pastas e, opcionalmente, utilizar uma bridge de retransmissão para aceder à rede Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2713,7 +2557,6 @@ msgstr "Procurar Bridges Agora"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
msgstr ""
-"<a href=\"bridges.finding\">De que outra forma posso encontrar pontes?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2723,42 +2566,39 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Não existem actualmente bridges disponíveis. Pode esperar um pouco e tentar "
-"novamente ou tentar outro método de localização de bridges."
+msgstr "Não existem actualmente bridges disponíveis. Pode esperar um pouco e tentar novamente ou tentar outro método de localização de bridges."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Clique na Ajuda para ver outros métodos de localização de novas bridges."
+msgstr "Clique na Ajuda para ver outros métodos de localização de novas bridges."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Endereço:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Tipo:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Tem de seleccionar o tipo de Proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2770,7 +2610,7 @@ msgstr "Rejeitar"
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Activo"
+msgstr "Ativo"
msgctxt "RouterDescriptor"
msgid "Hibernating"
@@ -2778,7 +2618,7 @@ msgstr "Hibernando"
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Inactivo"
+msgstr "Inativo"
msgctxt "RouterDescriptorView"
msgid "Location:"
@@ -2798,11 +2638,11 @@ msgstr "Largura de Banda:"
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Activo a:"
+msgstr "Ativo a:"
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Última Actualização:"
+msgstr "Última Atualização:"
msgctxt "RouterDescriptorView"
msgid "Copy"
@@ -2814,11 +2654,11 @@ msgstr "Hibernando"
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Activo"
+msgstr "Ativo"
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Inactivo"
+msgstr "Inativo"
msgctxt "RouterInfoDialog"
msgid "Unknown"
@@ -2834,11 +2674,11 @@ msgstr "Sumário"
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Nome:"
+msgstr "Apelido:"
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Estado:"
+msgstr "Estado"
msgctxt "RouterInfoDialog"
msgid "Location:"
@@ -2858,15 +2698,15 @@ msgstr "Largura de Banda:"
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Activo a:"
+msgstr "Ativo a:"
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Contacto:"
+msgstr "Informações de contato:"
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Última Actualização:"
+msgstr "Última Atualização:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
@@ -2874,7 +2714,7 @@ msgstr "Descritor"
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Inactivo"
+msgstr "Inativo"
msgctxt "RouterListItem"
msgid "Hibernating"
@@ -2890,11 +2730,11 @@ msgstr "Retransmissor"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Ampliar o Retransmissor"
+msgstr "Ampliar o Retransmisor"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 retransmissores activos"
+msgstr "%1 retransmissor online"
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2910,43 +2750,35 @@ msgstr "Impressão Digital"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Suporte de Ponte Indisponível"
+msgstr "Suporte Bridge 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 ponte retransmissora para utilizadores"
-" censurados, mas a sua versão do Tor não suporta pontes."
+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."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Actualize o seu software Tor ou configure-o para actuar como um "
-"retransmissor normal Tor."
+msgstr "Actualize o seu software Tor ou configure-o para actuar como um retransmissor normal."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "A sua ponte retransmissora não está a correr."
+msgstr "O relay da sua bridge não está a ser executado."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Deve especificar pelo menos uma alcunha de retransmissor e porta."
+msgstr "Deve especificar pelo menos uma alcunha de relay e porta."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Executar apenas como cliente"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Retransmitir o tráfego para a rede Tor"
+msgstr "Executar apenas um cliente"
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Porta da Retransmissão:"
+msgstr "Porta da Relay:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
@@ -2966,29 +2798,27 @@ msgstr "Mostrar o tópico de ajuda sobre a porta de reencaminhamento"
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Porta do Directório:"
+msgstr "Porta do Diretório:"
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Número da Porta do Directório"
+msgstr "Número da Porta do Diretório"
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Informações de contacto:"
+msgstr "Informações de contato:"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nome do seu retransmissor"
+msgstr "Nome do seu relay"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Porta em que utilizadores e outros retransmissores podem se comunicar com o "
-"seu retransmissor"
+msgstr "Porta em que utilizadores e outros retransmissores podem se comunicar com o seu retransmissor"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Alcunha:"
+msgstr "Apelido:"
msgctxt "ServerPage"
msgid "Basic Settings"
@@ -2998,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Para ligações de internet de alta velocidade de download mas baixa de "
-"upload, por favor liste sua velocidade de upload aqui."
+msgstr "Para conexões de internet de alta velocidade de download mas baixa de upload, por favor liste sua velocidade de upload aqui."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3028,7 +2856,7 @@ msgstr "Personalizada"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Seleccione a opção que seja mais adequada a sua conexão de Internet"
+msgstr "Selecione a opção que seja mais adequada a sua conexão de Internet"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3052,15 +2880,13 @@ msgstr "Taxa Máxima"
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Tecto máximo da taxa de largura de banda"
+msgstr "Teto máximo da taxa de largura de banda"
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"A sua taxa de largura de banda máxima deve ser igual ou superior à sua taxa "
-"média de largura de banda. Ambos os valores devem ser, no mínimo, 20 KB/s."
+msgstr "A sua taxa de largura de banda máxima deve ser igual ou superior à sua taxa média de largura de banda. Ambos os valores devem ser, no mínimo, 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3072,7 +2898,7 @@ msgstr "Portas 6660 - 6669 e 6697"
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Sala de chat de retransmissor (IRC)"
+msgstr "Sala de bate-papo (IRC)"
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
@@ -3080,7 +2906,7 @@ msgstr "Portas 110, 143, 993 e 995"
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Obter E-mail (POP, IMAP)"
+msgstr "Recuperar E-mail (POP, IMAP)"
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
@@ -3088,13 +2914,11 @@ msgstr "Portas não especificadas nas outras opções"
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Miscelânea Outros Serviços"
+msgstr "Misc Outros Serviços"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"Portas 706, 1863, 5050, 5190, 5222, 8300 e 8888 {706, 1863, 5050, 5190, "
-"5222, 5223, 8300 ?}"
+msgstr "Portas 706, 1863, 5050, 5190, 5222, 8300 e 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3123,17 +2947,13 @@ msgstr "Mostrar tópicos de ajuda sobre as políticas de saída"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Quais são os recursos da Internet que os utilizadores poderão aceder a "
-"partir do seu retransmissor?"
+msgstr "Quais são os recursos da Internet que os utilizadores poderão aceder a partir do seu retransmissor?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"O Tor ainda bloqueará por defeito, alguns e-mail's de saída e aplicações de "
-"partilha de ficheiros para reduzir o spam e outros abusos."
+msgstr "Por defeito o Tor ainda bloqueará alguns e-mail's e aplicações de partilha de ficheiros para reduzir o spam e outros abusos."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3141,18 +2961,16 @@ msgstr "Polìticas de Saída"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Permitir que outros acedam à ponte, por lhes dar esta linha:"
+msgstr "Permitir que outros acedam à bridge, dando-lhes esta linha:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Esta é a identidade da sua ponte de retransmissão que poderá dar a outras "
-"pessoas"
+msgstr "Esta é a identidade da sua bridge de retransmissão que você pode dar a outras pessoas"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Copiar a identidade da sua ponte de retransmissão para o clipboard"
+msgstr "Copiar a identidade da sua bridge de retransmissão para o clipboard"
msgctxt "ServerPage"
msgid "No Recent Usage"
@@ -3166,25 +2984,21 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Deixe a correr o seu retransmissor para que os clientes tenham mais "
-"hipóteses de o encontrar e usar."
+msgstr "Deixe a executar o seu retransmissor para que os clientes tenham mais hipóteses de o encontrar e usar."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Histórico da Ponte"
+msgstr "Histórico de Mensagens do Log"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "O Vidalia foi incapaz de obter o histórico de uso da sua ponte."
+msgstr "O Vidalia foi incapaz de registrar os eventos de log do Tor."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor encontrou uma resposta formatada incorrectamente quando o Vidalia "
-"solicitou o histórico de utilização da sua ponte."
+msgstr "Tor retornou uma resposta formatada incorretamente quando o Vidalia solicitou o histórico de utilização da sua bridge."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3196,15 +3010,23 @@ 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 ponte?</a>"
+msgstr "<a href=\"#bridgeUsage\">Quem utilizou a minha bridge?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">O que é isto?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Distribuir automaticamente o endereço da minha ponte"
+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"
@@ -3214,22 +3036,17 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Endereço de email através do qual você pode ser contactado\n"
-"se ocorrer algum problema com o seu retransmissor.\n"
-"Pode também incluir a sua impressão digital PGP ou GPG."
+msgstr "Endereço de email através do qual você pode ser contactado\nse ocorrer algum problema com o seu retransmissor.\nPode também incluir a sua impressão digital PGP ou GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Erro quando tentava retirar todos os serviços"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Por favor, configure pelo menos um serviço de pastas e uma porta virtual "
-"para cada serviço que deseje guardar. Remova os outros."
+msgstr "Por favor, configure pelo menos um serviço de pastas e uma porta virtual para cada serviço que deseje guardar. Remova os outros."
msgctxt "ServicePage"
msgid "Error"
@@ -3237,7 +3054,7 @@ msgstr "Erro"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Por favor, seleccione um Serviço."
+msgstr "Por favor, selecione um Serviço."
msgctxt "ServicePage"
msgid "Select Service Directory"
@@ -3253,11 +3070,7 @@ 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 já em uso por outro serviço."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulário"
+msgstr "Pasta em uso por outro serviço."
msgctxt "ServicePage"
msgid "Provided Hidden Services"
@@ -3265,7 +3078,7 @@ msgstr "Serviços Ocultos Prestados"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Morada na Cebola"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
@@ -3281,7 +3094,7 @@ msgstr "Caminho da Pasta"
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Permitido"
+msgstr "Permitir"
msgctxt "ServicePage"
msgid "Add new service to list"
@@ -3293,13 +3106,11 @@ 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 cebola do serviço seleccionado"
+msgstr "Copiar para o clipboard o endereço onion do serviço seleccionado"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Navegue no sistema de ficheiros local e escolha pasta para o serviço "
-"seleccionado"
+msgstr "Navegue no sistema de ficheiros local e escolha pasta para o serviço seleccionado"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3307,19 +3118,19 @@ msgstr "Criado por Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Copiar para o Clipboard"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "O software Tor está a correr"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Está actualmente a correr a versão \"%1\" do software Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "O software Tor não está a correr"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3327,9 +3138,6 @@ 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 ""
@@ -3338,10 +3146,6 @@ 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 ""
@@ -3350,38 +3154,30 @@ 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 "O seu software está fora da validade"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Ligado à rede Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
-"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 "Erro de software Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"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 ""
@@ -3390,10 +3186,6 @@ 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 ""
@@ -3402,14 +3194,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 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 "O relógio do seu computador está potencialmente incorrecto."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3418,10 +3206,6 @@ 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 ""
@@ -3429,13 +3213,10 @@ 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 "Ligação potencialmente perigosa!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3444,14 +3225,10 @@ 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 "Protocolo SOCKS desconhecido"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3459,14 +3236,10 @@ 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 "Nome de Hospedeiro de destino inválido"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3474,13 +3247,10 @@ 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 "O endereço de IP externo mudou"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3488,13 +3258,10 @@ 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 "Rapto de DNS detectado"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3502,10 +3269,6 @@ 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 ""
@@ -3513,14 +3276,10 @@ 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 "Verificando a acessibilidade da Porta do Servidor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3528,22 +3287,18 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
-"Tor está tentando determinar se o porto do relay está acessível a partir da "
-"rede do Tor, ligando-se a ele próprio em %1:%2. Este teste pode demorar "
-"vários minutos."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Teste de acessibilidade da porta do servidor com sucesso!"
+msgstr ""
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 "Teste de acessibilidade da porta do servidor falhou"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3552,14 +3307,10 @@ 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 "Verificando a acessibilidade do directório de portas"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3567,22 +3318,18 @@ 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 "Teste de acessibilidade do directório de portas com sucesso!"
+msgstr ""
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 "Teste de acessibilidade do directório de portas falhou"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3591,27 +3338,20 @@ 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 "Descritor do retransmissor rejeitado"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
-"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 "O seu retransmissor esá online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3620,10 +3360,22 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
-"O seu retransmissor está agora online e disponível para os clientes Tor "
-"usarem. Deverá notar um aumento no tráfego de rede mostrado no Gráfico de "
-"Largura de Banda dentro de algumas horas, à medida que mais clientes saibam "
-"do seu retransmissor. Obrigado por contribuir para a rede Tor."
+
+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"
@@ -3635,11 +3387,11 @@ msgstr "Resolvendo"
msgctxt "Stream"
msgid "Connecting"
-msgstr "Ligando"
+msgstr "Conectando"
msgctxt "Stream"
msgid "Open"
-msgstr "Ligado"
+msgstr "Conectado"
msgctxt "Stream"
msgid "Failed"
@@ -3647,7 +3399,7 @@ msgstr "Falhou"
msgctxt "Stream"
msgid "Closed"
-msgstr "Fechado"
+msgstr "Desconectado"
msgctxt "Stream"
msgid "Retrying"
@@ -3661,6 +3413,12 @@ 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]"
@@ -3679,68 +3437,89 @@ msgstr "Falha de Hashing na palavra-chave de controlo."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Editando torrc"
+msgstr ""
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 "Cortar"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Copiar"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Colar"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Voltar atrás"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Voltar a fazer"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Escolher todos"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Aplicar a todos"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Aplicar apenas aos seleccionados"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Erro ao conectar ao Tor"
+msgstr ""
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 "Erro na linha %1:\"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Erro"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Um erro ocorreu quando abria o ficheiro torrc"
+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"
@@ -3748,12 +3527,11 @@ msgstr "Sucesso"
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Não foram encontrados aparelhos activados para UPnP"
+msgstr ""
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"
@@ -3777,15 +3555,15 @@ msgstr "Erro desconhecido"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Descobrindo dispositivos activados para UPnP"
+msgstr "Descobrindo dispositivos permitidos para UPnP"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Actualizando o mapeamento do directório de portas"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Actualizando o mapeamento da porta de retransmissão"
+msgstr "Actualizar o mapeamento da porta de retransmissão"
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
@@ -3803,17 +3581,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia foi incapaz de verificar se há actualizações de software "
-"disponíveis, porque não pôde encontrar '%1'."
+msgstr "Vidalia foi incapaz de verificar se há atualizações de software disponíveis, porque não pôde encontrar '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia foi incapaz de verificar a existência de actualizações do software "
-"porque o processo de actualização do Tor terminou inesperadamente."
+msgstr "Vidalia foi incapaz de verificar a existência de actualizações do software porque o processo de actualização do Tor terminou inesperadamente."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3857,7 +3631,7 @@ msgstr "Actualizações do Software Disponíveis"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Lembrar-me mais tarde"
+msgstr "Lembrar mais tarde"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3865,17 +3639,23 @@ msgstr "Instalar"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Os seguintes pacotes de softwares actualizados estão prontos para "
-"instalação:"
+msgstr "Os seguintes pacotes de softwares actualizados estão prontos para instalação:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Embalagem"
+msgstr "Backspace"
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Versão"
+msgstr "versão"
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
@@ -3903,7 +3683,7 @@ msgstr "Tentar Novamente"
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Mostrar o Registo"
+msgstr "Mostrar o Log"
msgctxt "VMessageBox"
msgid "Show Settings"
@@ -3939,7 +3719,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 armazenar os ficheiros de dados"
+msgstr "Define a pasta que o Vidalia usa para armazena os ficheiros de dados"
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
@@ -3947,19 +3727,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 ficheiro de registo do Vidalia."
+msgstr "Indicar o nome e caminho do arquivo de log do Vidalia."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Indicar a verbosidade dos registos do Vidalia."
+msgstr "Indicar a verbosidade dos logs do Vidalia."
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Seleccionar estilo da interface do Vidalia."
+msgstr "Selecionar estilo da interface do Vidalia."
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Seleccionar Idioma do Vidalia."
+msgstr "Selecionar Idioma do Vidalia."
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
@@ -3967,11 +3747,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 registo '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Valor requirido para o parâmetro :"
+msgstr "Não foi possível abrir o arquivo de log '%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
@@ -3979,21 +3755,18 @@ msgstr "É Inválido o código do idioma especificado:"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Estilo especificado de GUI inválido:"
+msgstr "Especificado estilo inválido de GUI:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Especificado nível de registo inválido:"
+msgstr "Especificado nível de log inválido:"
msgctxt "Vidalia"
msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Possivelmente já está em execução outro processo Vidalia. Se realmente não estiver em execução outro processo do Vidalia, pode optar por continuar de qualquer maneira.\n"
-"\n"
-"Gostaria de continuar a iniciar o Vidalia?"
+msgstr "Possivelmente já está em execução outro processo Vidalia. Se já estiver em execução outro processo do Vidalia, pode optar por continuar de qualquer maneira.\n\nGostaria de continuar a iniciar o Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -4026,5 +3799,3 @@ msgstr "%1 horas"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minutos"
-
-
diff --git a/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po b/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po
index 0c69e51..14f2708 100644
--- a/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po
+++ b/src/vidalia/i18n/po/pt_BR/qt_pt_BR.po
@@ -1,15 +1,11 @@
#
-# Translators:
-# <amimyself at live.co.uk>, 2011.
-# Filipe <nfscp at walla.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-02 15:27+0000\n"
-"Last-Translator: Filipe <nfscp at walla.com>\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +17,7 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "Activar"
+msgstr "Ativar"
#: qmessagebox.h:319
msgctxt "QApplication"
@@ -36,12 +32,12 @@ msgstr "Biblioteca Qt incompatível"
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr "Direcção_de_Layout_QT"
+msgstr ""
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "Activa a janela principal do programa"
+msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
@@ -51,7 +47,7 @@ msgstr "OK"
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "Gravar"
+msgstr "Salvar"
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
@@ -86,7 +82,7 @@ msgstr "Ajuda"
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "Não gravar"
+msgstr "Não salvar"
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
@@ -116,7 +112,7 @@ msgstr "Não a Todas"
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr "Gravar Tudo"
+msgstr "Salvar Tudo"
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
@@ -141,7 +137,7 @@ msgstr "Restaurar padrão"
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr "Fechar sem gravar"
+msgstr "Fechar sem salvar"
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
@@ -161,7 +157,7 @@ msgstr "Tamanho"
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "Tipo"
+msgstr ""
#: qdirmodel.cpp:429
msgctxt "QDirModel"
@@ -181,17 +177,17 @@ msgstr "Todos arquivos (*)"
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "Directórios"
+msgstr "Diretórios"
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr "&Abrir"
+msgstr ""
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr "&Gravar"
+msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
@@ -216,12 +212,12 @@ msgid ""
msgstr ""
"%1\n"
"Arquivo não encontrado.\n"
-"Por favor verifique se o nome do arquivo foi correctamente introduzido."
+"Por favor verifique se o nome do arquivo foi corretamente informado."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "O Meu Computador"
+msgstr "Meu Computador"
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
@@ -231,7 +227,7 @@ msgstr "&Renomear"
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Apagar"
+msgstr "&Deletar"
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
@@ -246,7 +242,7 @@ msgstr "Voltar"
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "Directório Acima"
+msgstr "Diretório Acima"
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
@@ -266,7 +262,7 @@ msgstr "Arquivos do tipo:"
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "Directório:"
+msgstr "Diretório:"
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
@@ -276,8 +272,8 @@ msgid ""
"Please verify the correct directory name was given."
msgstr ""
"%1\n"
-"Directório não encontrado.\n"
-"Por favor verifique se o nome do directório foi corretamente introduzido."
+"Diretório não encontrado.\n"
+"Por favor verifique se o nome do diretório foi corretamente informado."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -286,17 +282,17 @@ msgid ""
"Do you want to delete it anyway?"
msgstr ""
"'%1' é protegido contra cópia.\n"
-"Você quer realmente apagá-lo ?"
+"Você quer deletá-lo ainda assim?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Tem certeza de que deseja apagar '%1'?"
+msgstr "Tem certeza de que deseja deletar '%1'?"
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Não foi possível apagar o diretório."
+msgstr "Não foi possível deletar o diretório."
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
@@ -306,12 +302,12 @@ msgstr "Todos Arquivos (*.*)"
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "Gravar Como"
+msgstr "Salvar Como"
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "Drive"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
@@ -326,7 +322,7 @@ msgstr "Desconhecido"
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Encontrar Directório"
+msgstr "Encontrar Diretório"
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
@@ -366,7 +362,7 @@ msgstr "Nome do arquivo:"
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Procurar em:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
@@ -384,8 +380,8 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>O nome \"%1\" não pode ser usado.</b><p>Tente um nome com menos "
-"caracteres ou sem pontuação."
+"<b>O nome \"%1\" não pode ser usado.</b><p>Tente um nome com menos letras ou"
+" sem pontuação."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
@@ -400,7 +396,7 @@ msgstr "Tamanho"
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Tipo"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
@@ -415,7 +411,7 @@ msgstr "Última modificação"
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "O Meu computador"
+msgstr "Meu computador"
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
@@ -446,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
index d02cc4a..63fbbc3 100644
--- a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
+++ b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
@@ -1,16 +1,14 @@
#
# Translators:
-# <amimyself at live.co.uk>, 2011.
-# daniel <>, 2012.
+# n3t0 <>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# Sérgio <theparish2 at yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-31 20:57+0000\n"
-"Last-Translator: yermandu daniel <yermandu at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: n3t0 <>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +80,7 @@ msgstr "Incapaz de instalar o serviço Tor"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "O Vidalia foi incapaz de instalar o serviço Tor"
+msgstr "Vidalia foi incapaz de instalar o serviço Tor"
msgctxt "AdvancedPage"
msgid "Authentication:"
@@ -118,8 +116,7 @@ msgstr "Arquivo de configuração do Tor"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Inicie o aplicativo Tor com o arquivo de configuração específico (torrc)"
+msgstr "Inicie o aplicativo Tor com o arquivo de configuração específico (torrc)"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -143,7 +140,7 @@ msgstr "Selecione o direitório usado pra salvar dados para o programa TOR"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor Control"
+msgstr "Controle Tor"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
@@ -155,66 +152,54 @@ msgstr "Caminho:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Usar socket de domínio Unix (ControlSocket)"
+msgstr "Usar socket de domínio Unix (Controle de Socket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Editar o torrc atual"
+msgstr "Editar torrc atual"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "ATENÇÃO: Isto vai editar o atual torrc carregado."
+msgstr "NOTA: isto irá editar o torrc atualmente carregado"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "O caminho para o ControlSocket não existe."
+msgstr "O caminho do Controle de Socket 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 ""
-"O local do arquivo especificado Tor de configuração contém caracteres que "
-"não podem ser representadas em seu sistema de codificação de caracteres "
-"atual de 8 bits."
+msgstr "A localização do arquivo de configuração Tor especificada contém caracteres que não podem ser representados em seu atual 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 caminho do diretório especificado para o Tor contém caracteres que não "
-"podem ser representados na atual codificação em 8 bits no seu sistema. "
+msgstr "A localização do diretório de dados Tor especificada contém caracteres que não podem ser representados em seu atual sistema de codificação de caracteres de 8 bits."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Aviso"
+msgstr "Atenção"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Você mudou a localização do torrc, gostaria de reiniciar o Tor?"
+msgstr "Você alterou a pasta torrc, gostaria de reiniciar o Tor?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Arquivo de Configuração Tor (torrc);;Todos os arquivos (*)"
+msgstr "Arquivo de configuração do Tor (torrc);; Todos os arquivos (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Selecione o arquivo a ser usado para o caminho do socket Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configurar ControlPort automaticamente"
+msgstr "Selecione um arquivo para o Tor usar como caminho do socket"
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"O Vidalia foi incapaz de remover o serviço Tor.\n"
-"\n"
-"Pode ser necessário removê-lo automaticamente."
+msgstr "Vidalia não conseguiu remover o serviço Tor.\n\nVocê precisa fazê-lo manualmente."
msgctxt "AppearancePage"
msgid "Language"
@@ -234,7 +219,7 @@ msgstr "Selecione a aparência do Vidalia"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "O Vidalia foi incapaz de carregar a tradução selecionada"
+msgstr "Vidalia foi incapaz de carregar a tradução selecionada"
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -249,10 +234,6 @@ msgid "Show Settings"
msgstr "Exibir parâmetros"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Uso de banda pelo Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reinicializar"
@@ -292,33 +273,37 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "Gráfico de largura de banda"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Iniciando o pedido de bridges HTTPS..."
+msgstr "Iniciando ponte HTTPS requisitada..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Conectando à %1:%2..."
+msgstr "Conectando com %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Enviando um pedido de bridges HTTPS..."
+msgstr "Enviando requisição HTTPS para pontes..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Fazendo download de uma lista de bridges..."
+msgstr "Baixando lista de pontes"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Fazendo download de bridges"
+msgstr "Baixando Pontes"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Incapaz de fazer download de bridges: %1"
+msgstr "Não foi possível baixar pontes: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Reenviando pedido de bridge..."
+msgstr "Tentando novamente requisição de ponte..."
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -330,15 +315,15 @@ msgstr "# Clientes"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Clientes dos seguintes países têm usado o seu relay desde %1"
+msgstr "Clientes dos seguintes países tem usado sua transmissão desde %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Resumo de Uso de Bridges"
+msgstr "Resumo do uso de ponte"
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Resumo de Clientes"
+msgstr "Resumo de Cliente"
msgctxt "Circuit"
msgid "New"
@@ -354,7 +339,7 @@ msgstr "Montando"
msgctxt "Circuit"
msgid "Failed"
-msgstr "Falha"
+msgstr "Falhou"
msgctxt "Circuit"
msgid "Closed"
@@ -398,7 +383,7 @@ msgstr "Rede"
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Compartilhamento"
+msgstr "Compartilhando"
msgctxt "ConfigDialog"
msgid "Services"
@@ -422,7 +407,7 @@ msgstr "Erro ao salvar configurações"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "O Vidalia foi incapaz de salvar o parâmetro %1 das configurações."
+msgstr "Vidalia foi incapaz de salvar o parâmetro %1 das configurações."
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
@@ -430,7 +415,7 @@ msgstr "Erro ao aplicar as configurações"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "O Vidalia foi incapaz de aplicar o parâmetro %1 ao Tor"
+msgstr "Vidalia foi incapaz de aplicar o parâmetro %1 ao Tor"
msgctxt "ConfigDialog"
msgid "Settings"
@@ -438,27 +423,34 @@ msgstr "Configurações"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "O Vidalia foi incapaz de se conectar ao Tor. (%1)"
+msgstr "Vidalia foi incapaz de se conectar ao Tor. (%1)"
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr "Conexão de controle não estabelecida."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Senha requerida"
+msgid "Problem connecting to Tor"
+msgstr "Problema ao conectar ao Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Lembrar senha"
+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 "Tor está rodando, mas o Vidalia não consegue conectar-se a ele.\n\nIsso pode acontecer quando algo (como outro processo Vidalia, ou um processo Vidalia corrompido) iniciou o Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"O Vidalia conectou à um processo Tor existente que requer uma senha. Por "
-"favor insira a sua senha de controle:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Você precisará parar o processo Tor antes do Vidalia iniciar um novo."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia pode tentar reiniciar o Tor para você. Fazendo isto, todas as conexões Tor ativas no momento serão fechadas."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -474,7 +466,7 @@ msgstr "Conexão finalizada enquanto tentava receber dados."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Resposta de controle inválida. [%1]"
+msgstr "Resposta de controle invalida. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
@@ -490,7 +482,7 @@ msgstr "Angola"
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antígua e Barbuda"
+msgstr "Antígua & Barbuda"
msgctxt "CountryInfo"
msgid "Argentina"
@@ -538,11 +530,11 @@ msgstr "Butão"
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr "Bolívia"
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bósnia e Herzegovina"
+msgstr "Bósnia Herzegovina"
msgctxt "CountryInfo"
msgid "Botswana"
@@ -586,11 +578,11 @@ msgstr "Cabo Verde"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Central Africano República"
+msgstr "República da Àfrica Central"
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "República de Chad"
+msgstr "Chade"
msgctxt "CountryInfo"
msgid "Chile"
@@ -606,7 +598,7 @@ msgstr "Colômbia"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comores"
+msgstr "Ilhas Comores"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
@@ -638,7 +630,7 @@ msgstr "Chipre"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "República Tcheca"
+msgstr "República do Cazaquistão"
msgctxt "CountryInfo"
msgid "Denmark"
@@ -646,7 +638,7 @@ msgstr "Dinamarca"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibuti"
+msgstr "Djibouti"
msgctxt "CountryInfo"
msgid "Dominica"
@@ -694,7 +686,7 @@ msgstr "Gâmbia"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Geórgia"
+msgstr "Georgia"
msgctxt "CountryInfo"
msgid "Germany"
@@ -758,7 +750,7 @@ msgstr "Jordânia"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Cazaquistão"
+msgstr "Casaquistão"
msgctxt "CountryInfo"
msgid "Kenya"
@@ -818,7 +810,7 @@ msgstr "Madagascar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malavi"
+msgstr "Malauí"
msgctxt "CountryInfo"
msgid "Malaysia"
@@ -826,11 +818,11 @@ msgstr "Malásia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "República do Mali"
+msgstr "Mali"
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "República de Malta"
+msgstr "Malta"
msgctxt "CountryInfo"
msgid "Marshall Islands"
@@ -838,11 +830,11 @@ msgstr "Ilhas Marshall"
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "República Islâmica da Mauritânia"
+msgstr "Mauritânia"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "República de Maurício"
+msgstr "Maurício"
msgctxt "CountryInfo"
msgid "Micronesia"
@@ -850,7 +842,7 @@ msgstr "Micronésia"
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "República da Moldávia"
+msgstr "Moldávia"
msgctxt "CountryInfo"
msgid "Monaco"
@@ -874,11 +866,11 @@ msgstr "Moçambique"
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "República da Namíbia"
+msgstr "Namíbia"
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "República de Nauru"
+msgstr "Nauru"
msgctxt "CountryInfo"
msgid "Nepal"
@@ -898,7 +890,7 @@ msgstr "Nicarágua"
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Níger"
+msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
@@ -918,7 +910,7 @@ msgstr "Paquistão"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "República de Palau"
+msgstr "Palau"
msgctxt "CountryInfo"
msgid "Palestine"
@@ -930,7 +922,7 @@ msgstr "Panamá"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua-Nova Guiné"
+msgstr "Papua Nova Guiné"
msgctxt "CountryInfo"
msgid "Paraguay"
@@ -942,7 +934,7 @@ msgstr "Peru"
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "República das Filipinas"
+msgstr "Filipinas"
msgctxt "CountryInfo"
msgid "Poland"
@@ -954,7 +946,7 @@ msgstr "Portugal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Catar"
+msgstr "Quatar"
msgctxt "CountryInfo"
msgid "Romania"
@@ -970,7 +962,7 @@ msgstr "Ruanda"
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "São Cristóvão e Nevis "
+msgstr "São Cristóvao & Nevis"
msgctxt "CountryInfo"
msgid "Saint Lucia"
@@ -978,7 +970,7 @@ msgstr "Santa Lúcia"
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "São Vicente e Granadinas"
+msgstr "São Vicente & Granadinas"
msgctxt "CountryInfo"
msgid "Samoa"
@@ -986,11 +978,11 @@ msgstr "Samoa"
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "São Marino"
+msgstr "San Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "São Tomé e Príncipe"
+msgstr "São Tomé & Príncipe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
@@ -1006,7 +998,7 @@ msgstr "Sérvia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr "Seichelles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
@@ -1026,7 +1018,7 @@ msgstr "Eslovênia"
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Ilhas Salomão"
+msgstr "Ilhas Solomon"
msgctxt "CountryInfo"
msgid "Somalia"
@@ -1070,7 +1062,7 @@ msgstr "Síria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajiquistão"
+msgstr "Tajaquistão"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1082,7 +1074,7 @@ msgstr "Tailândia"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste"
+msgstr "Timor-Leste (East Timor)"
msgctxt "CountryInfo"
msgid "Togo"
@@ -1094,11 +1086,11 @@ msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trindade e Tobago"
+msgstr "Trinidad & Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunísia"
+msgstr "Tunisia"
msgctxt "CountryInfo"
msgid "Turkey"
@@ -1106,7 +1098,7 @@ msgstr "Turquia"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr "Turcomenistão"
msgctxt "CountryInfo"
msgid "Tuvalu"
@@ -1158,11 +1150,11 @@ msgstr "Vietnã"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sara Ocidental"
+msgstr "Saara Ocidental"
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Iémen"
+msgstr "Iêmen"
msgctxt "CountryInfo"
msgid "Zambia"
@@ -1186,15 +1178,15 @@ msgstr "Argélia"
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Áustria"
+msgstr "Austria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrein"
+msgstr "Barein"
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benim"
+msgstr "Benin"
msgctxt "CountryInfo"
msgid "Ethiopia"
@@ -1246,11 +1238,11 @@ msgstr "Irlanda"
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Coreia do Norte"
+msgstr "Coréia do Norte"
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Coreia do Sul"
+msgstr "Coréia do Sul"
msgctxt "CountryInfo"
msgid "Libya"
@@ -1266,7 +1258,7 @@ msgstr "México"
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "República da União de Myanmar"
+msgstr "Birmânia"
msgctxt "CountryInfo"
msgid "Taiwan"
@@ -1274,15 +1266,33 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Enviar um Relatório de Erro"
+msgstr "Enviar um relatório de erro"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "O Vidalia encontrou um erro e precisou ser fechado."
+msgstr "Vidalia encontrou um erro e precisa ser fechado"
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Um relatório do erro foi criado, e você pode automaticamente enviá-lo ao desenvolvedores do Vidalia para ajudar a identificá-lo e solucioná-lo. O envio do relatório não contém nenhuma informação pessoal, mas sua conexão com o servidor de relatório de erros pode não ser anônima."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Por favor, descreva o que você estava fazendo antes de ocorrer o erro na aplicação (opcional)"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Envie meu relatório de erro aos desenvolvedores Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Reiniciar o Vidalia"
+msgstr "Reiniciar Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
@@ -1290,46 +1300,25 @@ msgstr "Não reiniciar"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Incapaz de iniciar o Vidalia"
+msgstr "Impossível reiniciar o Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Não foi possível reiniciar o Vidalia automaticamente. Por favor, reinicie o "
-"Vidalia manualmente."
+msgstr "Nós estamos impossibilitados de reiniciar o Vidalia automaticamente. Por favor, reinicie o Vidalia manualmente"
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Por favor, preencha um tiquete em:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Conectando..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Um relatório de erro foi criado e você pode enviá-lo aos desenvolvedores do "
-"Vidalia para ajudar a identificar e resolver o problema. Um relatório "
-"enviado não contém nenhuma informação de identificação pessoal."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Enviando relatório de erro..."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"com uma descrição do que você estava fazendo antes da aplicação quebrar, "
-"juntamente com os seguintes arquivos correspondentes ao relatório de "
-"acidente:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Recebendo resposta..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1356,10 +1345,6 @@ 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"
@@ -1377,15 +1362,19 @@ msgstr "Parâmetros do aplicativo de proxy:"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Atualizações de Software"
+msgstr "Atualizações do Programa"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Procurar por novas atualizações do programa automaticamente"
+msgstr "Procurar por novas atualizações automaticamente"
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Conferir agora"
+msgstr "Procurar agora"
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Conectar ao Tor automaticamente"
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1405,11 +1394,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Recebido:"
+msgstr "Recv:"
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Enviado:"
+msgstr "Envio:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1537,7 +1526,7 @@ msgstr "Documentos encontrados"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Erro ao carregar o(s) conteúdo(s) de ajuda:"
+msgstr "Erro ao carregar conteúdo de ajuda:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1548,10 +1537,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"O Vidalia pode abrir o link seleciona no seu navegador padrão. Se seu "
-"navegador não estiver atualmente configurado para usar o Tor, esta ação não "
-"será anonima."
+msgstr "Vidalia pode abrir o link seleciona no seu navegador padrão. Se seu navegador não estiver atualmente configurado para usar o Tor, esta ação não será anonima."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1565,13 +1551,11 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"O Vidalia foi incapaz de abrir o link selecionado. Alternativamente você "
-"pode copiar o link e colar na barra de endereços do seu navegador."
+msgstr "Vidalia foi incapaz de abrir o link selecionado. Alternativamente você pode copiar o link e colar na barra de endereços do seu navegador."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Erro ao abrir o arquivo de ajuda"
+msgstr "Erro ao abrir arquivo de ajuda:"
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1611,7 +1595,7 @@ msgstr "Desconhecido"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Depurar"
+msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
@@ -1619,11 +1603,11 @@ msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Repare"
+msgstr "Notícia"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Aviso"
+msgstr "Atenção"
msgctxt "LogTreeItem"
msgid "Error"
@@ -1635,7 +1619,7 @@ msgstr "Desconhecido"
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Iniciar o Tor"
+msgstr "Iniciar Tor"
msgctxt "MainWindow"
msgid "Exit"
@@ -1674,34 +1658,6 @@ 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"
@@ -1710,16 +1666,12 @@ 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"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "O Vidalia foi incapaz de iniciar o navegador de internet configurado"
+msgstr "Vidalia foi incapaz de iniciar o navegador de internet configurado"
msgctxt "MainWindow"
msgid "Error starting IM client"
@@ -1727,9 +1679,7 @@ msgstr "Erro ao iniciar cliente de mensagens instantâneas"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-"O Vidalia foi incapaz de iniciar o cliente de mensagens instantâneas "
-"configurado"
+msgstr "Vidalia foi incapaz de iniciar o cliente de mensagens instantâneas configurado"
msgctxt "MainWindow"
msgid "Error starting proxy server"
@@ -1737,7 +1687,7 @@ msgstr "Erro ao iniciar servidor de proxy"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "O Vidalia foi incapaz de iniciar o servidor de proxy"
+msgstr "Vidalia foi incapaz de iniciar o servidor de proxy"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
@@ -1769,7 +1719,7 @@ msgstr "Carregando informações de servidor"
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Conectando à rede Tor"
+msgstr "Conectando a rede Tor"
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
@@ -1777,7 +1727,7 @@ msgstr "Estabelecendo circuito Tor"
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Conectado à rede Tor!"
+msgstr "Conectado a rede Tor!"
msgctxt "MainWindow"
msgid "Unrecognized startup status"
@@ -1821,17 +1771,13 @@ msgstr "desconhecido"
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "O Tor não está em execução"
+msgstr "Tor não está em execução"
msgctxt "MainWindow"
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"
@@ -1851,10 +1797,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para "
-"assegurar-se de que o nome e a localização do aplicativo Tor foram "
-"apropriadamente ajustadas."
+msgstr "Vidalia foi incapaz de iniciar o Tor. Verifique suas configurações para assegurar-se de que o nome e a localização do aplicativo Tor foram apropriadamente ajustadas."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1892,14 +1835,11 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"O aplicativo Tor necessita que o Vidalia envie um cookie de autenticação, no"
-" entanto ele foi incapaz de encontra-lo."
+msgstr "O aplicativo Tor necessita que o Vidalia envie um cookie de autenticação, no entanto ele foi incapaz de encontra-lo."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr ""
-"Você gostaria de procurar o arquivo 'control_auth_cookie' manualmente?"
+msgstr "Você gostaria de procurar o arquivo 'control_auth_cookie' manualmente?"
msgctxt "MainWindow"
msgid "Data Directory"
@@ -1917,21 +1857,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia foi incapaz de registrar alguns eventos. Dessa forma, muitas de suas"
-" funções ficarão indisponíveis."
-
-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"
+msgstr "Vidalia foi incapaz de registrar alguns eventos. Dessa forma, muitas de suas funções ficarão indisponíveis."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1941,10 +1867,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"A versão atualmente instalada do Tor está desatualizada ou não é mais "
-"recomendada. Por favor visite a página do Tor para obter a versão mais "
-"recente."
+msgstr "A versão atualmente instalada do Tor está desatualizada ou não é mais recomendada. Por favor visite a página do Tor para obter a versão mais recente."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1966,9 +1889,7 @@ msgstr "Falha ao encaminhar porta"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
-"Vidalia foi incapaz de configurar o encaminhamento de portas "
-"automaticamente."
+msgstr "Vidalia foi incapaz de configurar o encaminhamento de portas automaticamente."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
@@ -1979,112 +1900,33 @@ 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 ""
-"A versão do Tor atualmente instalada está desatualizada ou não é mais "
-"recomendada."
+msgstr "A versão instalada do Tor está desatualizada e não é mais recomendada."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr ""
-"Gostaria de conferir se um novo pacote está disponível para instalação?"
+msgstr "Gostaria de checar se existe um novo pacote disponível para instalação?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Conexão Potencialmente Não Segura"
+msgstr "Conexão potencialmente não segura"
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"O Tor fechou a sua conexão automaticamente afim de proteger a sua "
-"anonimidade."
+msgstr "Tor fechou sua conexão automaticamente para proteger sua anonimidade."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Falha na atualização"
+msgstr "Atualização Falhou"
msgctxt "MainWindow"
msgid "Your software is up to date"
@@ -2094,83 +1936,106 @@ msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"Não há nenhum pacote do programa Tor disponível para o seu computador no "
-"momento."
+msgstr "Não há novos pacotes Tor disponíveis para seu computador neste momento."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Falha na instalação"
+msgstr "Instalação Falhou."
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "O Vidalia não conseguiu instalar as atualizações do seu programa."
+msgstr "Vidalia estava impossibilitado de instalar suas atualizações."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "O seguinte erro ocorreu:"
+msgstr "Ocorreu o seguinte erro:"
+
+msgctxt "MainWindow"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Uma de suas aplicações%1aparenta estar fazendo uma potencial conexão desencriptada e insegura na porta %2."
msgctxt "MainWindow"
msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Tudo o que for enviado por esta conexão pode estar sendo monitorado. Por "
-"favor, verifique a configuração do seu programa e use somente protocolos "
-"encriptados, tais como SSL, se possível. "
+msgstr "Qualquer coisa enviada por esta conexão pode ser monitorada. Cheque a configuração de sua aplicação e use somente protocolos encriptados, como SSL, se possível."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "falha (%1)"
+msgid "toolBar"
+msgstr "Barra de Ferramentas"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Seu condutor está sendo fechado.\n"
-"Clique em 'Parar' denovo para parar o seu condutor agora."
+msgid "Start"
+msgstr "Iniciar"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Parar"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Recarregar configuração do Tor"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Ações"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Inicialização do torrc %1 de %2"
+msgstr "Bootstrapping torrc de %1 a %2"
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Você está atualmente rodando um condutor. Finalizar o seu condutor interromperá qualquer conexões abertas de clientes.\n"
-"\n"
-"Você gostaria de fechar graciosamente e dar aos clientes tempo para encontrar um novo condutor?"
+msgstr "Você está rodando atualmente uma retransmissão. Finalizar sua retransmissão irá interromper qualquer conexão aberta por clientes.\n\nVocê não gostaria de finalizá-la elegantemente e dar tempo aos clientes para encontrarem uma nova retransmissão?\n\nPor favor, chque o log de mensagens para recentes avisos e mensagens de erro."
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"O Vidalia detectou que o programa Tor fechou inesperadamente.\n"
-"\n"
-"Por favor confira o registro de mensagens para avisos ou mensagens de erro recentes."
+msgstr "Vidalia detectou que o Tor fechou inesperadamente.\n\nPor favor, cheque o log de mensagens para recentes avisos ou mensagens de erro."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia tentou reiniciar Tor, mas não conseguiu. Por favor, cheque seu Gerenciador de Tarefas para ter certeza de que não há outro processo Tor rodando."
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de e-mail)"
+msgid "failed (%1)"
+msgstr "falhou (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", provavelmente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", provavelmente um cliente de e-mail,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Um dos seus programas %1 parece estar fazendo uma conexão potencialmente "
-"desencriptada e insegura pela porta %2"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Sua retransmissão está sendo encerrada.\nClique em \"Parar\" de novo para encerrar sua retransmissão agora."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Erro ao recarregar a configuração"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia estava impossibilitado de recarregar a configuração do Tor"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2194,9 +2059,7 @@ msgstr "Necessário nome do arquivo de registro"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Você precisa informar um nome de arquivo onde as mensagens de registro serão"
-" salvas."
+msgstr "Você precisa informar um nome de arquivo onde as mensagens de registro serão salvas."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2420,43 +2283,31 @@ msgstr "Procurar"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Habilitar salvamento automático de novas mensagens de registro para um "
-"arquivo"
+msgstr "Habilitar salvamento automático de novas mensagens de registro para um arquivo"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
msgstr "Salvar, automaticamente, novas mensagens de registro para um arquivo"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Básico"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Status do Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avançado"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Sempre salvar novas mensagens de registro"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr "barra de ferramentas"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Mensagens que aparecem quando algo deu muito errado e o Tor não pode "
-"prosseguir."
+msgstr "Mensagens que aparecem quando algo ocorreu\nmuito erradamente e o Tor não pode prosseguir."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Mensagens que só aparecem quando algo deu errado com o Tor."
+msgstr "Mensagens que aparecem somente quando algo errado ocorreu com o Tor."
msgctxt "MessageLog"
msgid ""
@@ -2464,37 +2315,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Mensagens que aparecem raramente durante a operação normal do Tor e não são "
-"consideradas erros, mas que podem lhe importar."
+msgstr "Mensagens que aparecem raramente durante o processo Tor normal e não são consideradas erros, mas você deve tomar cuidado."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Mensagens que aparecem frequentemente durante a operação normal do Tor."
+msgstr "Mensagens que aparecem frequentemente durante o processo Tor normal."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Mensagens detalhadas primariamente de interesse dos desenvolvedores do Tor."
+msgstr "Mensagens super detalhadas primordialmente destinadas aos desenvolvedores do Tor."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"Não é possível editar o arquivo %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa da rede Tor"
+msgstr "Não foi possivel escrever no arquivo %1\n\n%2"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2574,11 +2414,11 @@ msgstr "Ctrl+Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Condutor Não Encontrado"
+msgstr "Retransmissão não encontrada"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Não há detalhes disponíveis no condutor selecionado."
+msgstr "Nenhum detalhe na retransmissão selecionada está disponível."
msgctxt "NetViewer"
msgid "Unknown"
@@ -2586,16 +2426,32 @@ msgstr "Desconhecido"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Tela cheia"
+msgstr "Tela Cheia"
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Ver o mapa da rede em tela cheia."
+msgstr "Olhar o mapa da rede como uma janela de tela cheia"
msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr "Mapa da Rede"
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr "Retransmissão"
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr "Conexão"
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr "Status"
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ponte inválida"
@@ -2612,17 +2468,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Você deve especificar um IP, um host e uma porta para configurar o acesso "
-"via proxy do Tor a internet."
+msgstr "Você deve especificar um IP, um host e uma porta para configurar o acesso via proxy do Tor a internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Você deve especificar uma ou mais portas liberadas no seu firewall para "
-"conexão."
+msgstr "Você deve especificar uma ou mais portas liberadas no seu firewall para conexão."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2654,9 +2506,7 @@ msgstr "Porta:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Certifique-se de somente conectar a servidores utilizando portas permitidas "
-"pelo seu firewall"
+msgstr "Certifique-se de somente conectar a servidores utilizando portas permitidas pelo seu firewall"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2678,9 +2528,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Certifique-se de criptografar requisições de diretório e, opcionalmente, "
-"utilize servidores ponte para acessar a rede Tor"
+msgstr "Certifique-se de criptografar requisições de diretório e, opcionalmente, utilize servidores ponte para acessar a rede Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2704,29 +2552,25 @@ msgstr "Copiar ponte selecionada para área de transferência"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Encontrar bridges agora"
+msgstr "Procure Pontes Agora"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-"<a href=\"bridges.finding\">De que outra forma eu posso encontrar "
-"bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Como mais eu posso encontrar pontes?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Como posso encontrar pontes?</a>"
+msgstr "<a href=\"bridges.finding\">Como eu posso encontrar pontes?</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 ""
-"Não há novas pontes disponíveis atualmente. Você pode esperar um pouco e "
-"tentar denovo ou tentar outro método de encontrar novas pontes."
+msgstr "Nenhuma ponte nova disponível atualmente. Você pode esperar um pouco e tentar de novo, ou tentar outro método para encontrar novas pontes."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Clique em Ajuda para ver outros métodos de encontrar novas pontes."
+msgstr "Clique em Ajuda para ver outras formas de encontrar novas pontes."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2738,7 +2582,7 @@ msgstr "Tipo:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Você deve selecionar o tipo de proxy."
+msgstr "Você precisa selecionar o tipo de proxy"
msgctxt "NetworkPage"
msgid "SOCKS 4"
@@ -2810,11 +2654,11 @@ msgstr "Hibernando"
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Conectado"
+msgstr "Online"
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Desconectado"
+msgstr "Offline"
msgctxt "RouterInfoDialog"
msgid "Unknown"
@@ -2822,7 +2666,7 @@ msgstr "Desconhecido"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Detalhes do condutor"
+msgstr "Detalhes da Retransmissão"
msgctxt "RouterInfoDialog"
msgid "Summary"
@@ -2842,7 +2686,7 @@ msgstr "Localização:"
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "Endereço IP:"
+msgstr "IP:"
msgctxt "RouterInfoDialog"
msgid "Platform:"
@@ -2850,11 +2694,11 @@ msgstr "Plataforma:"
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Banda de conexão:"
+msgstr "Largura de Banda:"
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Tempo online:"
+msgstr "Uptime:"
msgctxt "RouterInfoDialog"
msgid "Contact:"
@@ -2866,7 +2710,7 @@ msgstr "Última atualização:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descritor de arquivo"
+msgstr "Descritor:"
msgctxt "RouterListItem"
msgid "Offline"
@@ -2912,17 +2756,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Você configurou o Tor para funcionar como um servidor ponte para usuários "
-"sob censura, mas a sua versão do aplicativo na suporta esta função."
+msgstr "Você configurou o Tor para funcionar como um servidor ponte para usuários sob censura, mas a sua versão do aplicativo na suporta esta função."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Por favor, atualize seu aplicativo Tor ou configure-o para funcionar como um"
-" servidor normal."
+msgstr "Por favor, atualize seu aplicativo Tor ou configure-o para funcionar como um servidor normal."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2930,18 +2770,13 @@ msgstr "Seu servidor ponte não está funcionando."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr ""
-"Você deve, pelo menos, especificar uma porta e um apelido para o servidor."
+msgstr "Você deve, pelo menos, especificar uma porta e um apelido para o servidor."
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr "Executar somente como cliente"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Encaminhar tráfego para rede Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta do servidor:"
@@ -2993,9 +2828,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Para conexões de internet com altas taxas de download mas baixo upload, por "
-"favor selecione sua taxa de upload aqui."
+msgstr "Para conexões de internet com altas taxas de download mas baixo upload, por favor selecione sua taxa de upload aqui."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3053,9 +2886,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Sua banda máxima deve ser maior ou igual a sua taxa média de banda. Ambos "
-"devem ser de pelo menos 20 kb/s"
+msgstr "Sua banda máxima deve ser maior ou igual a sua taxa média de banda. Ambos devem ser de pelo menos 20 kb/s"
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3116,17 +2947,13 @@ msgstr "Exibir ajuda para as regras de saída"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Que tipo de recursos da internet os usuários poderão acessar a partir de seu"
-" servidor?"
+msgstr "Que tipo de recursos da internet os usuários poderão acessar a partir de seu servidor?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"O Tor bloqueará a saída de email e aplicativos de compartilhamento de "
-"arquivos, a fim de evitar spam e outros abusos."
+msgstr "O Tor bloqueará a saída de email e aplicativos de compartilhamento de arquivos, a fim de evitar spam e outros abusos."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3139,8 +2966,7 @@ msgstr "Permite que outros usuários acessem sua ponte dando-lhes esta linha:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Esta é a identidade do seu servidor ponte que pode ser dado a outras pessoas"
+msgstr "Esta é a identidade do seu servidor ponte que pode ser dado a outras pessoas"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3148,68 +2974,69 @@ msgstr "Copiar identidade do seu servidor ponte para área de transferência"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Sem uso recente"
+msgstr "Não usado recentemente"
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Nenhum cliente usou o seu condutor recentemente."
+msgstr "Nenhum cliente tem usado sua retransmissão recentemente."
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Deixe o seu condutor rodando para que os clientes tenham uma chance melhor "
-"de encontrá-lo e usá-lo."
+msgstr "Deixe sua retransmissão rodando, assim os clientes tem uma chance melhor de encontrá-la e usá-la. "
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Histórico de Ponte"
+msgstr "Histórico de Pontes"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "O Vidalia não conseguiu carregar o histórico de uso da sua ponte."
+msgstr "Vidalia não conseguiu recuperar seu histórico de uso de pontes."
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"O Tor forneceu uma resposta de formato inapropriado quando o Vidalia "
-"requisitou o histórico de uso da sua ponte."
+msgstr "Tor retornou uma resposta em formato impróprio quando solicitado seu histórico de uso de pontes."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "A resposta obtida foi: %1"
+msgstr "A resposta retornada foi: %1"
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Ajude usuários censurados a alcançar a rede Tor"
+msgstr "Ajude usuários censurados a encontrar a rede Tor"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Quem usou minha ponte?</a>"
+msgstr "<a href=\"#bridgeUsage\">Quem está usando minha ponte?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">O que é isso?</a>"
+msgstr "<a href=\"#bridgeHelp\">O que é isto?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Distribuir automaticamente meu endereço de bridge"
+msgstr "Distribuindo automaticamente meu endereço de ponte"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Retransmita o tráfico dentro da rede Tor (retransmissão sem saída)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Retransmita o tráfico para a rede Tor (retransmissão de saída)"
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Fazer mirror do Diretório de Condutor"
+msgstr "Espelhar o diretório de retransmissão"
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Endereço de email no qual você pode ser contactado caso haja um problema com"
-" o seu condutor. Você pode incluir também a sua impressão digital PGP ou "
-"GPG."
+msgstr "Endereço de e-mail onde você pode ser encontrado se houver um\nproblema com sua retransmissão. Você pode, também, usar sua impressão digital PGP ou GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3219,9 +3046,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Por favor, configure ao menos um diretório de serviço e uma porta virtual "
-"para cada serviço que você deseja gravar. Remova os demais."
+msgstr "Por favor, configure ao menos um diretório de serviço e uma porta virtual para cada serviço que você deseja gravar. Remova os demais."
msgctxt "ServicePage"
msgid "Error"
@@ -3237,8 +3062,7 @@ msgstr "Selecionar diretório de serviço"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"A porta virtual deve conter apenas números de portas validas [1..65535]."
+msgstr "A porta virtual deve conter apenas números de portas validas [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
@@ -3249,10 +3073,6 @@ 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"
@@ -3290,9 +3110,7 @@ msgstr "Copiar endereço onion do serviço seleciona para área de transferênci
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Procure e defina no sistema de arquivos local um diretório para o serviço "
-"escolhido"
+msgstr "Procure e defina no sistema de arquivos local um diretório para o serviço escolhido"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3300,7 +3118,7 @@ msgstr "Criado pelo Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Copiar para área de transferência"
+msgstr "Copiar para área de trânsferência"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
@@ -3308,21 +3126,18 @@ msgstr "O programa Tor está rodando"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Você está atualmente rodando a versão \"%1\" do programa Tor."
+msgstr "Atualmente você está rodando a versão \"%1\" do Tor"
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "O programa Tor não está rodando"
+msgstr "O Tor não está rodando"
msgctxt "StatusEventWidget"
msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Clique em \"Iniciar Tor\" no painel de controle do Vidalia para reiniciar o "
-"programa Tor. Se o Tor tiver fechado inesperadamente, selecione a aba "
-"\"Avançado\" acima para detalhes sobre erros encontrados."
+msgstr "Clique em \"Iniciar Tor\" no painel de controle do Vidalia para reiniciar o Tor. Se o Tor fechar inesperadamente, seleciona a aba \"Avançado\" para detalhes sobre os erros encontrados."
msgctxt "StatusEventWidget"
msgid ""
@@ -3330,10 +3145,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"Você está atualmente rodando a versão \"%1\" do programa Tor, que não é mais"
-" recomendada. Por favor atualize para a versão mais recente do programa, que"
-" contem consertos importantes de segurança, confiança e performance."
+msgstr "Você está rodando atualmente a versão \"%1\" do Tor, a qual não é mais recomendada. Atualize para a mais recente versão do software, que contém importantes atualizações de segurança, estabilidade e performance."
msgctxt "StatusEventWidget"
msgid ""
@@ -3341,15 +3153,11 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"Você está atualmente rodando a versão \"%1\" do programa Tor, que pode não "
-"funcionar mais com a rede Tor atual. Por favor atualize para a versão mais "
-"recente do programa, que contem consertos importantes de segurança, "
-"confiança e performance."
+msgstr "Você está rodando atualmente a versão \"%1\" do Tor, a qual não é mais recomendada para a atual rede Tor. Atualize para a mais recente versão do software, que contém importantes atualizações de segurança, estabilidade e performance."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "O seu programa Tor está desatualizado"
+msgstr "Seu Tor está desatualizado"
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
@@ -3359,22 +3167,17 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Conseguimos estabelecer uma conexão com a rede Tor com sucesso. Você pode "
-"agora configurar seus aplicativos para usar a internet anonimamente."
+msgstr "Você está pronto para estabelecer uma conexão com a rede Tor. Você pode configurar agora suas aplicações para usar a Internet anonimamente."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Erro do programa Tor"
+msgstr "Erro do 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 programa Tor encontrou um erro interno. Por favor reporte a seguinte "
-"mensagem de erro para os desenvolvedores do Tor em "
-"bugs.torproject.org:\"%1\""
+msgstr "O Tor encontrou um erro interno. Envie a mensagem do relatório de erro aos desenvolvedores do Tor em bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3382,11 +3185,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"O Tor determinou que o relógio do seu computador pode estar configurado com "
-"%1 segundos a menos em comparação com a fonte \"%2\". Se o seu relógio não "
-"estiver correto, o Tor não poderá funcionar. Por favor certifique-se de que "
-"o seu computador exiba a hora correta."
+msgstr "Tor determinou que o relógio do seu computador pode ser alterado em %1 segundos no passado comparado com a fonte \"%2\". Se o seu relógio não estiver correto, o Tor não estará disponível para funcionar. Verifique se o seu computador mostra a hora correta."
msgctxt "StatusEventWidget"
msgid ""
@@ -3394,15 +3193,11 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"O Tor determinou que o relógio do seu computador pode estar configurado com "
-"%1 segundos a mais em comparação com a fonte \"%2\". Se o seu relógio não "
-"estiver correto, o Tor não poderá funcionar. Por favor certifique-se de que "
-"o seu computador exiba a hora correta."
+msgstr "Tor determinou que o relógio do seu computador pode ser alterado em %1 segundos no futuro comparado com a fonte \"%2\". Se o seu relógio não estiver correto, o Tor não estará disponível para funcionar. Verifique se o seu computador mostra a hora correta."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "O relógio do seu computador está provavelmente incorreto"
+msgstr "O relógio do seu computador esta provavelmente incorreto."
msgctxt "StatusEventWidget"
msgid ""
@@ -3410,21 +3205,14 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"Um dos aplicativos no seu computador pode ter tentado fazer uma conexão nao "
-"encriptada pelo Tor na porta %1. O envio de informação não encriptada pela "
-"rede Tor é perigoso e não recomendado. Para a sua proteção, o Tor fechou "
-"essa conexão automaticamente."
+msgstr "Uma das aplicações em seu computador pode ter tentado realizar uma conexão não encriptada através do Tor para a porta %1. Enviar informação desencriptada através da rede Tor é perigoso e não recomendado. Para sua proteção, Tor automaticamente fechou a conexão."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Um dos programas no seu computador pode ter tentado uma conexão "
-"descriptografada através do Tor para a porta %1. Enviar informação "
-"descriptografada pela rede Tor é perigoso e não é recomendado."
+msgstr "Uma das aplicações em seu computador pode ter tentado realizar uma conexão não encriptada através do Tor para a porta %1. Enviar informações desencriptadas através da rede Tor é perigoso e não recomendável."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3436,11 +3224,7 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Um de seus aplicativos estabeleceu uma conexão pelo Tor em \"%1\" usando um "
-"protocolo que pode vazar informações sobre a sua localização. Por favor "
-"assegure-se de configurar seus aplicativos para usarem apenas SOCKS4a ou "
-"SOCKS5 com resolução de hostname remoto."
+msgstr "Uma de suas aplicações estabeleceu uma conexão através da rede Tor para \"%1\" usando um protocolo que pode deixar vazar informações sobre seu destino. Assegure-se de que as configurações de suas aplicações somente usem SOCKS4a ou SOCKS5 com a resolução do hostname remoto."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
@@ -3451,91 +3235,70 @@ msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Um de seus aplicativos tentou estabelecer uma conexão pelo Tor usando um "
-"protocolo que o Tor não entende. Por favor assegure-se de configurar seus "
-"aplicativos para usarem apenas SOCKS4a ou SOCKS5 com resolução de hostname "
-"remoto."
+msgstr "Uma de suas aplicações tentou estabelecer uma conexão através do Tor usando um protocolo que o Tor não reconheceu. Assegure-se de que a configuração de suas aplicações use somente SOCKS4a ou SOCKS5 com hostname remoto como resolução."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Destino de hostname inválido"
+msgstr "Hostname de destino inválido"
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Um de seus aplicativos tentou estabelecer uma conexão pelo Tor em \"%1\", "
-"que o Tor não reconhece como um hostname válido. Por favor confira a "
-"configuração do seu aplicativo."
+msgstr "Uma de suas aplicações tentou estabelecer uma conexão através do Tor para \"%1\", a qual o Tor não reconheceu como um hostname válido. Por favor, cheque as configurações de suas aplicações."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Endereço de IP externo modificado"
+msgstr "IP externo alterado"
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"Tor tem determinado o endereço público do seu relay IP é atualmente %1%2. Se"
-" isso não está correto, por favor, considere a definição do 'Endereço' opção"
-" na configuração do seu relay."
+msgstr "Tor determinou que o IP de sua retransmissão pública é atualmente %1%2. Se não estiver correto, considere configurar a opção \"Endereço\" na configuração de sua retransmissão."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Tomada de DNS detectada"
+msgstr "Sequestro de DNS detectado"
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"O Tor detectou que o seu provedor de DNS está enviando respostas falsas para"
-" domínios que não existem. Alguns provedores de internet e de DNS, como o "
-"OpenDNS, podem fazer isso para mostrar sua própria busca ou páginas de "
-"anúncios."
+msgstr "Tor detectou que o seu provedor DNS está provendo falsas respostas para domínios que não existem. Alguns ISPs e outros provedores DNS, como o OpenDNS, são conhecidos por fazer isto a fim de mostrar sua própria publicidade ou busca. "
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"O Tor detectou que o seu provedor de DNS está enviando respostas falsas para"
-" domínios conhecidos. Já que os clientes dependem que os relays da rede Tor "
-"enviem respostas DNS corretas, seu relay não será configurado como um relay "
-"de saída."
+msgstr "Tor detectou que o seu provedor DNS está provendo falsas respostas para domínios bem conhecidos. Como os clientes contam com as retransmissões da rede Tor para obter respostas precisas de DNS, sua retransmissão não será configurada como uma retransmissão de saída."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Verificando Acessibilidade à Porta do Servidor"
+msgstr "Checando acessibilidade na porta do servidor"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"Tor está tentando determinar se a porta do seu servidor relay está "
-"acessível a partir da rede Tor, ligando a si mesmo em %1:%2. Este teste pode"
-" demorar alguns minutos."
+msgstr "Tor está tentando determinar se a retransmissão da porta do seu servidor está acessível para a rede Tor, conectando-se a si mesma ás %1:%2. Este teste pode levar alguns minutos."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Teste de Acessibilidade da Porta do Servidor com sucesso!"
+msgstr "Acessibilidade na porta do servidor testada com sucesso!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Seu servidor de relay está acessível na rede Tor!"
+msgstr "A porta de retransmissão do seu servidor está acessível a partir da rede Tor"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Teste de Acessibilidade da Porta do Servidor falhou!"
+msgstr "Teste de acessibilidade da porta do servidor falhou"
msgctxt "StatusEventWidget"
msgid ""
@@ -3543,38 +3306,30 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"Sua porta do servidor relay não está alcançável por outros clientes Tor. "
-"Isso pode acontecer se você estiver atrás de um roteador ou firewall que "
-"requer que você configure o encaminhamento de porta. Se %1:%2 não é o seu "
-"endereço IP correto e a porta do servidor, por favor, verifique a "
-"configuração do seu relay."
+msgstr "Sua porta de retransmissão do servidor não está acessível para outros clientes Tor. Isto pode acontecer se você está atras de um roteador ou firewall, que requerem que você configure o redirecionamento de porta. Se %1:%2 não é seu IP e porta, por favor cheque as configurações de sua retransmissão."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Verificando Acessibilidade à Porta do Diretório"
+msgstr "Checando porta de acessibilidade"
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor está tentando determinar se a porta do seu diretório de relay está "
-"alcansavél da rede Tor por conectar-se à %1:%2. Este teste pode levar alguns"
-" minutos."
+msgstr "Tor está tentando determinar se o diretório da porta de retransmissão está acessível a partir da rede Tor, conectando-se a si mesma ás %1:%2. Este teste pode levar alguns minutos."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Acessibilidade à Porta do Diretório com Sucesso!"
+msgstr "Diretório da porta de acessibilidade testado com sucesso!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Sua porta do diretório de relay está alcançavél na rede Tor!"
+msgstr "O diretório da porta de retransmissão está acessível para a rede Tor!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Acessibilidade à Porta do Diretório Falhou"
+msgstr "Teste da porta de acessibilidade falhou"
msgctxt "StatusEventWidget"
msgid ""
@@ -3582,28 +3337,21 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"Sua porta do servidor relay não está alcançável por outros clientes Tor. "
-"Isso pode acontecer se você estiver atrás de um roteador ou firewall que "
-"requer que você configure o encaminhamento de porta. Se %1:%2 não é o seu "
-"endereço IP correto e a porta do servidor, por favor, verifique a "
-"configuração do seu relé."
+msgstr "A porta do diretório de retransmissão não está acessível para outros clientes Tor. Isto pode acontecer se você estiver atrás de um roteador ou firewall, que requerem que você configure o redirecionamento de porta. If %1:%2 não é seu IP e porta, cheque a configuração de sua retransmissão."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Descritor do Relay Rejeitado"
+msgstr "Descrição da Retransmissão Rejeitada"
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Seu descritor de relay, que ativa clientes para conectar em seu relay, foi "
-"rejeitado pelo servidor de diretório em %1:%2. A razão dada foi %3."
+msgstr "O descritor de sua retransmissão, que possibilita cliente à usá-la, foi rejeitado pelo diretório do servidor ás %1:%2. A razão obtida foi: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "O seu Retransmissor está online."
+msgstr "Sua retransmissão está Online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3611,11 +3359,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"O seu Retransmissor está agora online e disponível para uso dos clientes "
-"Tor. Você deve ver um aumento no tráfego de rede mostrado pelo Gráfico de "
-"Largura de Banda em algumas horas à medida que novos clientes descobrem o "
-"seu Retransmissor. Obrigado por contribuir com a rede Tor! "
+msgstr "Sua retransmissão está agora online e disponível para os clientes Tor usarem-na. Você devera ver um aumento no tráfego da rede através do Gráfico de Largura de Banda em algumas horas conforme mais clientes se informam sobre sua retransmissão. Obrigado por contribuir com a rede Tor!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Log de Mensagens"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Status do Tor "
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Mostrar ao iniciar"
msgctxt "Stream"
msgid "New"
@@ -3653,6 +3413,12 @@ 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 "Vidalia não iniciou o Tor. Você deve parar o Tor através da interface onde você o iniciou."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Falha ao interromper o processo %1. [%2]"
@@ -3671,19 +3437,17 @@ msgstr "Falha ao determinar a senha de controle."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Editar torrc"
+msgstr "Editando torrc"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Salvar configurações. Se desmarcado, as configurações só serão aplicadas à "
-"instância atual do Tor."
+msgstr "Salvar configurações. Se não for selecionado, somente serão aplicadas à instância atual do Tor."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Recortar"
+msgstr "Cortar"
msgctxt "TorrcDialog"
msgid "Copy"
@@ -3707,21 +3471,19 @@ msgstr "Selecionar tudo"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Aplicar tudo"
+msgstr "Aplicar em tudo"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Aplicar somente a seleção"
+msgstr "Aplicar somente à seleção"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Erro ao conectar ao Tor"
+msgstr "Erro ao conetar ao Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"A seleção está vazia. Por favor selecione algum texto, ou marque \"Aplicar a"
-" todos\""
+msgstr "Seleção está vazia. Por favor, selecione algum texto, ou em \"Aplicar em tudo\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3733,7 +3495,31 @@ msgstr "Erro"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Ocorreu um erro ao abrir o arquivo torrc"
+msgstr "Um erro ocorreu ao abrir o arquivo torrc"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
msgctxt "UPNPControl"
msgid "Success"
@@ -3745,8 +3531,7 @@ msgstr "Nenhum dispositivo UPnP-compatível foi encontrado"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
-"Nenhum dispositivo de acesso a internet UPnP-compativel foi encontrado"
+msgstr "Nenhum dispositivo de acesso a internet UPnP-compativel foi encontrado"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3796,17 +3581,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"O Vidalia foi incapaz de procurar por atualizações do programa disponíveis "
-"pois não pode encontrar '%1':"
+msgstr "Vidalia não conseguiu procurar por novas atualizações por que não encontrou '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"O Vidalia foi incapaz de procurar por atualizações do programa disponíveis "
-"pois o processo de atualização do Tor fechou inesperadamente."
+msgstr "Vidalia está impossibilitado de procurar por novas atualizações porque o processo de atualização do Tor fechou inesperadamente."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3818,15 +3599,15 @@ msgstr "Esconder"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Fazendo download de atualizações..."
+msgstr "Baixando atualizações..."
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Instalando o programa atualizado..."
+msgstr "Instalando atualizações..."
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Pronto! O seu programa está atualizado agora."
+msgstr "Feito! Seu programa está atualizado."
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3834,7 +3615,7 @@ msgstr "OK"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Atualizações do programa"
+msgstr "Atualizações"
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
@@ -3846,11 +3627,11 @@ msgstr "Cancelar"
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Atualizações do programa disponíveis"
+msgstr "Atualizações disponíveis"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Me lembre mais tarde"
+msgstr "Lembrar-me depois"
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3858,9 +3639,7 @@ msgstr "Instalar"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Os seguintes pacotes de atualização de programa estão prontos para "
-"instalação:"
+msgstr "Os seguintes pacotes de atualizações estão disponíveis para instalação:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3870,6 +3649,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Versão"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Enviando relatório de erros"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Impossível enviar relatório: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "OK"
@@ -3963,34 +3750,27 @@ msgid "Unable to open log file '%1': %2"
msgstr "Incapaz de abrir o arquivo de registro '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Valor requerido para o parâmetro:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Código de linguagem inválido especificado:"
+msgstr "Código de língua local inválido"
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Estilo de GUI inválido especificado:"
+msgstr "Estilo GUI especificado inválido:"
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Nível de registro inválido especificdo:"
+msgstr "Nível de log especificado inválido:"
msgctxt "Vidalia"
msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Outro processo Vidalia possivelmente está sendo executado. Se realmente não há outro processo do Vidalia rodando, você pode escolher continuar assim mesmo.\n"
-"\n"
-"Você quer continuar a inicialização do Vidalia?"
+msgstr "Outro processo Vidalia já está rodando. Se não for outro processo Vidalia, você pode optar por continuar mesmo assim.\n\nVocê gostaria de continuar iniciando o Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 segundos"
+msgstr "%1 segs"
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -4018,6 +3798,4 @@ msgstr "%1 horas"
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 minutos"
-
-
+msgstr "%1 mins"
diff --git a/src/vidalia/i18n/po/ro/qt_ro.po b/src/vidalia/i18n/po/ro/qt_ro.po
index fe4c716..2e66fb5 100644
--- a/src/vidalia/i18n/po/ro/qt_ro.po
+++ b/src/vidalia/i18n/po/ro/qt_ro.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KO"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 octeţi"
-
-
diff --git a/src/vidalia/i18n/po/ro/vidalia_ro.po b/src/vidalia/i18n/po/ro/vidalia_ro.po
index 59c0839..b472a54 100644
--- a/src/vidalia/i18n/po/ro/vidalia_ro.po
+++ b/src/vidalia/i18n/po/ro/vidalia_ro.po
@@ -1,23 +1,17 @@
-#
-# Translators:
-# Cristian Măgherușan-Stanciu <cristi.magherusan at gmail.com>, 2011.
-# Florin Putura <puturaflorin at yahoo.com>, 2011.
-# <koderpro 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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-10-27 12:15+0000\n"
-"Last-Translator: tziparu <puturaflorin at yahoo.com>\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-05-15 14:45-0600\n"
+"Last-Translator: Pepelea Paul <paul_pepelea 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"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
@@ -39,13 +33,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr "Qt 4.4.2"
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versiune"
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' nu este o adresă IP validă."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr "Aţi ales autentificarea prin parolă, însă nu aţi specificat o parolă."
msgctxt "AdvancedPage"
@@ -85,6 +94,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia nu a putut instala serviciul Tor"
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Port de control"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "Autentificare:"
@@ -118,8 +131,7 @@ msgstr "Fişierul de configurare Tor"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"Tor foloseşte acest fişier de configurare (torrc) atunci când este lansat"
+msgstr "Tor foloseşte acest fişier de configurare (torrc) atunci când este lansat"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -142,71 +154,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr "Alegeţi directorul de stocare a datelor pentru programul Tor"
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr "Control pentru Tor"
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "Foloseşte conexiunea TCP (ControlPort)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "Cale:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Utilizaţi un socket Unix (ControlSocket)"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "Editează fişierul torrc curent"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTĂ: se va edita fișierul torrc încărcat în prezent"
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "Calea către ControlSocket nu există."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Calea fişierului de configurare Tor conţine caractere care nu pot fi "
-"reprezentate în sistemul de codare de caractere curent, reprezentat pe "
-"8-biţi."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "Avertizare"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Ai modificat calea către torrc, vrei să reporneşti Tor?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Fişier configurare Tor (torrc);; Toate fişierele (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Selectează un fişier pentru calea către întrerupătorul Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configurare automată a ControlPort"
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -252,7 +200,7 @@ msgstr "Statistici trafic Tor"
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Iniţializare"
+msgstr "Reiniţializare"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
@@ -272,7 +220,7 @@ msgstr "Înfăţişare"
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Modifică nivelul de transparenţă al graficului de trafic"
+msgstr "Modifică nivelul de transparenţă al graficului"
msgctxt "BandwidthGraph"
msgid "100"
@@ -292,7 +240,7 @@ msgstr "Revocare"
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Incepe cererea pentru protocolul HTTPS..."
+msgstr "Incepe cererea pentru HTTP bridge..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -300,7 +248,7 @@ msgstr "Conectare la %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Se trimite o cerere pentru inițializare protocol HTTP ..."
+msgstr "Se trimite o cerere pentru HTTP bridges..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
@@ -451,9 +399,7 @@ msgid "Remember my password"
msgstr "Reţine parola"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
"Vidalia s-a conectat la un proces Tor,care necesită o parolă. Vă rugăm să "
"introduceţi parola de control:"
@@ -1171,10 +1117,6 @@ msgid "Zimbabwe"
msgstr "Zimbabwe"
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "Zair"
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr "Albania"
@@ -1270,56 +1212,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr "Taiwan"
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "Trimite un Raport de Prăbuşire"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia a întâlnit o problemă şi s-a închis"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Reporneşte Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Nu reporni"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Nu pot reporni Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-"Nu am putut să repornim automat Vidalia. Te rog reporneşte Vidalia manual."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr "Fişiere executabile (*.exe)"
@@ -1337,6 +1229,10 @@ msgid "You must specify the name of your Tor executable."
msgstr "Trebuie să specificaţi numele fişierului executabil Tor."
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Argumentele specificate pentru proxy sunt invalide."
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr "Porneşte Vidalia odată cu sistemul de operare"
@@ -1533,31 +1429,20 @@ msgid "Opening External Link"
msgstr "Se deschide legătură externă"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-"Vidalia poate deschide legătura pe care aţi ales-o cu navigatorul "
-"dumneavoastră web implicit. Dacă navigatorul dumneavoastră nu este "
-"configurat pentru a folosi Tor, atunci cererea nu va fi anonimă."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidalia poate deschide legătura pe care aţi ales-o cu navigatorul dumneavoastră web implicit. Dacă navigatorul dumneavoastră nu este configurat pentru a folosi Tor, atunci cererea nu va fi anonimă."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-"Doriţi ca Vidalia să deschidă legătura cu navigatorul dumneavoastră web?"
+msgstr "Doriţi ca Vidalia să deschidă legătura cu navigatorul dumneavoastră web?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
msgstr "Legătura nu a putut fi deschisă"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia nu a putut deschide adresa aleasă. Puteţi copia şi apoi lipi adresa "
-"direct în navigatorul web."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia nu a putut deschide adresa aleasă. Puteţi copia şi apoi lipi adresa direct în navigatorul web."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1599,30 +1484,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr "Necunoscut"
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr "Depanare"
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "Informare"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "Înştiinţare"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "Avertizare"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "Eroare"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "Necunoscut"
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr "Porneşte Tor"
@@ -1717,9 +1578,7 @@ msgstr "Eroare la pornirea clientului de mesagerie instantanee"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
-"Vidalia nu a putut porni clientul de mesagerie instantanee specificat în "
-"setări"
+msgstr "Vidalia nu a putut porni clientul de mesagerie instantanee specificat în setări"
msgctxt "MainWindow"
msgid "Error starting proxy server"
@@ -1838,12 +1697,8 @@ msgid "Error Starting Tor"
msgstr "Eroare la iniţializarea Tor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia nu a putut porni Tor. Verificaţi setările pentru a vă asigura că "
-"numele şi locaţia fişierului executabil Tor sunt corect specificate."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia nu a putut porni Tor. Verificaţi setările pentru a vă asigura că numele şi locaţia fişierului executabil Tor sunt corect specificate."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1878,12 +1733,8 @@ msgid "Cookie Authentication Required"
msgstr "Impune autentificare prin cookie"
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor cere Vidalia transmiterea unui cookie de autentificare, dar Vidalia nu a"
-" putut găsi unul."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor cere Vidalia transmiterea unui cookie de autentificare, dar Vidalia nu a putut găsi unul."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1902,12 +1753,8 @@ msgid "Error Registering for Events"
msgstr "Eroare la înregistrarea evenimentelor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-msgstr ""
-"Vidalia nu a putut înregistra anumite evenimente. O parte din "
-"caracteristicile Vidalia pot fi indisponibile."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia nu a putut înregistra anumite evenimente. O parte din caracteristicile Vidalia pot fi indisponibile."
msgctxt "MainWindow"
msgid "Authentication Error"
@@ -1926,21 +1773,15 @@ msgid "Tor Update Available"
msgstr "O nouă versiune Tor este disponibilă"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Versiunea curentă Tor este depăşită şi nu mai este recomandată. Vizitaţi "
-"site-ul Tor pentru a descărca cea mai recentă versiune."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Versiunea curentă Tor este depăşită şi nu mai este recomandată. Vizitaţi site-ul Tor pentru a descărca cea mai recentă versiune."
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr "Site-ul Tor: %1"
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr "Toate conexiunile noi vor apare ca fiind diferite faţă de cele vechi."
msgctxt "MainWindow"
@@ -1969,7 +1810,7 @@ msgstr "Comenzi rapide Vidalia"
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "Setări pentru relay\n"
+msgstr "Setări pentru relay"
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
@@ -2032,24 +1873,15 @@ msgid "Password Reset Failed"
msgstr "Resetarea parolei a eşuat"
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 a încercat să reiniţializeze parola de control pentru Tor, dar nu a "
-"reuşit să repornească Tor. Vă rugăm să verificaţi Task Manager pentru a vă "
-"asigura ca nu există alte procese Tor care rulează."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia a încercat să reiniţializeze parola de control pentru Tor, dar nu a reuşit să repornească Tor. Vă rugăm să verificaţi Task Manager pentru a vă asigura ca nu există alte procese Tor care rulează."
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr "Versiunea curentă Tor este depăşită sau nu mai este recomandată."
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr "Vrei să verifici dacă este disponibil un nou pachet pentru instalare?"
msgctxt "MainWindow"
@@ -2057,12 +1889,12 @@ msgid "Potentially Unsafe Connection"
msgstr "Conexiune potenţial nesigură"
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-"Tor a închis automat conexiunea dumneavoastră pentru a vă proteja "
-"anonimitatea."
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr "Una dintre aplicaţiile dumneavoastră %1 se pare că face o potenţială conexiune necriptată şi nesigură către portul %2. Orice lucru trimis pe această conexiune poate să fie monitorizată. Vă rugăm să verificaţi configuraţia aplicaţiei şi să folosiţi numai protocale criptate, cum ar fi SLL, dacă este posibil."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr "Tor a închis automat conexiunea dumneavoastră pentru a vă proteja anonimitatea."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2073,12 +1905,8 @@ msgid "Your software is up to date"
msgstr "Software-ul dumneavostră este actualizat"
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr ""
-"Nu sunt disponibile noi pachete software Tor pentru calculatorul "
-"dumneavoastră în acest moment."
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr "Nu sunt disponibile noi pachete software Tor pentru calculatorul dumneavoastră în acest moment."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2093,41 +1921,28 @@ msgid "The following error occurred:"
msgstr "A apărut următoarea eroare:"
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 "Nu a reuşit (%1)"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
-"Releu dvs. se închide \\ n.Faceţi clic pe \"Stop\" din nou pentru a opri "
-"releu acum."
+"Releu dvs. se închide \\ n.Faceţi clic pe \"Stop\" din nou pentru a opri releu "
+"acum."
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Tu deja rulezi un releu.Oprirea releului va intrerupe orice conexiune intre clientii.\n"
+"Tu deja rulezi un releu.Oprirea releului va intrerupe orice conexiune intre "
+"clientii.\n"
"\n"
"Doriţi să opriti si sa dati clientilor timp sa gaseasca alt releu?"
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
@@ -2136,18 +1951,32 @@ msgstr ""
"Te rog verifică mesajele pentru o avertizare sau o eroare."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
+msgid ", probably Telnet,"
+msgstr ", probabil Telnet,"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
+msgid ", probably an email client,"
+msgstr ", probabil un client de email,"
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Fişier"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Despre Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Pagina de start"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Verifică pentru actualizări"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2171,9 +2000,7 @@ msgstr "Este necesar numele fişierului jurnal"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Trebuie să introduceţi un nume de fişier pentru a putea salva mesajele din "
-"jurnal."
+msgstr "Trebuie să introduceţi un nume de fişier pentru a putea salva mesajele din jurnal."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2392,6 +2219,10 @@ msgid "messages"
msgstr "mesaje"
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Salvează întotdeauna mesajele noi din jurnal"
+
+msgctxt "MessageLog"
msgid "Browse"
msgstr "Răsfoieşte"
@@ -2404,40 +2235,21 @@ msgid "Automatically save new log messages to a file"
msgstr "Salvează automat noile mesaje din jurnal într-un fişier."
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "De bază"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Stare Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avansat"
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Salvează întotdeauna mesajele noi din jurnal"
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
+msgid "Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
"Acele mesaje apar când ceva a mers prost în \n"
" şi Tor nu poate continua."
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
"Acele mesaje apar doar cand \n"
" a mers prost cu Tor."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
@@ -2448,24 +2260,21 @@ msgstr ""
"să vă pasă."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
"Mesajele care apar frecvent \n"
"în timpul funcţionării normale Tor."
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
"Mesaje Hyper-verbose în principal din \n"
"prezintă interes pentru dezvoltatorea Tor."
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2590,20 +2399,12 @@ msgid "Copy (Ctrl+C)"
msgstr "Copiază (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 ""
-"Pentru a folosi Tor ca proxy, prin care să accesaţi internetul, este nevoie "
-"să specificaţi atât o adresă de IP, cât şi un port."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Pentru a folosi Tor ca proxy, prin care să accesaţi internetul, este nevoie să specificaţi atât o adresă de IP, cât şi un port."
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
-msgstr ""
-"Trebuie să specificaţi unul sau mai multe porturi la care firewall-ul "
-"dumneavoastră să vă permită conectarea."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Trebuie să specificaţi unul sau mai multe porturi la care firewall-ul dumneavoastră să vă permită conectarea."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2611,9 +2412,7 @@ msgstr "'%1' nu este un număr valid de port."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Bifaţi aici dacă reţeaua dumneavoastră locală necesită un proxy pentru a "
-"accesa internetul"
+msgstr "Bifaţi aici dacă reţeaua dumneavoastră locală necesită un proxy pentru a accesa internetul"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2624,10 +2423,18 @@ msgid "Proxy Settings"
msgstr "Setări proxy"
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "Proxy HTTP:"
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr "Nume utilizator:"
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Foloseşte acest proxy şi pentru protocolul HTTPS"
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr "Parola:"
@@ -2637,9 +2444,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Bifaţi aici pentru a folosi numai conexiuni către relay-uri ce folosesc "
-"porturi permise de firewall-ul dumneavoastră"
+msgstr "Bifaţi aici pentru a folosi numai conexiuni către relay-uri ce folosesc porturi permise de firewall-ul dumneavoastră"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2658,12 +2463,8 @@ msgid "80, 443"
msgstr "80, 443"
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
-msgstr ""
-"Bifaţi aici pentru a cripta cererile către director şi, opţional, pentru a "
-"folosi bridge relay-uri pentru a accesa reţeaua Tor."
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr "Bifaţi aici pentru a cripta cererile către director şi, opţional, pentru a folosi bridge relay-uri pentru a accesa reţeaua Tor."
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2674,10 +2475,18 @@ msgid "Bridge Settings"
msgstr "Setări bridge relay"
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Versiunea Tor pe care o folosiţi nu are suport pentru bridge-uri. <br>Conexiunile către director vor fi, totuşi, criptate."
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr "Adaugă un bridge relay:"
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Cum găsesc un bridge?</a>"
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr "Elimină bridge relay-urile alese din listă"
@@ -2698,45 +2507,14 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr "<a href=\"bridges.finding\">Cum pot găsi bridges?</a>"
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
-"Nici un bridge nou nu este disponibil.Puteti astepta o perioada de timp, fie"
-" şi încercaţi din nou, sau încercaţi o altă metodă de a găsi bridges noi."
+"Nici un bridge nou nu este disponibil.Puteti astepta o perioada de timp, fie "
+"şi încercaţi din nou, sau încercaţi o altă metodă de a găsi bridges noi."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Apasa Help pentru a putea vedea celelalte metode de a găsi bridges noi."
-
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "Adresă:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "Tip:"
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "Trebuie să selectezi un tip de proxy."
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr "Apasa Help pentru a putea vedea celelalte metode de a găsi bridges noi."
msgctxt "Policy"
msgid "accept"
@@ -2891,18 +2669,11 @@ msgid "Bridge Support Unavailable"
msgstr "Suport pentru bridge relay-uri este indisponibil"
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
-msgstr ""
-"Aţi configurat Tor să se comporte ca un bridge relay pentru utilizatorii "
-"cenzuraţi, însă versiunea dumneavoastră de Tor nu oferă suport pentru astfel"
-" de relay-uri."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Aţi configurat Tor să se comporte ca un bridge relay pentru utilizatorii cenzuraţi, însă versiunea dumneavoastră de Tor nu oferă suport pentru astfel de relay-uri."
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr "Actualizaţi Tor sau configuraţi-l să se comporte ca un relay normal."
msgctxt "ServerPage"
@@ -2911,8 +2682,7 @@ msgstr "Bridge relay-ul dumneavoastră este oprit."
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr ""
-"Este necesar să specificaţi cel puţin un pseudonim de relay şi un port."
+msgstr "Este necesar să specificaţi cel puţin un pseudonim de relay şi un port."
msgctxt "ServerPage"
msgid "Run as a client only"
@@ -2960,9 +2730,7 @@ msgstr "Numele relay-ului dumneavoastră"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Portul prin care utilizatorii şi alte relay-uri pot comunica cu relay-ul "
-"dumneavoastră"
+msgstr "Portul prin care utilizatorii şi alte relay-uri pot comunica cu relay-ul dumneavoastră"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2973,12 +2741,8 @@ msgid "Basic Settings"
msgstr "Setări de bază"
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
-msgstr ""
-"Dacă aveţi o conexiune cu descărcare rapidă dar încărcare lentă, specificaţi"
-" aici viteza de încărcare (upload)."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Dacă aveţi o conexiune cu descărcare rapidă dar încărcare lentă, specificaţi aici viteza de încărcare (upload)."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3033,12 +2797,8 @@ msgid "Peak bandwidth rate limit"
msgstr "Limita de vârf a raţiei lăţimii de bandă"
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Rata maximă a lăţimii de bandă trebuie să fie mai mare sau egală cu rata "
-"medie. Ambele valori trebuie să fie cel puţin egale cu 20 KO/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Rata maximă a lăţimii de bandă trebuie să fie mai mare sau egală cu rata medie. Ambele valori trebuie să fie cel puţin egale cu 20 KO/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3097,17 +2857,12 @@ msgid "Show help topic on exit policies"
msgstr "Asistenţă pentru politicile de ieşire"
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr "Alegeţi resursele internet accesibile prin relay-ul dumneavoastră:"
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
-msgstr ""
-"Tor va bloca anumite programe pentru email şi partajare a fişierelor "
-"implicit, pentru a reduce spam-ul şi alte abuzuri."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor va bloca anumite programe pentru email şi partajare a fişierelor implicit, pentru a reduce spam-ul şi alte abuzuri."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3115,16 +2870,11 @@ msgstr "Politici de ieşire"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Pentru ca alţii să acceseze bridge relay-ul dumneavoastră, au nevoie de "
-"textul de mai jos:"
+msgstr "Pentru ca alţii să acceseze bridge relay-ul dumneavoastră, au nevoie de textul de mai jos:"
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Aceasta este identitatea relay-ului dumneavoastră pe care o puteţi folosi în"
-" comunicarea cu alţii"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Aceasta este identitatea relay-ului dumneavoastră pe care o puteţi folosi în comunicarea cu alţii"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3139,12 +2889,8 @@ msgid "No clients have used your relay recently."
msgstr "Niciun client nu a folosit relay-ul dumneavoastră recent."
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
-msgstr ""
-"Lăsaţi relay-ul pornit pentru ca alţi clienţi să aibe şanse mai bune în a-l "
-"găsi şi folosi."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr "Lăsaţi relay-ul pornit pentru ca alţi clienţi să aibe şanse mai bune în a-l găsi şi folosi."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3152,16 +2898,11 @@ msgstr "Istoric bridge"
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr ""
-"Vidalia nu a putut găsi istoricul de folosire a bridge-ului dumneavoastră."
+msgstr "Vidalia nu a putut găsi istoricul de folosire a bridge-ului dumneavoastră."
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
-msgstr ""
-"Tor a returnat un răspuns formatat necorespunzător când Vidalia a cerut "
-"istoricul de folosire a bridge-ului dumneavoastră."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr "Tor a returnat un răspuns formatat necorespunzător când Vidalia a cerut istoricul de folosire a bridge-ului dumneavoastră."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3176,36 +2917,24 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr "<a href=\"#bridgeUsage\">Cine a folosit bridge-ul meu?</a>"
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Ce este acesta?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "Distribuie automat adresa mea de bridge"
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Reflecta Directorul cu Relay-ul"
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
"Adresa de email la care aţi putea fi contactat dacă există o \n"
-"problema cu releu dumneavoastră. S-ar putea include, de asemenea amprentă PGP sau GPG."
+"problema cu releu dumneavoastră. S-ar putea include, de asemenea amprentă "
+"PGP sau GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr "Eroare la încercarea de a şterge toate serviciile"
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-"Configuraţi cel puţin un director de serviciu şi un port virtual pentru "
-"fiecare serviciu pe care doriţi să-l salvaţi. Eliminaţi-le pe celelalte."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Configuraţi cel puţin un director de serviciu şi un port virtual pentru fiecare serviciu pe care doriţi să-l salvaţi. Eliminaţi-le pe celelalte."
msgctxt "ServicePage"
msgid "Error"
@@ -3225,8 +2954,7 @@ msgstr "Numărul portului virtual trebuie să fie în intervalul [1 - 65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"Destinaţia poate conţine numai forme de tip adresă:port, adresă sau port."
+msgstr "Destinaţia poate conţine numai forme de tip adresă:port, adresă sau port."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
@@ -3274,261 +3002,12 @@ msgstr "Copiază în clipboard adresa onion a serviciului ales"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Răsfoieşte sistemul local de fişiere şi alege directorul pentru serviciul "
-"ales"
+msgstr "Răsfoieşte sistemul local de fişiere şi alege directorul pentru serviciul ales"
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr "Creat de Tor"
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "Copiază în memoria temporară"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Programul Tor rulează"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "În prezent rulezi versiunea \"%1\" a programului Tor."
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr "Programul Tor nu rulează"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr "Programul Tor nu este actualizat"
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Conectat la reţeaua Tor"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Eroare program 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 ""
-"Programul Tor a întalnit o problemă internă. Te rog raportează următorul "
-"mesaj de eroare către dezvoltatorii Tor la bugs.torproject.org:\"%1\"\n"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Ceasul calculatorului tău este potenţial incorect"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr "Conexiune potenţial periculoasă!"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr "Protocol SOCKS necunoscut"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr "Numele gazdei de destinaţie este invalid"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr "Adresa IP externă a fost schimbată"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Nou"
@@ -3581,70 +3060,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr "Nu s-a putut face hash pentru parola de control."
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "Editez torrc"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "Taie"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "Copiază"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "Lipeşte"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "Anulează"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr "Refaceţi"
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "Selectare totală"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Aplicare totală"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Aplică numai selecţia"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Eroare la conectarea la Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Câmpul de selecţie este gol. Vă rugăm să selectaţi un text, sau să "
-"confirmati \"Aplicare toate\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Eroare la linia %1:\"%2\""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "Eroare"
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr "A apărut o eroare la deschiderea fişierului torrc"
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Reuşit"
@@ -3702,17 +3117,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr "Se testează suportul pentru Universal Plug & Play"
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-"Vidalia nu a fost în stare să verifice pentru actualizări software "
-"disponibile, deoarece nu a putut găsi '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr "Vidalia nu a fost în stare să verifice pentru actualizări software disponibile, deoarece nu a putut găsi '%1'."
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
"Vidalia nu a putut verifica dacă există actualizăzi pentru software-ul "
"actual deoarece procesul de actualizare Tor s-a inchis neaşteptat."
@@ -3767,8 +3176,7 @@ msgstr "Instalează"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Următoarele pachete software actualizate sunt disponibile pentru instalare:"
+msgstr "Următoarele pachete software actualizate sunt disponibile pentru instalare:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3871,10 +3279,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Nu s-a putut deschide jurnalul '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Codul de limbă specificat este invalid:"
@@ -3887,12 +3291,13 @@ msgid "Invalid log level specified:"
msgstr "Nivelul jurnalului specificat este invalid:"
msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Un alt proces Vidalia este, probabil, ca deja să ruleze.Dacă există într-adevăr nu este un alt proces Vidalia care rulează, puteţi alege să continue oricum \n"
+"Un alt proces Vidalia este, probabil, ca deja să ruleze.Dacă există într-"
+"adevăr nu este un alt proces Vidalia care rulează, puteţi alege să continue "
+"oricum \n"
".\n"
"Doriţi să continuaţi deschiderea Vidalia?"
@@ -3927,5 +3332,3 @@ msgstr "%1 ore"
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr "%1 minute"
-
-
diff --git a/src/vidalia/i18n/po/ru/qt_ru.po b/src/vidalia/i18n/po/ru/qt_ru.po
index 5f88dd6..45681e3 100644
--- a/src/vidalia/i18n/po/ru/qt_ru.po
+++ b/src/vidalia/i18n/po/ru/qt_ru.po
@@ -1,20 +1,17 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.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: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
"Last-Translator: Automatically generated\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
+"Language-Team: Russian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Vidalia ts2po 0.2\n"
#: qaccessibleobject.cpp:348
@@ -445,5 +442,3 @@ msgstr "%1 Кб"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 байт"
-
-
diff --git a/src/vidalia/i18n/po/ru/vidalia_ru.po b/src/vidalia/i18n/po/ru/vidalia_ru.po
index 959f42a..f1cb879 100644
--- a/src/vidalia/i18n/po/ru/vidalia_ru.po
+++ b/src/vidalia/i18n/po/ru/vidalia_ru.po
@@ -2,15 +2,16 @@
# Translators:
# axe <axe.rode at ymail.com>, 2011.
# <liquixis at gmail.com>, 2012.
+# runasand <runa.sandvik at gmail.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-09-07 14:40+0000\n"
-"PO-Revision-Date: 2012-01-31 21:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: liquixis <liquixis at gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -137,9 +138,7 @@ msgstr "Хранить данные для программного обеспе
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr ""
-"Выберите каталог, используемый для хранения данных для программного "
-"обеспечения Tor"
+msgstr "Выберите каталог, используемый для хранения данных для программного обеспечения Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -173,17 +172,13 @@ msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-"Путь к заданному файлу конфигурации Tor содержит символы которые не могут "
-"быть представлены в текущей 8-битной кодировке вашей системы."
+msgstr "Путь к заданному файлу конфигурации Tor содержит символы которые не могут быть представлены в текущей 8-битной кодировке вашей системы."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr ""
-"Путь к заданной папке данных Tor содержит символы которые не могут быть "
-"представлены в текущей 8-битной кодировке вашей системы."
+msgstr "Путь к заданной папке данных Tor содержит символы которые не могут быть представлены в текущей 8-битной кодировке вашей системы."
msgctxt "AdvancedPage"
msgid "Warning"
@@ -202,17 +197,11 @@ msgid "Select a file to use for Tor socket path"
msgstr "Выберите файл для использования для пути сокета Tor"
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Настроить ControlPort автоматически"
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia не смогла удалить сервис Tor. Возможно, вам придется удалить его "
-"вручную."
+msgstr "Vidalia не смогла удалить сервис Tor. Возможно, вам придется удалить его вручную."
msgctxt "AppearancePage"
msgid "Language"
@@ -247,10 +236,6 @@ msgid "Show Settings"
msgstr "Показать настройки"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor трафик"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Сброс"
@@ -290,6 +275,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отменить"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "График трафика"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Начинаем HTTPS-запрос мостa ..."
@@ -443,20 +432,27 @@ msgid "Control socket is not connected."
msgstr "Контрольный сокет не подключен."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Необходим пароль"
+msgid "Problem connecting to Tor"
+msgstr "Проблема соединения с Tor"
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Запомнить пароль"
+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 "Tor уже запущен, но Vidalia не может с ним соединиться.\n\nЭто могло произойти если что-то еще (другой активный процесс Vidalia или аварийно завершенный процесс Vidalia) запустило Tor."
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr ""
-"Vidalia подключилась к работающему процессу Tor, который требует пароль. "
-"Пожалуйста, введите свой пароль:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr "Необходимо завершить процесс Tor перед тем как Vidalia сможет запустить новый."
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr "Vidalia может попробовать перезапустить Tor. Это прервет все активные на данный момент соединения через ваш процесс Tor."
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1279,6 +1275,24 @@ msgid "Vidalia encountered an error and needed to close"
msgstr "Vidalia совершила ошибку и требует завершения"
msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr "Отчет об аварийном завершении был создан и вы можете автоматически отправить его разработчикам Vidalia что бы помочь им найти и устранить ошибку. Отправляемый отчет не содержит какой-либо персональной информации, но ваше соединение с сервером сообщений об аварийных завершениях может быть неанонимным."
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr "Пожалуйста, так же опишите что вы делали перед аварийным завершением приложения (по желанию):"
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr "Отправить мой отчет об аварийном завершении разработчикам Vidalia"
+
+msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
msgstr "Перезапустить Vidalia"
@@ -1294,40 +1308,19 @@ msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
-"Мы не смогли автоматически перезапустить Vidalia. Пожалуйста, перезапустите "
-"Vidalia вручную."
+msgstr "Мы не смогли автоматически перезапустить Vidalia. Пожалуйста, перезапустите Vidalia вручную."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Пожалуйста, заполните тикет:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Подключение..."
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Отсылка отчета об аварийном завершении..."
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-"Отчет об аварийном завершении был создан и вы можете отправить его "
-"разработчикам Vidalia что бы помочь им найти и устранить ошибку. "
-"Отправляемый отчет не содержит какой-либо персональной информации."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-"с описанием того, что вы делали перед аварийным завершением работы "
-"приложения, а так же следующие файлы связанные с отчетом об аварийном "
-"завершении работы:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Получение ответа..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1354,10 +1347,6 @@ msgid "Browse"
msgstr "Обзор"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Запускать Tor при запуске Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1385,6 +1374,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Проверить сейчас"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Подключаться к Tor автоматически"
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 КБ/с"
@@ -1546,9 +1539,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia может открыть ссылку в вашем браузере по умолчанию. Если ваш браузер"
-" не настроен для использования Tor, то запрос не будет анонимным."
+msgstr "Vidalia может открыть ссылку в вашем браузере по умолчанию. Если ваш браузер не настроен для использования Tor, то запрос не будет анонимным."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1562,9 +1553,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia не смогла открыть выбранную ссылку на ваш веб-браузер. Вы все еще "
-"можете скопировать URL и вставить его в адресную строку браузера."
+msgstr "Vidalia не смогла открыть выбранную ссылку на ваш веб-браузер. Вы все еще можете скопировать URL и вставить его в адресную строку браузера."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1671,34 +1660,6 @@ 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"
@@ -1707,10 +1668,6 @@ msgid "View"
msgstr "Просмотр"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Помощь"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Ошибка при запуске веб-браузера"
@@ -1823,10 +1780,6 @@ msgid "Tor is shutting down"
msgstr "Tor останавливается"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Остановить Tor прямо сейчас"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Остановить Tor"
@@ -1846,9 +1799,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia не смогла запустить Tor. Проверьте настройки и убедитесь что имя и "
-"местоположение исполняемого файла Tor указанo."
+msgstr "Vidalia не смогла запустить Tor. Проверьте настройки и убедитесь что имя и местоположение исполняемого файла Tor указанo."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1886,9 +1837,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Программное обеспечение Tor требует Vidalia отправить содержание "
-"аутентификации куки, но Vidalia не смогла найти ни одного."
+msgstr "Программное обеспечение Tor требует Vidalia отправить содержание аутентификации куки, но Vidalia не смогла найти ни одного."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1910,22 +1859,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia не смогла зарегистрироваться для некоторых событий. Многие из "
-"функций Vidalia могут быть недоступны."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Ошибка аутентификации"
-
-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 "Пожалуйста, проверьте настройки управления портом аутентификации."
+msgstr "Vidalia не смогла зарегистрироваться для некоторых событий. Многие из функций Vidalia могут быть недоступны."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1935,9 +1869,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Установленная версия Tor устарела или не рекомендуется. Пожалуйста, посетите"
-" веб-сайт Tor для загрузки последней версии."
+msgstr "Установленная версия Tor устарела или не рекомендуется. Пожалуйста, посетите веб-сайт Tor для загрузки последней версии."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1947,8 +1879,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Все последующие соединения будут отличаться от ваших предыдущих соединений"
+msgstr "Все последующие соединения будут отличаться от ваших предыдущих соединений"
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1971,85 +1902,11 @@ msgid "Status"
msgstr "Статус"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Ярлыки Vidalia"
-
-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 "Обзор карты сети 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 устарела или не рекомендуется."
@@ -2067,9 +1924,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Tor автоматически остановил ваше соединение, чтобы сохранить вашу "
-"анонимность."
+msgstr "Tor автоматически остановил ваше соединение, чтобы сохранить вашу анонимность."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2083,9 +1938,7 @@ msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr ""
-"Новое программное обеспечение Tor для вашего компьютера в настоящий момент "
-"не доступно."
+msgstr "Новое программное обеспечение Tor для вашего компьютера в настоящий момент не доступно."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2101,25 +1954,40 @@ msgstr "Произошла следующая ошибка:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr "Похоже, что одно из ваших приложений %1a создает потенциально незашифрованное и небезопасное соединение на порт %2."
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr ""
-"Любая информация отправленная через это это соединение может быть "
-"просмотрена. Пожалуйста, проверьте настройки вашей программы и используйте "
-"только шифрующие протоколы, типа SSL, если это возможно."
+msgstr "Любая информация отправленная через это это соединение может быть просмотрена. Пожалуйста, проверьте настройки вашей программы и используйте только шифрующие протоколы, типа SSL, если это возможно."
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "не удалось (%1)"
+msgid "toolBar"
+msgstr "toolBar"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
-"Ваш ретранслятор выключается.\n"
-"Нажмите \"Стоп\" для немедленной остановки вашего ретранслятора."
+msgid "Start"
+msgstr "Старт"
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr "Стоп"
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr "Перезапустить"
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr "Перезагрузить конфигурацию Tor"
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr "Действия"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2130,36 +1998,46 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"У вас в настоящее время работает ретранслятор. Выключение вашего ретранслятора прервёт все открытые соединения клиентов.\n"
-"\n"
-"Хотели бы Вы выключить ретранслятор в щадящем режиме и дать клиентам время найти новый ретранслятор?"
+msgstr "У вас в настоящее время работает ретранслятор. Выключение вашего ретранслятора прервёт все открытые соединения клиентов.\n\nХотели бы Вы выключить ретранслятор в щадящем режиме и дать клиентам время найти новый ретранслятор?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia обнаружила, что программное обеспечение Tor неожиданно завершило "
-"работу. Пожалуйста, проверьте журнал сообщений на последние предупреждения "
-"или сообщения об ошибках."
+msgstr "Vidalia обнаружила, что программное обеспечение Tor неожиданно завершило работу. Пожалуйста, проверьте журнал сообщений на последние предупреждения или сообщения об ошибках."
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia пыталась перезапустить Tor, но не смогла. Пожалуйста, проверьте ваш диспетчер задач, что бы удостовериться, что нет другого работающего процесса Tor."
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "не удалось (%1)"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероятно Telnet)"
+msgid ", probably Telnet,"
+msgstr ", вероятно, Telnet,"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероятно email клиент)"
+msgid ", probably an email client,"
+msgstr ", вероятно, клиент электронной почты,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
-"Похоже, что одно из ваших приложений %1 создает потенциально не "
-"зашифрованное и небезопасное соединение на порт %2."
+"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 "Vidalia не смогла перезагрузить конфигурацию Tor"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2183,9 +2061,7 @@ msgstr "Требуется имя файла журнала"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Вы должны ввести имя файла, чтобы иметь возможность сохранить записи журнала"
-" в файл."
+msgstr "Вы должны ввести имя файла, чтобы иметь возможность сохранить записи журнала в файл."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2416,28 +2292,18 @@ msgid "Automatically save new log messages to a file"
msgstr "Автоматически сохранять новые сообщения в файл"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Основное"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Статус Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Дополнительное"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Всегда сохранять новые сообщения"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr "toolbar"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Сообщения, которые появляются когда что-то пошло очень неправильно и Tor не "
-"может продолжить."
+msgstr "Сообщения, которые появляются когда что-то пошло очень неправильно и Tor не может продолжить."
msgctxt "MessageLog"
msgid ""
@@ -2451,26 +2317,19 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Сообщения которые появляются редко\n"
-"во время нормальной работы Tor\n"
-"и не считаются ошибками,\n"
-"но вы можете уделить им внимание."
+msgstr "Сообщения которые появляются редко\nво время нормальной работы Tor\nи не считаются ошибками,\nно вы можете уделить им внимание."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr ""
-"Сообщения, которые часто появляются\n"
-"во время нормальной работы Tor."
+msgstr "Сообщения, которые часто появляются\nво время нормальной работы Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr ""
-"Гипер-сообщения в первую очередь представляют интерес для разработчиков Tor."
+msgstr "Гипер-сообщения в первую очередь представляют интерес для разработчиков Tor."
msgctxt "MessageLog"
msgid ""
@@ -2480,10 +2339,6 @@ msgid ""
msgstr "Невозможно записать файл %1 %2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Карта сети Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Обновить"
@@ -2583,6 +2438,22 @@ 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 "Неверный мост"
@@ -2599,17 +2470,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и "
-"использовать прокси для доступа в Интернет."
+msgstr "Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и использовать прокси для доступа в Интернет."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Вы должны указать один или несколько портов, к которым ваш сетевой экран "
-"разрешает подключение."
+msgstr "Вы должны указать один или несколько портов, к которым ваш сетевой экран разрешает подключение."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2617,8 +2484,7 @@ msgstr "'%1' неверный номер порта."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Проверьте, если вашa локальнaя сеть требует прокси для доступа в Интернет"
+msgstr "Проверьте, если вашa локальнaя сеть требует прокси для доступа в Интернет"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2642,14 +2508,11 @@ msgstr "Порт:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Удостоверьтесь, чтобы подключение к ретрансляторам Tor шло только через "
-"порты, разрешенные вашим сетевым экраном."
+msgstr "Удостоверьтесь, чтобы подключение к ретрансляторам Tor шло только через порты, разрешенные вашим сетевым экраном."
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr ""
-"Мой сетевой экран позволяет мне подключиться только к определенным портам"
+msgstr "Мой сетевой экран позволяет мне подключиться только к определенным портам"
msgctxt "NetworkPage"
msgid "Firewall Settings"
@@ -2667,9 +2530,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Удостоверьтесь, что запросы каталогa шифруются и, при необходимости, "
-"используются мосты для доступа к сети Tor"
+msgstr "Удостоверьтесь, что запросы каталогa шифруются и, при необходимости, используются мосты для доступа к сети Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2707,15 +2568,11 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Нет новых мостов, которые в настоящее время доступны. Вы можете либо "
-"подождать некоторое время и попробовать еще раз, или попробуйте другой "
-"способ нахождения новых мостов."
+msgstr "Нет новых мостов, которые в настоящее время доступны. Вы можете либо подождать некоторое время и попробовать еще раз, или попробуйте другой способ нахождения новых мостов."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-"Нажмите кнопку Помощь, чтобы увидеть другие методы поиска новых мостов."
+msgstr "Нажмите кнопку Помощь, чтобы увидеть другие методы поиска новых мостов."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2901,16 +2758,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Вы настроили Tor в качестве моста для заблокированных пользователей, но ваша"
-" версия Tor не поддерживает мостов."
+msgstr "Вы настроили Tor в качестве моста для заблокированных пользователей, но ваша версия Tor не поддерживает мостов."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Пожалуйста, обновите Tor или настройте его как обычный ретранслятор Tor."
+msgstr "Пожалуйста, обновите Tor или настройте его как обычный ретранслятор Tor."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2925,10 +2779,6 @@ msgid "Run as a client only"
msgstr "Работать только как клиент"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Трафик ретранслятора сети Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Порт ретранслятора:"
@@ -2966,9 +2816,7 @@ msgstr "Название вашего ретранслятора"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Порт, через который пользователи и другие ретрансляторы смогут общаться с "
-"вашим ретранслятором"
+msgstr "Порт, через который пользователи и другие ретрансляторы смогут общаться с вашим ретранслятором"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2982,9 +2830,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Для подключений к Интернет с медленной входящей, но с высокой исходящей "
-"скоростью, пожалуйста, укажите здесь свою входящую скорость."
+msgstr "Для подключений к Интернет с медленной входящей, но с высокой исходящей скоростью, пожалуйста, укажите здесь свою входящую скорость."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -3042,9 +2888,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Максимальная пропускная способность должна быть больше или равна вашей "
-"средней пропускной способности. Оба значения должны быть не менее 20 КБ/с."
+msgstr "Максимальная пропускная способность должна быть больше или равна вашей средней пропускной способности. Оба значения должны быть не менее 20 КБ/с."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3105,18 +2949,13 @@ msgstr "Показать помощь по правилам узлов выхо
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"К каким ресурсам Интернет пользователи смогут получить доступ через ваш "
-"ретранслятор?"
+msgstr "К каким ресурсам Интернет пользователи смогут получить доступ через ваш ретранслятор?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor будут продолжать по умолчанию блокировать некоторую исходящую почту и "
-"приложения обмена файлами для уменьшения количества спама и других "
-"злоупотреблений."
+msgstr "Tor будут продолжать по умолчанию блокировать некоторую исходящую почту и приложения обмена файлами для уменьшения количества спама и других злоупотреблений."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3129,9 +2968,7 @@ msgstr "Дайте другим доступ к вашему мосту, пре
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Это идентификатор вашего моста, которым вы можете поделиться с другими "
-"людьми"
+msgstr "Это идентификатор вашего моста, которым вы можете поделиться с другими людьми"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3149,9 +2986,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Оставьте ваш ретранслятор работающим, чтобы клиенты имели больше шансов "
-"найти и использовать его."
+msgstr "Оставьте ваш ретранслятор работающим, чтобы клиенты имели больше шансов найти и использовать его."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3165,9 +3000,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Tor вернул неправильно отформатированный отклик, когда Vidalia запрашивала "
-"историю использования вашего моста."
+msgstr "Tor вернул неправильно отформатированный отклик, когда Vidalia запрашивала историю использования вашего моста."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3190,6 +3023,14 @@ msgid "Automatically distribute my bridge address"
msgstr "Автоматически распространять адрес моего моста"
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr "Ретранслировать трафик внутри сети Tor (невыходной ретранслятор)"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Ретранслировать трафик для сети Tor (выходной ретранслятор)"
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Зеркалировать каталог ретрансляторов"
@@ -3197,9 +3038,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Адрес электронной почты, по которому вас можно найти, если\n"
-"возникнет проблема с вашим ретранслятором. Вы также можете указать ваш PGP или GPG отпечаток."
+msgstr "Адрес электронной почты, по которому вас можно найти, если\nвозникнет проблема с вашим ретранслятором. Вы также можете указать ваш PGP или GPG отпечаток."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3209,9 +3048,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Пожалуйста, выберите по крайней мере каталог сервисов и виртуальный порт для"
-" каждого сервиса, который вы хотите сохранить. Удалите другие."
+msgstr "Пожалуйста, выберите по крайней мере каталог сервисов и виртуальный порт для каждого сервиса, который вы хотите сохранить. Удалите другие."
msgctxt "ServicePage"
msgid "Error"
@@ -3227,8 +3064,7 @@ msgstr "Выберите каталог сервисов"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
-"Виртуальный порт может содержать только допустимые номера порта [1..65535]."
+msgstr "Виртуальный порт может содержать только допустимые номера порта [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
@@ -3239,10 +3075,6 @@ msgid "Directory already in use by another service."
msgstr "Каталог уже используется другой службой."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Форма"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Предоставленный скрытый сервис"
@@ -3280,9 +3112,7 @@ msgstr "Копировать \"луковый\" адрес выбранного
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Просмотр в локальной файловой системе и выбрать каталог для выбранного "
-"сервиса"
+msgstr "Просмотр в локальной файловой системе и выбрать каталог для выбранного сервиса"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3309,10 +3139,7 @@ msgid ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr ""
-"Нажмите \"Запустить Tor\" в Панели Управления Vidalia что бы перезапустить "
-"Tor. Если Tor был неожиданно завершен, выберите выше вкладку \"Расширенные\""
-" для просмотра информации о произошедших ошибках."
+msgstr "Нажмите \"Запустить Tor\" в Панели Управления Vidalia что бы перезапустить Tor. Если Tor был неожиданно завершен, выберите выше вкладку \"Расширенные\" для просмотра информации о произошедших ошибках."
msgctxt "StatusEventWidget"
msgid ""
@@ -3320,10 +3147,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr ""
-"Вы используете версию Tor \"%1\", которая более не рекомендуется для "
-"использования. Пожалуйста, обновитесь до последней версии, которая может "
-"содержать важные исправления безопасности, надежности и производительности."
+msgstr "Вы используете версию Tor \"%1\", которая более не рекомендуется для использования. Пожалуйста, обновитесь до последней версии, которая может содержать важные исправления безопасности, надежности и производительности."
msgctxt "StatusEventWidget"
msgid ""
@@ -3331,10 +3155,7 @@ msgid ""
"longer work with the current Tor network. Please upgrade to the most recent "
"version of the software, which may contain important security, reliability "
"and performance fixes."
-msgstr ""
-"Вы используете версию Tor \"%1\", которая может более не работать с текущей "
-"версией сети Tor. Пожалуйста, обновитесь до последней версии, которая может "
-"содержать важные исправления безопасности, надежности и производительности."
+msgstr "Вы используете версию Tor \"%1\", которая может более не работать с текущей версией сети Tor. Пожалуйста, обновитесь до последней версии, которая может содержать важные исправления безопасности, надежности и производительности."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
@@ -3348,9 +3169,7 @@ msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Мы смогли успешно установить соединение с сетью Tor. Теперь вы можете "
-"настроить ваши приложения для анонимного использования Интернет."
+msgstr "Мы смогли успешно установить соединение с сетью Tor. Теперь вы можете настроить ваши приложения для анонимного использования Интернет."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
@@ -3360,9 +3179,7 @@ msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-"Произошла внутренняя ошибка Tor. Пожалуйста, сообщите следующее сообщение об"
-" ошибке разработчикам Tor на bugs.torproject.org: \"%1\""
+msgstr "Произошла внутренняя ошибка Tor. Пожалуйста, сообщите следующее сообщение об ошибке разработчикам Tor на bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3370,10 +3187,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor обнаружил, что часы вашего компьютера возможно отстают на %1 секунд по "
-"сравнению с \"%2\". Если ваши часы не правильны, Tor не сможет работать. "
-"Пожалуйста, проверьте что ваш компьютер показывает правильное время."
+msgstr "Tor обнаружил, что часы вашего компьютера возможно отстают на %1 секунд по сравнению с \"%2\". Если ваши часы не правильны, Tor не сможет работать. Пожалуйста, проверьте что ваш компьютер показывает правильное время."
msgctxt "StatusEventWidget"
msgid ""
@@ -3381,10 +3195,7 @@ msgid ""
"the future compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr ""
-"Tor обнаружил, что часы вашего компьютера возможно спешат на %1 секунд по "
-"сравнению с \"%2\". Если ваши часы не правильны, Tor не сможет работать. "
-"Пожалуйста, проверьте что ваш компьютер показывает правильное время."
+msgstr "Tor обнаружил, что часы вашего компьютера возможно спешат на %1 секунд по сравнению с \"%2\". Если ваши часы не правильны, Tor не сможет работать. Пожалуйста, проверьте что ваш компьютер показывает правильное время."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
@@ -3396,21 +3207,14 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
-msgstr ""
-"Одно из приложений на вашем компьютере возможно попыталось создать "
-"незашифрованное соединение через Tor на порт %1. Отправлять незашифрованную "
-"информацию через сеть Tor опасно и не рекомендуется. Для вашей безопасности "
-"Tor автоматически закрыл это соединение."
+msgstr "Одно из приложений на вашем компьютере возможно попыталось создать незашифрованное соединение через Tor на порт %1. Отправлять незашифрованную информацию через сеть Tor опасно и не рекомендуется. Для вашей безопасности Tor автоматически закрыл это соединение."
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr ""
-"Одно из приложений на вашем компьютере возможно попыталось создать "
-"незашифрованное соединение через Tor на порт %1. Отправлять незашифрованную "
-"информацию через сеть Tor опасно и не рекомендуется."
+msgstr "Одно из приложений на вашем компьютере возможно попыталось создать незашифрованное соединение через Tor на порт %1. Отправлять незашифрованную информацию через сеть Tor опасно и не рекомендуется."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3422,11 +3226,7 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr ""
-"Одно из ваших приложений установило соединение через Tor на %1, используя "
-"протокол, который может привести у утечке информации о вашем адресате. "
-"Пожалуйста, удостоверьтесь, что вы настроили ваши приложения на "
-"использование только SOCKS4a или SOCKS5 с удаленным разрешением имен хостов."
+msgstr "Одно из ваших приложений установило соединение через Tor на %1, используя протокол, который может привести у утечке информации о вашем адресате. Пожалуйста, удостоверьтесь, что вы настроили ваши приложения на использование только SOCKS4a или SOCKS5 с удаленным разрешением имен хостов."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
@@ -3437,11 +3237,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-"Одно из ваших приложений попыталось установить соединение через Tor "
-"используя протокол неизвестный Tor. Пожалуйста, удостоверьтесь, что вы "
-"настроили ваши приложения на использование только SOCKS4a или SOCKS5 с "
-"удаленным разрешением имен хостов."
+msgstr "Одно из ваших приложений попыталось установить соединение через Tor используя протокол неизвестный Tor. Пожалуйста, удостоверьтесь, что вы настроили ваши приложения на использование только SOCKS4a или SOCKS5 с удаленным разрешением имен хостов."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
@@ -3452,10 +3248,7 @@ msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr ""
-"Одно из ваших приложений попыталось установить соединение через Tor к "
-"\"%1\", что не было распознано Tor как действительное имя хоста. Пожалуйста,"
-" проверьте настройки ваших приложений."
+msgstr "Одно из ваших приложений попыталось установить соединение через Tor к \"%1\", что не было распознано Tor как действительное имя хоста. Пожалуйста, проверьте настройки ваших приложений."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
@@ -3466,10 +3259,7 @@ msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr ""
-"Tor определил, что публичный IP адрес вашего ретранслятора сейчас - %1%2. "
-"Если это неверно, пожалуйста, рассмотрите возможность установки опции "
-"'Адрес' в настройках вашего ретранслятора."
+msgstr "Tor определил, что публичный IP адрес вашего ретранслятора сейчас - %1%2. Если это неверно, пожалуйста, рассмотрите возможность установки опции 'Адрес' в настройках вашего ретранслятора."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
@@ -3480,22 +3270,14 @@ msgid ""
"Tor detected that your DNS provider is providing false responses for domains"
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
-msgstr ""
-"Tor обнаружил, что ваш провайдер DNS предоставляет ложные ответы для доменов"
-" которые не существуют. Некоторые провайдеры Интернет и другие DNS "
-"провайдеры, типа OpenDNS, известны тем, что делают это с целью отобразить их"
-" собственные поисковые или рекламные страницы."
+msgstr "Tor обнаружил, что ваш провайдер DNS предоставляет ложные ответы для доменов которые не существуют. Некоторые провайдеры Интернет и другие DNS провайдеры, типа OpenDNS, известны тем, что делают это с целью отобразить их собственные поисковые или рекламные страницы."
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-"Tor обнаружил, что ваш провайдер DNS предоставляет ложные ответы для "
-"известных доменов. Поскольку клиенты полагаются на то, что ретрансляторы "
-"сети Tor предоставляют верные DNS ответы, ваш ретранслятор не будет настроен"
-" как выходной ретранслятор."
+msgstr "Tor обнаружил, что ваш провайдер DNS предоставляет ложные ответы для известных доменов. Поскольку клиенты полагаются на то, что ретрансляторы сети Tor предоставляют верные DNS ответы, ваш ретранслятор не будет настроен как выходной ретранслятор."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3506,10 +3288,7 @@ msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr ""
-"Tor пытается определить доступность порта сервера вашего ретранслятора из "
-"сети Tor, соединяясь с самим собой на %1:%2. Этот тест может занять "
-"несколько минут."
+msgstr "Tor пытается определить доступность порта сервера вашего ретранслятора из сети Tor, соединяясь с самим собой на %1:%2. Этот тест может занять несколько минут."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
@@ -3529,11 +3308,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
-msgstr ""
-"Порт сервера вашего ретранслятора недоступен другим клиентам Tor. Это может "
-"происходить если вы находитесь за роутером или брандмауэром, что требует от "
-"вас настроить проброс портов. Если %1:%2 не ваши правильные IP адрес и порт "
-"сервера, пожалуйста, проверьте настройки вашего ретранслятора."
+msgstr "Порт сервера вашего ретранслятора недоступен другим клиентам Tor. Это может происходить если вы находитесь за роутером или брандмауэром, что требует от вас настроить проброс портов. Если %1:%2 не ваши правильные IP адрес и порт сервера, пожалуйста, проверьте настройки вашего ретранслятора."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
@@ -3544,10 +3319,7 @@ msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr ""
-"Tor пытается определить доступен ли порт каталога вашего ретранслятора в "
-"сети Tor, путем соединения с сами собой на %1:%2. Этот тест может занять "
-"несколько минут."
+msgstr "Tor пытается определить доступен ли порт каталога вашего ретранслятора в сети Tor, путем соединения с сами собой на %1:%2. Этот тест может занять несколько минут."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
@@ -3567,11 +3339,7 @@ msgid ""
"happen if you are behind a router or firewall that requires you to set up "
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
-msgstr ""
-"Порт каталога вашего ретранслятора недоступен другим клиентам Tor. Это может"
-" происходить если вы находитесь за роутером или брандмауэром, что требует от"
-" вас настроить проброс портов. Если %1:%2 не ваши правильные IP адрес и порт"
-" каталога, пожалуйста, проверьте настройки вашего ретранслятора."
+msgstr "Порт каталога вашего ретранслятора недоступен другим клиентам Tor. Это может происходить если вы находитесь за роутером или брандмауэром, что требует от вас настроить проброс портов. Если %1:%2 не ваши правильные IP адрес и порт каталога, пожалуйста, проверьте настройки вашего ретранслятора."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
@@ -3581,10 +3349,7 @@ msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-"Дескриптор вашего ретранслятора, который позволяет клиентам соединяться с "
-"вашим ретранслятором, был отклонен сервером каталога в %1:%2. По следущей "
-"причине: %3"
+msgstr "Дескриптор вашего ретранслятора, который позволяет клиентам соединяться с вашим ретранслятором, был отклонен сервером каталога в %1:%2. По следущей причине: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
@@ -3596,12 +3361,23 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr ""
-"Ваш ретранслятор теперь в сети и доступен клиентам Tor для использования. В "
-"течение ближайших часов вы можете заметить увеличение сетевого трафика, "
-"отображаемого на графике пропускной способности, по мере того, как новые "
-"клиенты будут узнавать о вашем ретрансляторе. Спасибо вам за помощь сети "
-"Tor!"
+msgstr "Ваш ретранслятор теперь в сети и доступен клиентам Tor для использования. В течение ближайших часов вы можете заметить увеличение сетевого трафика, отображаемого на графике пропускной способности, по мере того, как новые клиенты будут узнавать о вашем ретрансляторе. Спасибо вам за помощь сети Tor!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr "Статус"
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr "Журнал сообщений"
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr "Статус Tor"
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr "Показывать при запуске"
msgctxt "Stream"
msgid "New"
@@ -3639,6 +3415,12 @@ 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 "Vidalia не запускала Tor. Необходимо остановить Tor через тот интерфейс через который он был запущен."
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Процесс %1 не удалось остановить. [%2]"
@@ -3663,9 +3445,7 @@ msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr ""
-"Сохранить настройки. Если не выбрано, настройки будут применены только к "
-"текущему запуску Tor."
+msgstr "Сохранить настройки. Если не выбрано, настройки будут применены только к текущему запуску Tor."
msgctxt "TorrcDialog"
msgid "Cut"
@@ -3705,9 +3485,7 @@ msgstr "Ошибка соединения с Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-"Выбранная область пуста. Пожалуйста, выберите необходимый текст, или нажмите"
-" \"Применить всё\""
+msgstr "Выбранная область пуста. Пожалуйста, выберите необходимый текст, или нажмите \"Применить всё\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3721,6 +3499,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr "Произошла ошибка во время открытия файла torrc"
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr "Ctrl+Shift+Z"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Успех"
@@ -3781,17 +3583,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia не смогла проверить наличие обновлений программного обеспечения, "
-"поскольку она не может найти '%1'."
+msgstr "Vidalia не смогла проверить наличие обновлений программного обеспечения, поскольку она не может найти '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia не смогла проверить наличие обновлений программного обеспечения, "
-"поскольку процесс обновления Tor неожиданно завершил работу."
+msgstr "Vidalia не смогла проверить наличие обновлений программного обеспечения, поскольку процесс обновления Tor неожиданно завершил работу."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3811,9 +3609,7 @@ msgstr "Установка новейшего программного обес
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr ""
-"Готово! Ваше программное обеспечение в настоящее время в актуальном "
-"состоянии."
+msgstr "Готово! Ваше программное обеспечение в настоящее время в актуальном состоянии."
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3845,8 +3641,7 @@ msgstr "Установить"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr ""
-"Следующие обновленные пакеты программного обеспечения готовы для установки:"
+msgstr "Следующие обновленные пакеты программного обеспечения готовы для установки:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3856,6 +3651,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Версия"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr "Загрузка отчета об аварийном завершении"
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr "Невозможно отправить отчет: %1"
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "ОК"
@@ -3946,13 +3749,7 @@ msgstr "Информация по использованию Vidalia"
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr ""
-"Невозможно открыть файл журнала \n"
-"%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Требуется задать значение параметра:"
+msgstr "Невозможно открыть файл журнала \n%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
@@ -3971,10 +3768,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Другой процесс Vidalia, возможно, уже запущен. Если действительно нет "
-"другого процесса работающего Vidalia, вы можете продолжить в любом случае. "
-"Хотели бы вы продолжить запуск Vidalia?"
+msgstr "Другой процесс Vidalia, возможно, уже запущен. Если действительно нет другого процесса работающего Vidalia, вы можете продолжить в любом случае. Хотели бы вы продолжить запуск Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -4007,5 +3801,3 @@ 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 710c7e0..0a76d76 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:41+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/sk/qt_sk.po b/src/vidalia/i18n/po/sk/qt_sk.po
index e43686a..b17eb0b 100644
--- a/src/vidalia/i18n/po/sk/qt_sk.po
+++ b/src/vidalia/i18n/po/sk/qt_sk.po
@@ -1,13 +1,11 @@
#
-# Translators:
-# <martin.strucel at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-01 11:29+0000\n"
-"Last-Translator: martinstrucel <martin.strucel at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,182 +17,182 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "Aktivovať"
+msgstr ""
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Chyba nekomaptibility knižnice Qt"
+msgstr ""
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr "QT_LAYOUT_DIRECTION"
+msgstr ""
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "Aktivuje hlavné okno programu"
+msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr "V poriadku"
+msgstr ""
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "Uložiť"
+msgstr ""
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr "Otvoriť"
+msgstr ""
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr "Zrušiť"
+msgstr ""
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr "Zatvoriť"
+msgstr ""
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr "Použiť"
+msgstr ""
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "Znovu nastaviť"
+msgstr ""
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr "Pomoc"
+msgstr ""
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "Neukladať"
+msgstr ""
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "Zahodiť zmeny"
+msgstr ""
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "&Áno"
+msgstr ""
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr "&Áno pre všetko"
+msgstr ""
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr "&Nie"
+msgstr ""
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "N&ie pre všetko"
+msgstr ""
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr "Uložiť všetko"
+msgstr ""
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr "Zrušiť"
+msgstr ""
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr "Opakovať"
+msgstr ""
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr "Ignorovať"
+msgstr ""
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr "Obnoviť predvolené"
+msgstr ""
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr "Zatvoriť bez uloženia"
+msgstr ""
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr "&V poriadku"
+msgstr ""
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr "Meno"
+msgstr ""
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr "Veľkosť"
+msgstr ""
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "Druh"
+msgstr ""
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr "Type"
+msgstr ""
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr "Dátum zmeny"
+msgstr ""
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr "Všetky súbory (*)"
+msgstr ""
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "Priečinky"
+msgstr ""
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr "&Otvoriť"
+msgstr ""
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr "&Uložiť"
+msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr "Otvoriť"
+msgstr ""
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
@@ -202,8 +200,6 @@ msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
msgstr ""
-"%1 už existuje.\n"
-"Chcete ho nahradiť?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -212,59 +208,56 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
-"Súbor nebol nájdený.\n"
-"Overte či ste zadali správny názov súboru."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "Tento počítač"
+msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "P&remenovať"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Zmazať"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "Zobraziť s&kryté súbory"
+msgstr ""
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr "Späť"
+msgstr ""
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "Rodičovský priečinok"
+msgstr ""
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "Zobraziť zoznam"
+msgstr ""
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "Zobraziť podrobnosti"
+msgstr ""
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr "Súbory typu:"
+msgstr ""
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "Priečinok:"
+msgstr ""
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
@@ -273,9 +266,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"Priečinok nebol nájdený.\n"
-"Overte či ste zadali správny názov priečinku."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -283,98 +273,96 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' je chránený proti zápisu.\n"
-"Chcete ho napriek tomu zmazať?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Chcete naozaj zmazať '%1'?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Nemožno zmazať adresár."
+msgstr ""
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr "Všetky súbory (*.*)"
+msgstr ""
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "Uložiť ako"
+msgstr ""
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "Disk"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr "Súbor"
+msgstr ""
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr "Neznámy"
+msgstr ""
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Nájsť priečinok"
+msgstr ""
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "Ukázať"
+msgstr ""
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Poslať ďalej"
+msgstr ""
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr "Nový priečinok"
+msgstr ""
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "&Nový pričinok"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&Zvoliť"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "Odobrať"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "Náz&ov súboru:"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Pozrieť sa:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "Vytvoriť nový priečinok"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Nesprávne meno súboru"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -382,67 +370,63 @@ msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
msgstr ""
-"<b>Meno \"%1\" nemôže byť použité.</b><p>Skúste použiť iný názov, s menej "
-"znakmi alebo žiadnou interpunkciou."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr "Meno"
+msgstr ""
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr "Veľkosť"
+msgstr ""
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Druh"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr "Typ"
+msgstr ""
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr "Dátum zmeny"
+msgstr ""
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "Tento počítač"
+msgstr ""
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr "Počítač"
+msgstr ""
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr "%1 TB"
+msgstr ""
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/son/vidalia_son.po b/src/vidalia/i18n/po/son/vidalia_son.po
index c5fde3f..cc59096 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:42+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/sr/qt_sr.po b/src/vidalia/i18n/po/sr/qt_sr.po
index 717e9f1..f230863 100644
--- a/src/vidalia/i18n/po/sr/qt_sr.po
+++ b/src/vidalia/i18n/po/sr/qt_sr.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 бајтова"
-
-
diff --git a/src/vidalia/i18n/po/su/vidalia_su.po b/src/vidalia/i18n/po/su/vidalia_su.po
index b0c343e..c7779a7 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/sv/qt_sv.po b/src/vidalia/i18n/po/sv/qt_sv.po
index b01cd6a..cd77beb 100644
--- a/src/vidalia/i18n/po/sv/qt_sv.po
+++ b/src/vidalia/i18n/po/sv/qt_sv.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# <marta.leffler at gmail.com>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-07-04 10:34+0000\n"
-"Last-Translator: mle <marta.leffler at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:09+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -202,7 +199,7 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "Filen %1 finns redan. Vill du ersätta den?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -211,9 +208,6 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1 \n"
-"Filen hittades inte.\n"
-"Var god bekräfta att det korrekta filnamnet har angetts."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -272,9 +266,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"Mappen hittades inte.\n"
-"Var god bekräfta att det korrekta mappnamnet har angetts."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -282,8 +273,6 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' är skrivskyddat.\n"
-"Vill du ta bort det ändå?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -443,5 +432,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bytes"
-
-
diff --git a/src/vidalia/i18n/po/sv/vidalia_sv.po b/src/vidalia/i18n/po/sv/vidalia_sv.po
index 81e690a..ba5c1f1 100644
--- a/src/vidalia/i18n/po/sv/vidalia_sv.po
+++ b/src/vidalia/i18n/po/sv/vidalia_sv.po
@@ -1,21 +1,16 @@
-#
-# Translators:
-# <marta.leffler at gmail.com>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
-"Last-Translator: mle <marta.leffler at gmail.com>\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-06-22 20:37+0000\n"
+"Last-Translator: Adam Marmbrant <adam at helgo.net>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
@@ -31,19 +26,34 @@ msgstr "Vidalia"
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr "4.4.2"
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' är ej en giltig IP-adress."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr "Du har valt lösenordsautentisering men inte angivit något lösenord."
msgctxt "AdvancedPage"
@@ -72,9 +82,7 @@ msgstr "Välj en katalog för Tor-data"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr ""
-"Vidalia kunde inte ta bort Windows-tjänsten för Tor. Du kanske måste ta bort"
-" tjänsten manuellt."
+msgstr "Vidalia kunde inte ta bort Windows-tjänsten för Tor. Du kanske måste ta bort tjänsten manuellt."
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
@@ -85,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia kunde inte installera Windows-tjänsten för Tor."
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontrollport"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "Autentiseringsmetod:"
@@ -141,74 +153,10 @@ msgid "Select the directory used to store data for the Tor software"
msgstr "Välj den katalog som används för att lagra programdata för Tor"
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "Använd TCP-anslutning (ControlPort)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "Sökväg:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Använd Unix domänsocket (ControlSocket)"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "Redigera aktuell torrc"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket sökväg finns inte."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "Varning"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Du har ändrat torrc sökvägen, vill du starta om Tor?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Konfigurationsfil (torrc);;Alla filer (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Välj en fil att använda som Tor socketsökväg"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia kunde inte ta bort Tor-tjänsten.\n"
-"\n"
-"Du kan behöva ta bort den manuellt."
msgctxt "AppearancePage"
msgid "Language"
@@ -288,51 +236,51 @@ msgstr "Avbryt"
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Skickar HTTPS-bryggförfrågan..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Kopplar upp mot %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Skickar en HTTPS-förfrågan om bryggor..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Hämtar en lista över bryggor ..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Hämtar Bryggor"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Kan inte hämta bryggor:%1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Testar bryggförfrågan igen..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Land"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "Antal klienter"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klienter från följande länder har använt din router sedan %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Brygganvändning"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Klientöverblick"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -447,12 +395,8 @@ msgid "Remember my password"
msgstr "Kom ihåg mitt lösenord"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
-"Vidalia har anslutit till en pågående Tor process som kräver ett lösenord. "
-"Vänligen ange ditt kontrollösenord:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -472,27 +416,27 @@ msgstr "Ogitligt kontrollsvar. [%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afghanistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
@@ -500,143 +444,143 @@ msgstr "Om Vidalia"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbajdzjan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Vitryssland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnien och Hercegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brasilien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgarien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Kambodja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Kamerun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Kanada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Kap Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centralafrikanska republiken"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Tchad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Chile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Kina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Colombia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Komorerna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Kongo, Demokratiska republiken"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Kongo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Elfenbenskusten"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Kroatien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Kuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Cypern"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Tjeckien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Danmark"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
@@ -644,35 +588,35 @@ msgstr "Om"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominikanska republiken"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egypten"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Ekvatorialguinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estland"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
@@ -680,31 +624,31 @@ msgstr "Avbryt"
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Tyskland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
@@ -712,83 +656,83 @@ msgstr "Allmänt"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hongkong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haiti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordanien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirgizistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Lettland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Libanon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
@@ -796,107 +740,107 @@ msgstr "Licens"
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Litauen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxemburg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Makedonien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagaskar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malaysia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Marshallöarna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauretanien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauritius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Mikronesien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldavien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongoliet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Marocko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Moçambique"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Nederländerna"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Nya Zeeland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
@@ -904,43 +848,43 @@ msgstr "Framåt"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Nya Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filippinerna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
@@ -948,47 +892,47 @@ msgstr "Port:"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Rumänien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Ryssland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts och Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent och Grenadinerna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Saudiarabien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
@@ -996,39 +940,39 @@ msgstr "Allmänt"
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychellerna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovakien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Salomonöarna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Sydafrika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
@@ -1036,11 +980,11 @@ msgstr "Utdelning"
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
@@ -1048,273 +992,218 @@ msgstr "Smeknamn"
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Sverige"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Schweiz"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Syrien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadzjikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thailand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Östtimor)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad & Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turkiet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukraina"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Förenade Arabemiraten"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Storbritannien"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "USA"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatikanen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Västsahara"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Jemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albanien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algeriet"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Österrike"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Etiopien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Grekland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Ungern"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Island"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "Indien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesien"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Nordkorea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Sydkorea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libyen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldiverna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mexiko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Myanmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "Skicka en kraschrapport"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia påträffade ett fel och behövde avslutas"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Starta om Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Starta inte om"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Kunde inte starta om Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-"Vi kunde inte starta om Vidalia automatiskt. Vänligen starta om Vidalia "
-"manuellt."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
msgstr ""
msgctxt "GeneralPage"
@@ -1334,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr "Du måste ange namnet på den körbara fil som startar Tor."
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "De angivna argumenten till proxyservern är inte korrekt formaterade."
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr "Starta Vidalia när min dator startar"
@@ -1363,15 +1256,15 @@ msgstr "Proxy Program Argument:"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Programuppdateringar"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Sök efter uppdateringar automatiskt"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Sök nu"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1391,11 +1284,11 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Mott:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Skickat:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
@@ -1523,21 +1416,15 @@ msgstr "Funna dokument"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Fel vid inläsning av hjälpinnehåll:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
msgstr "Öppnar extern länk"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-"Vidalia kan öppna länken du valde i din uppsprungliga webbrowser. Om din "
-"browser inte är konfigurerar att använda Tor så kommer inte begäran vara "
-"annonym."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidalia kan öppna länken du valde i din uppsprungliga webbrowser. Om din browser inte är konfigurerar att använda Tor så kommer inte begäran vara annonym."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1548,16 +1435,12 @@ msgid "Unable to Open Link"
msgstr "Kunde ej öppna linken"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia kunde inte öppna den valda länken i din webbrowser. Du kan "
-"fortfarande kopiera länken och klistra in det i din browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia kunde inte öppna den valda länken i din webbrowser. Du kan fortfarande kopiera länken och klistra in det i din browser."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Kunde inte öppna hjälpavsnitt:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1595,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr "Okänd"
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "Meddelande"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "Varning"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "Fel"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "Okänd"
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr "Starta Tor"
@@ -1832,12 +1691,8 @@ msgid "Error Starting Tor"
msgstr "Det gick ej att starta Tor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia kunde ej starta Tor. Kontrollera dina inställningar: stämmer namnet "
-"och sökvägen för Tors exekverbara fil?"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia kunde ej starta Tor. Kontrollera dina inställningar: stämmer namnet och sökvägen för Tors exekverbara fil?"
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1872,12 +1727,8 @@ msgid "Cookie Authentication Required"
msgstr "Cookieautentisering krävs"
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor programvaran kräver att Vidalia skickar innehållet i en verifierad "
-"cookie men Vidalia kunde ej finna någon."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor programvaran kräver att Vidalia skickar innehållet i en verifierad cookie men Vidalia kunde ej finna någon."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1896,12 +1747,8 @@ msgid "Error Registering for Events"
msgstr "Ett fel uppstod vid eventsregistrering"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-msgstr ""
-"Vidalia kunde ej registrera sig för vissa händelser. Många av Vidalias "
-"funktioner kan vara otillgängliga."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia kunde ej registrera sig för vissa händelser. Många av Vidalias funktioner kan vara otillgängliga."
msgctxt "MainWindow"
msgid "Authentication Error"
@@ -1913,32 +1760,23 @@ msgstr "Vidalia kunde ej styrka till Tor-program. (%1)"
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
-msgstr ""
-"Vänligen kontrollera dina inställningar för kontrollportsautentisering."
+msgstr "Vänligen kontrollera dina inställningar för kontrollportsautentisering."
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Toruppdatering tillgänglig"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Den installerade versionen av Tor är inte aktuell eller rekommenderas inte "
-"längre. Besök Torhemsidan för att ladda ner den senaste versionen."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Den installerade versionen av Tor är inte aktuell eller rekommenderas inte längre. Besök Torhemsidan för att ladda ner den senaste versionen."
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr "Tors hemsida: %1"
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
-msgstr ""
-"Efterföljande anslutningar kommer att framstå som olika från dina gamla "
-"anslutningar."
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Efterföljande anslutningar kommer att framstå som olika från dina gamla anslutningar."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1966,7 +1804,7 @@ msgstr "Genvägar för Vidalia"
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "Skapa Tor-router\n"
+msgstr "Skapa Tor-router"
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
@@ -1986,9 +1824,7 @@ msgstr "Använd en ny identitet"
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
-msgstr ""
-"Få efterföljande anslutningar att framstå som olika från mina gamla "
-"anslutningar"
+msgstr "Få efterföljande anslutningar att framstå som olika från mina gamla anslutningar"
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
@@ -2031,39 +1867,28 @@ msgid "Password Reset Failed"
msgstr "Lösenordsreset misslyckades"
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 försökte ställa om Tors kontrollösenord, men kunde inte starta om "
-"Tormjukvaran. Kolla i aktivitetshanteraren och säkerställ att ingen annan "
-"Torprocess körs."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia försökte ställa om Tors kontrollösenord, men kunde inte starta om Tormjukvaran. Kolla i aktivitetshanteraren och säkerställ att ingen annan Torprocess körs."
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-"Den installerade versionen av Tor är inte aktuell eller rekommenderas inte "
-"längre. Besök Torhemsidan för att ladda ner den senaste versionen."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr "Den installerade versionen av Tor är inte aktuell eller rekommenderas inte längre. Besök Torhemsidan för att ladda ner den senaste versionen."
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
-"Vill du kontrollera om ett nyare paket är tillgängligt för installation?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Potentiellt osäker anslutning"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
msgstr ""
-"Tor har automatiskt stängs din anslutning för att skydda din anonymitet."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2071,17 +1896,15 @@ msgstr "Toruppdatering tillgänglig"
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Programvaran är uppdaterad"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr "Det finns inga nya Tor-programpaket för din dator just nu."
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Installationen misslyckades"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
@@ -2089,61 +1912,55 @@ msgstr "Vidalia kunde inte avsluta Torprogrammet."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Följande fel inträffade:"
-
-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 ""
-"Allt som skickas över denna anslutning kan övervakas. Vänligen kontrollera "
-"din programkonfiguration och använd endast krypterade protokoll, t.ex. SSL, "
-"om möjligt."
msgctxt "MainWindow"
msgid "failed (%1)"
-msgstr "misslyckade (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
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"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia upptäckte att Tor programvaran avslutades oväntat.\n"
-"\n"
-"Kontrollera meddelandeloggen för nya varnings- eller felmeddelanden."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Om Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Hem"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2168,8 +1985,7 @@ msgstr "Namn för loggfilen krävs"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Vänligen skriv in ett filnamn för att spara loggmeddelanden till en fil."
+msgstr "Vänligen skriv in ett filnamn för att spara loggmeddelanden till en fil."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2388,6 +2204,10 @@ msgid "messages"
msgstr "meddelanden"
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Spara alltid nya loggmeddelanden"
+
+msgctxt "MessageLog"
msgid "Browse"
msgstr "Bläddra"
@@ -2400,66 +2220,37 @@ msgid "Automatically save new log messages to a file"
msgstr "Spara automatiskt nya loggmeddelanden till filen"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Grundläggande"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Status"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avancerat"
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Spara alltid nya loggmeddelanden"
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
+msgid "Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Meddelanden som visas när något har gått väldigt fel och Tor kan inte "
-"fortsätta."
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Meddelanden som bara visas när något har gått fel med Tor."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Meddelanden som sällan visas under normal Tor-drift och som inte anses vara "
-"fel, men som du kanske bryr dig om."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Meddelanden som ofta visas under normal Tor drift."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Övermångordiga meddelanden främst av intresse för Tor- utvecklarna."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
-"Kan inte skriva till fil %1\n"
-"\n"
-"%2."
msgctxt "NetViewer"
msgid "Tor Network Map"
@@ -2547,7 +2338,7 @@ msgstr "Filen hittades ej"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Det finns inga tillgängliga detaljer om valda routers."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
@@ -2555,11 +2346,11 @@ msgstr "Okänd"
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Helskärm"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Visa nätverkskartan i helskärmsvy"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
@@ -2578,20 +2369,12 @@ msgid "Copy (Ctrl+C)"
msgstr "Kopiera (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 ""
-"Du måste ange både en IP-adress (eller ett värddatornamn) och ett portnummer"
-" för att Tor ska kunna ansluta till Internet via en proxyserver."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Du måste ange både en IP-adress (eller ett värddatornamn) och ett portnummer för att Tor ska kunna ansluta till Internet via en proxyserver."
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
-msgstr ""
-"Du måste ange ett eller flera portnummer som din brandvägg tillåter dig att "
-"ansluta till."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Du måste ange ett eller flera portnummer som din brandvägg tillåter dig att ansluta till."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2599,8 +2382,7 @@ msgstr "'%1' är inte ett giltigt portnummer."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Se ifall ditt lokala nätverk kräver en proxy för att komma åt Internet."
+msgstr "Se ifall ditt lokala nätverk kräver en proxy för att komma åt Internet."
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2611,10 +2393,18 @@ msgid "Proxy Settings"
msgstr "Proxy-inställningar"
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP-Proxy:"
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr "Användarnamn:"
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Använd den här proxyservern även för HTTPS"
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr "Lösenord:"
@@ -2624,9 +2414,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kryssa i för att endast ansluta till noder som använder portar som är "
-"tillåtna av din brandvägg"
+msgstr "Kryssa i för att endast ansluta till noder som använder portar som är tillåtna av din brandvägg"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2645,12 +2433,8 @@ msgid "80, 443"
msgstr "80, 443"
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
-msgstr ""
-"Kryssa i för att kryptera katalogförfrågningar och för att (efter separat "
-"val) använda bryggnoder för att komma åt Tornätverket"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr "Kryssa i för att kryptera katalogförfrågningar och för att (efter separat val) använda bryggnoder för att komma åt Tornätverket"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2661,10 +2445,18 @@ msgid "Bridge Settings"
msgstr "Brygginställningar"
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Torprogramvaran du för tillfället använder stödjer inte bryggor. <br>Kataloganslutningar kommer fortfarande vara krypterade."
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr "Lägg till en brygga:"
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hur kan jag hitta en brygga?</a>"
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr "Tar bort de valda bryggorna från listan"
@@ -2674,56 +2466,23 @@ msgstr "Kopiera de valda bryggorna till urklipp"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Hitta Bryggor Nu"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Hur kan jag annars hitta bryggor?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Hur kan jag hitta bryggor?</a>"
+msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
-"Det finns inga nya bryggor tillgängliga för närvarande. Du kan antingen "
-"vänta ett tag och försöka igen eller pröva en annan metod för att hitta nya "
-"bryggor."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Klicka på Hjälp för att se andra metoder för att hitta nya bryggor."
-
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "Adress:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "Typ:"
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "Du måste välja proxytyp."
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr "HTTP"
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2791,11 +2550,11 @@ msgstr "Okänd"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Routerdetaljer"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Översikt"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2878,20 +2637,12 @@ msgid "Bridge Support Unavailable"
msgstr "Bryggstöd är inte tillgängligt"
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
-msgstr ""
-"Du har konfigurerat Tor för att agera brygga åt censurerade användare, men "
-"din version av Tor stödjer inte bryggor."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Du har konfigurerat Tor för att agera brygga åt censurerade användare, men din version av Tor stödjer inte bryggor."
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
-msgstr ""
-"Var god att uppgradera din Torprogramvara eller konfigurera den för att "
-"agera normal Tornod."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Var god att uppgradera din Torprogramvara eller konfigurera den för att agera normal Tornod."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2947,8 +2698,7 @@ msgstr "Namnet på din router"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Den port som användare och andra routrar kan kommunicera med din router på"
+msgstr "Den port som användare och andra routrar kan kommunicera med din router på"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2959,12 +2709,8 @@ msgid "Basic Settings"
msgstr "Allmänt"
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
-msgstr ""
-"Om din Internetanslutning har snabb nerladdningshastighet men långsam "
-"uppladdningshastighet, vänligen välj uppladningshastighet här."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Om din Internetanslutning har snabb nerladdningshastighet men långsam uppladdningshastighet, vänligen välj uppladningshastighet här."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -2992,8 +2738,7 @@ msgstr "Annat"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Välj det alternativ som bäst överensstämmer med din Internetanslutning"
+msgstr "Välj det alternativ som bäst överensstämmer med din Internetanslutning"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
@@ -3020,12 +2765,8 @@ msgid "Peak bandwidth rate limit"
msgstr "Maximumhastighet för begränsning av bandbredd"
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Maxvärdet för bandbreddshastigheten måste vara högre eller lika med "
-"snittvärdet för bandbreddhastigheten. Båda värdena måste vara minst 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Maxvärdet för bandbreddshastigheten måste vara högre eller lika med snittvärdet för bandbreddhastigheten. Båda värdena måste vara minst 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3084,18 +2825,12 @@ msgid "Show help topic on exit policies"
msgstr "Visa hjälpavsnitt om användningspolicyn"
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Vilka resurser på Internet ska användare kunna komma åt genom din router?"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Vilka resurser på Internet ska användare kunna komma åt genom din router?"
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
-msgstr ""
-"Tor kommer fortfarande att blockera vissa utgående mail- och "
-"fildelningsprogram för att minska spam och annat missbruk."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor kommer fortfarande att blockera vissa utgående mail- och fildelningsprogram för att minska spam och annat missbruk."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3106,10 +2841,8 @@ msgid "Let others access your bridge by giving them this line:"
msgstr "Ge andra tillgång till din brygga genom att ge dem följande textrad:"
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Det här är din bryggrouters identitet som du kan ge till andra människor"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Det här är din bryggrouters identitet som du kan ge till andra människor"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3117,19 +2850,15 @@ msgstr "Kopiera din bryggrouters identitet till urklipp"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Ingen Ny Användning"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Inga klienter har använt din router nyligen."
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
-"Lämna din router igång så att klienter får större möjlighet att hitta och "
-"använda den."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3140,60 +2869,37 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr "Vidalia kunde inte spara din %1 inställningar."
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
-"Tor returnerade ett felaktigt formaterat svar när Vidalia begärde din "
-"bryggas användningshistorik."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Det returnerade svaret var:%1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
-"Hjälp censurerade användare att använda Tornätverket (Tor 0.2.0.8-alpha "
-"eller nyare)"
+msgstr "Hjälp censurerade användare att använda Tornätverket (Tor 0.2.0.8-alpha eller nyare)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr "<a href=\"bridges.finding\">Hur kan jag hitta en brygga?</a>"
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Vad är detta?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "Distribuera min bryggadress automatiskt"
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Spegla routerkatalogen"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"E-postadress där du kan nås om det finns ett problem med din router. Du kan "
-"också inkludera ditt PGP eller GPG-fingeravtryck."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
-"Ett fel uppstod när alla tjänster skulle göras otillgängliga (Error while "
-"trying to unpublish all services)"
+msgstr "Ett fel uppstod när alla tjänster skulle göras otillgängliga (Error while trying to unpublish all services)"
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
-msgstr ""
-"Konfigurera åtminstone en aktivitetskatalog och en virtuell port för varje "
-"aktivitet du vill spara. Ta bort de andra."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Konfigurera åtminstone en aktivitetskatalog och en virtuell port för varje aktivitet du vill spara. Ta bort de andra."
msgctxt "ServicePage"
msgid "Error"
@@ -3261,260 +2967,12 @@ msgstr "Kopiera det vald onion-adress till urklipp"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Bläddra i det lokala filsystemet och välj katalog för den valda tjänsten"
+msgstr "Bläddra i det lokala filsystemet och välj katalog för den valda tjänsten"
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr "Skapad av Tor"
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "Kopiera till Urklipp"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Tor-mjukvaran är igång"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Ansluten till Tor-nätverket"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-"Vi lyckades upprätta en anslutning till Tor-nätverket. Nu kan du konfigurera"
-" dina program att använda Internet anonymt."
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr "Okänt SOCKS Protokoll"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "Ny"
@@ -3567,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr "Misslyckades med att göra kontrolllösenordet till ett hashvärde."
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "Klipp ut"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "Kopiera"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "Klistra in"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "Ångra"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "Framgång"
@@ -3686,24 +3082,16 @@ msgid "Testing Universal Plug & Play Support"
msgstr "Testar Universal Plug & Play-stöd"
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
-"Vidalia kunde inte söka efter programuppdateringar eftersom den inte kunde "
-"hitta '%1'."
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
-"Vidalia kunde inte söka efter programuppdateringar eftersom Tors "
-"uppdateringsprocess avslutades oväntat."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Söker efter tillgängliga uppdateringar ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3711,7 +3099,7 @@ msgstr "Dölj"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Hämtar uppdateringar ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
@@ -3719,7 +3107,7 @@ msgstr "Startar Torprogramvara"
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Klart! Programvaran är nu uppdaterad."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
@@ -3727,11 +3115,11 @@ msgstr "Okej"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Programuppdateringar"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Söker efter uppdateringar ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3743,15 +3131,15 @@ msgstr "Toruppdatering tillgänglig"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Påminn mig senare"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Installera"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Följande uppdaterade mjukvarupaket är redo för installation:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3854,10 +3242,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Kunde ej öppna loggfilen '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr ""
@@ -3870,8 +3254,7 @@ msgid "Invalid log level specified:"
msgstr ""
msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
@@ -3898,14 +3281,12 @@ msgstr "%1 GB/s"
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 dagar"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 timmar"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 min"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/sw/vidalia_sw.po b/src/vidalia/i18n/po/sw/vidalia_sw.po
index 257ffc6..d7e175a 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 b89c502..bff8877 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 188b0f3..65ad3df 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/templates/qt.pot b/src/vidalia/i18n/po/templates/qt.pot
index 9564c1b..ef3c5f3 100644
--- a/src/vidalia/i18n/po/templates/qt.pot
+++ b/src/vidalia/i18n/po/templates/qt.pot
@@ -1,448 +1,427 @@
-#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2008-08-20 03:25+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
"X-Generator: Vidalia ts2po 0.2\n"
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "Activate"
+msgstr ""
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr "Incompatible Qt Library Error"
+msgstr ""
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr "QT_LAYOUT_DIRECTION"
+msgstr ""
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr "Activates the program's main window"
+msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "Save"
+msgstr ""
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr "Open"
+msgstr ""
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr "Cancel"
+msgstr ""
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr "Close"
+msgstr ""
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr "Apply"
+msgstr ""
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "Reset"
+msgstr ""
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr "Help"
+msgstr ""
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "Don't Save"
+msgstr ""
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "Discard"
+msgstr ""
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "&Yes"
+msgstr ""
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr "Yes to &All"
+msgstr ""
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr "&No"
+msgstr ""
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "N&o to All"
+msgstr ""
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr "Save All"
+msgstr ""
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr "Abort"
+msgstr ""
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr "Retry"
+msgstr ""
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr "Ignore"
+msgstr ""
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr "Restore Defaults"
+msgstr ""
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr "Close without Saving"
+msgstr ""
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr "&OK"
+msgstr ""
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr "Name"
+msgstr ""
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr "Size"
+msgstr ""
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr "Kind"
+msgstr ""
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr "Type"
+msgstr ""
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr "Date Modified"
+msgstr ""
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr "All Files (*)"
+msgstr ""
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "Directories"
+msgstr ""
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr "&Open"
+msgstr ""
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr "&Save"
+msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr "Open"
+msgstr ""
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
-msgid ""
-"%1 already exists.\n"
+msgid "%1 already exists.\n"
"Do you want to replace it?"
msgstr ""
-"%1 already exists.\n"
-"Do you want to replace it?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
-msgid ""
-"%1\n"
+msgid "%1\n"
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
-"File not found.\n"
-"Please verify the correct file name was given."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "My Computer"
+msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "&Rename"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Delete"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "Show &hidden files"
+msgstr ""
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr "Back"
+msgstr ""
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr "Parent Directory"
+msgstr ""
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr "List View"
+msgstr ""
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr "Detail View"
+msgstr ""
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr "Files of type:"
+msgstr ""
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr "Directory:"
+msgstr ""
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
-msgid ""
-"%1\n"
+msgid "%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"Directory not found.\n"
-"Please verify the correct directory name was given."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
-msgid ""
-"'%1' is write protected.\n"
+msgid "'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"'%1' is write protected.\n"
-"Do you want to delete it anyway?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Are sure you want to delete '%1'?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Could not delete directory."
+msgstr ""
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr "All Files (*.*)"
+msgstr ""
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr "Save As"
+msgstr ""
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr "Drive"
+msgstr ""
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr "File"
+msgstr ""
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Find Directory"
+msgstr ""
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr "Show "
+msgstr ""
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Forward"
+msgstr ""
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr "New Folder"
+msgstr ""
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "&New Folder"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&Choose"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "Remove"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "File &name:"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Look in:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "Create New Folder"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Invalid filename"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
msgid ""
-"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
-" characters or no punctuations marks."
+"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer "
+"characters or no punctuations marks."
msgstr ""
-"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
-" characters or no punctuations marks."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr "Name"
+msgstr ""
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr "Size"
+msgstr ""
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Kind"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr "Type"
+msgstr ""
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr "Date Modified"
+msgstr ""
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr "My Computer"
+msgstr ""
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr "Computer"
+msgstr ""
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr "%1 TB"
+msgstr ""
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr "%1 bytes"
-
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/templates/vidalia.pot b/src/vidalia/i18n/po/templates/vidalia.pot
index facaed8..eb6964e 100644
--- a/src/vidalia/i18n/po/templates/vidalia.pot
+++ b/src/vidalia/i18n/po/templates/vidalia.pot
@@ -1,3995 +1,3635 @@
-#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:46+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "About Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "License"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' is not a valid IP address."
+msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"You selected 'Password' authentication, but did not specify a password."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Select Tor Configuration File"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "File Not Found"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 does not exist. Would you like to create it?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Failed to Create File"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Unable to create %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Select a Directory to Use for Tor Data"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Unable to remove Tor Service"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Unable to install Tor Service"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia was unable to install the Tor service."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Authentication:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Address:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "None"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Cookie"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Password"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Randomly Generate"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Tor Configuration File"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Select path to your configuration file"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Browse"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Data Directory"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Store data for the Tor software in the following directory"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Select the directory used to store data for the Tor software"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor Control"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Use TCP connection (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Path:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Use Unix domain socket (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Edit current torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NOTE: this will edit the currently loaded torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket path doesn't exist."
+msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
+msgid "The specified Tor configuration file location contains characters that cannot be represented in your system's current 8-bit character encoding."
msgstr ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
+msgid "The specified Tor data directory location contains characters that cannot be represented in your system's current 8-bit character encoding."
msgstr ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Warning"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "You changed torrc path, would you like to restart Tor?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Configuration File (torrc);;All Files (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Select a file to use for Tor socket path"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configure ControlPort automatically"
+msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Language"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Choose the language used in Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Style"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Choose Vidalia's interface style"
+msgstr ""
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia was unable to load the selected language translation."
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Since:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Hide Settings"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Show Settings"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor Bandwidth Usage"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Reset"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Receive Rate"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Send Rate"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Always on Top"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Style"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Changes the transparency of the Bandwidth Graph"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Opaque"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Save"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Cancel"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Starting HTTPS bridge request..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Connecting to %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Sending an HTTPS request for bridges..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Downloading a list of bridges..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Downloading Bridges"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Unable to download bridges: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Retrying bridge request..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Country"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Clients"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Clients from the following countries have used your relay since %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Bridge Usage Summary"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Client Summary"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "New"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Open"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "Building"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Failed"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Closed"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Path Empty>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Connection"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Status"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Zoom to Circuit"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Close Circuit (Del)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Close Stream (Del)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "General"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Network"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Sharing"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Services"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Appearance"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Advanced"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Help"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Error Saving Settings"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia was unable to save your %1 settings."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Error Applying Settings"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Settings"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Control socket is not connected."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Password Required"
+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 "Remember my password"
-msgstr "Remember my password"
+msgid "You will need to shut down the Tor process before Vidalia can launch a new one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+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:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Control socket is not connected."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Error sending control command. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Socket disconnected while attempting to read a line of data."
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Invalid control reply. [%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afghanistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Australia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaijan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Belarus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgium"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnia & Herzegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brazil"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgaria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Cambodia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Cameroon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Canada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Cape Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Central African Republic"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Chad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Chile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "China"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Colombia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comoros"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, The Democratic Republic of the"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Cote d’Ivoire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Croatia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Cuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Cyprus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Czech Republic"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Denmark"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibouti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominican Republic"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egypt"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "France"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Germany"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haiti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Latvia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Lebanon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lithuania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxembourg"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Macedonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagascar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malaysia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Marshall Islands"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauritius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Micronesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldova"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Morocco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambique"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Netherlands"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "New Zealand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norway"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestine"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Philippines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Poland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Romania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Russia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts & Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent & the Grenadines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovakia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Solomon Islands"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "South Africa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Spain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Suriname"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Sweden"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Switzerland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Syria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thailand"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (East Timor)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad & Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turkey"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukraine"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "United Arab Emirates"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "United Kingdom"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "United States"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatican"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Western Sahara"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Austria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Greece"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Hungary"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Iceland"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Iraq"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Ireland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Korea, North"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Korea, South"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldives"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mexico"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Myanmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Submit a Crash Report"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia encountered an error and needed to close"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Restart Vidalia"
+msgid "A crash report has been created that you can automatically send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information, but your connection to the crash reporting server may not be anonymous."
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Don't Restart"
+msgid "Please also describe what you were doing before the application crashed (optional):"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Unable to restart Vidalia"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+msgid "Restart Vidalia"
msgstr ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Please fill a ticket in:"
+msgid "Don't Restart"
+msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgid "Unable to restart Vidalia"
msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+msgid "We were unable to automatically restart Vidalia. Please restart Vidalia manually."
msgstr ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Executables (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Select Path to Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Select Proxy Executable"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "You must specify the name of your Tor executable."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Start Vidalia when my system starts"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Browse"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Start the Tor software when Vidalia starts"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Proxy Application (optional)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Start a proxy application when Tor starts"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Proxy Application Arguments:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Software Updates"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Check for new software updates automatically"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Check Now"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Recv:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Sent:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Supplied XML file is not a valid Contents document."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "Search reached end of document"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "Search reached start of document"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Text not found in document"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Found %1 results"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Vidalia Help"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Back"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Move to previous page (Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Forward"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Move to next page (Shift+Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Home"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Move to the Home page (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Find"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Close"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Close Vidalia Help"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Find:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Find Previous"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Find Next"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Case sensitive"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Whole words only"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Help Topics"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Contents"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Search"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Searching for:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Found Documents"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Error Loading Help Contents:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Opening External Link"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Unable to Open Link"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Error opening help file:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "License Information"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "License"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Credits"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Notice"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Warning"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Notice"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Warning"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Start Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Exit"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Bandwidth Graph"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Message Log"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Network Map"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Control Panel"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Settings"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "About"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Help"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "New Identity"
-
-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"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "View"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Help"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Error starting web browser"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia was unable to start the configured web browser"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Error starting IM client"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia was unable to start the configured IM client"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Error starting proxy server"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia was unable to start the configured proxy server"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Connecting to a relay directory"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Establishing an encrypted directory connection"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Retrieving network status"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Loading network status"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Loading authority certificates"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Requesting relay information"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Loading relay information"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Connecting to the Tor network"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Establishing a Tor circuit"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Connected to the Tor network!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Unrecognized startup status"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "miscellaneous"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "identity mismatch"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "done"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "connection refused"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "connection timeout"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "read/write error"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "no route to host"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "insufficient resources"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "unknown"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor is not running"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor is shutting down"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Stop Tor Now"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Stop Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Starting the Tor software"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Starting Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Error Starting Tor"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Connecting to Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Connection Error"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Relaying is Enabled"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Error Shutting Down"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia was unable to stop the Tor software."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Unexpected Error"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Authenticating to Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie Authentication Required"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Data Directory"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Control Cookie (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Error Registering for Events"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
msgstr ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Authentication Error"
msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia was unable to authenticate to the Tor software. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Please check your control port authentication settings."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Tor Update Available"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor website: %1"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
-"All subsequent connections will appear to be different than your old "
-"connections."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Failed to Create New Identity"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Port Forwarding Failed"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia Control Panel"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Status"
+msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Shortcuts"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Setup Relaying"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Set up a relay and help the network grow"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "View the Network"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "View a map of the Tor network"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Use a New Identity"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Make subsequent connections appear new"
+msgid "Password Reset Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "View recent bandwidth usage"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "View log message history"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "View help documentation"
+msgid "Potentially Unsafe Connection"
+msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configure Vidalia"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "View version and license information"
+msgid "Update Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Exit Vidalia"
+msgid "Your software is up to date"
+msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Show this window on startup"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Hide"
+msgid "Installation Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Hide this window"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr "Password Reset Failed"
+msgid "The following error occurred:"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2."
msgstr ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
msgstr ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
-"Would you like to check if a newer package is available for installation?"
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr "Potentially Unsafe Connection"
+msgid "Start"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr "Update Failed"
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
-msgstr "Your software is up to date"
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
-"There are no new Tor software packages available for your computer at this "
-"time."
msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia was unable to install your software updates."
+msgid "You are currently running a relay. Terminating your relay 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 "The following error occurred:"
-msgstr "The following error occurred:"
+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 ""
-"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 "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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
msgctxt "MainWindow"
msgid "failed (%1)"
-msgstr "failed (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
msgstr ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc from %1 to %2"
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably Telnet,"
msgstr ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid ", probably an email client,"
msgstr ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(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)"
-msgstr "(probably an email client)"
+msgid "Error reloading configuration"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "Error Setting Filter"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia was unable to register for Tor's log events."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Error Opening Log File"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia was unable to open the specified log file."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Log Filename Required"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "You must enter a filename to be able to save log messages to a file."
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Select Log File"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Save Log Messages"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Text Files (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Find in Message Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Find:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Not Found"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "Search found 0 matches."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Message Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Message Filters..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Set message filters"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "History Size..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Set maximum number of messages to display"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Clear"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Clear all messages from the Message Log (Ctrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Copy"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Select All"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Select all messages (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Save All"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Save all messages to a file"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Save Selected"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Save selected messages to a file"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Settings"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Adjust Message Log Settings"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Help"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Show the help browser"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Close"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Close the Message Log"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Find"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Find all messages containing the search text (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Time"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Type"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Message"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Saves the current Message Log settings"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Save Settings"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Cancels changes made to settings"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Cancel"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Message Filter"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Warning"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Notice"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Message Log History"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Number of messages to display in the message log window"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "messages"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Browse"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "Enable automatically saving all new log messages to a file"
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Automatically save new log messages to a file"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Basic"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Status"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Advanced"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Always Save New Log Messages"
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
+msgid "Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Messages that appear infrequently \n"
-"during normal Tor operation and are \n"
-"not considered errors, but you may \n"
-"care about."
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
-"Cannot write file %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Network Map"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Refresh"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Refresh the list of Tor relays and connections"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Help"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Show the network map help"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Show network map help"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Close"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Close the network map"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Zoom In"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Zoom in on the network map"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Zoom Out"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Zoom out on the network map"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Zoom To Fit"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Zooms to fit all currently displayed circuits"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Relay Not Found"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "No details on the selected relay are available."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Full Screen"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "View the network map as a full screen window"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "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 "Invalid Bridge"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "The specified bridge identifier is not valid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Copy (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' is not a valid port number."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "Check if your local network requires a proxy to access the Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "I use a proxy to access the Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Proxy Settings"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Username:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Password:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "My firewall only lets me connect to certain ports"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Firewall Settings"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Allowed Ports:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "My ISP blocks connections to the Tor network"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Bridge Settings"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Add a Bridge:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Remove the selected bridges from the list"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Copy the selected bridges to the clipboard"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Find Bridges Now"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Click Help to see other methods of finding new bridges."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Address:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Type:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "You must select the proxy type."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "accept"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "reject"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Hibernating"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Location:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP Address:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Platform:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Bandwidth:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Uptime:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Last Updated:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Copy"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Hibernating"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Unknown"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Relay Details"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Summary"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Name:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Status:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Location:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "IP Address:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Platform:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Bandwidth:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Uptime:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Contact:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Last Updated:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descriptor"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Hibernating"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zoom to Relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 relays online"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Copy"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Nickname"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Fingerprint"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Bridge Support Unavailable"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Your bridge relay is not running."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "You must specify at least a relay nickname and port."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Run as a client only"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Relay traffic for the Tor network"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Relay Port:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Enable to mirror the relay directory"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Attempt to automatically configure port forwarding"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Show help topic on port forwarding"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Directory Port:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Directory Port Number"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Contact Info:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Name of your relay"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr "Port on which users and other relays can communicate with your relay"
+msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Nickname:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Basic Settings"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Custom"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Select the entry that most closely resembles your Internet connection"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Show help topic on bandwidth rate limits"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Average Rate"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Long-term average bandwidth limit"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Maximum Rate"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Peak bandwidth rate limit"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Bandwidth Limits"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Ports 6660 - 6669 and 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Ports 110, 143, 993 and 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Retrieve Mail (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Ports unspecified by other checkboxes"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Misc Other Services"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Instant Messaging (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Port 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Secure Websites (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Port 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Websites"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Show help topic on exit policies"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
-"What Internet resources should users be able to access from your relay?"
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "Exit Policies"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Let others access your bridge by giving them this line:"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
-"This is the identity of your bridge relay that you can give to other people"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Copy your bridge relay's identity to the clipboard"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "No Recent Usage"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "No clients have used your relay recently."
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Bridge History"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia was unable to retrieve your bridge's usage history."
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "The returned response was: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Help censored users reach the Tor network"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">What's this?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "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 the Relay Directory"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"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."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Error while trying to unpublish all services"
+msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Please select a Service."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Select Service Directory"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Target may only contain address:port, address, or port."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Directory already in use by another service."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Form"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Provided Hidden Services"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Onion Address"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Virtual Port"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Target"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Directory Path"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Enabled"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Add new service to list"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Remove selected service from list"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Copy onion address of selected service to clipboard"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "Browse in local file system and choose directory for selected service"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Created by Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Copy to Clipboard"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "The Tor Software is Running"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "You are currently running version \"%1\" of the Tor software."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "The Tor Software is not Running"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
+msgid "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor software. If Tor exited unexpectedly, select the \"Advanced\" tab above for details about any errors encountered."
msgstr ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
+msgid "You are currently running version \"%1\" of the Tor software, which is no longer recommended. Please upgrade to the most recent version of the software, which may contain important security, reliability and performance fixes."
msgstr ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
+msgid "You are currently running version \"%1\" of the Tor software, which may no longer work with the current Tor network. Please upgrade to the most recent version of the software, which may contain important security, reliability and performance fixes."
msgstr ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Your Tor Software is Out-of-date"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Connected to the Tor Network"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
+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 were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Tor Software Error"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
+msgid "The Tor software encountered an internal bug. Please report the following error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
+msgid "Tor has determined that your computer's clock may be set to %1 seconds in the past compared to the source \"%2\". If your clock is not correct, Tor will not be able to function. Please verify your computer displays the correct time."
msgstr ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
+msgid "Tor has determined that your computer's clock may be set to %1 seconds in the future compared to the source \"%2\". If your clock is not correct, Tor will not be able to function. Please verify your computer displays the correct time."
msgstr ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Your Computer's Clock is Potentially Incorrect"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
+msgid "One of the applications on your computer may have attempted to make an unencrypted connection through Tor to port %1. Sending unencrypted information over the Tor network is dangerous and not recommended. For your protection, Tor has automatically closed this connection."
msgstr ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
+msgid "One of the applications on your computer may have attempted to make an unencrypted connection through Tor to port %1. Sending unencrypted information over the Tor network is dangerous and not recommended."
msgstr ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potentially Dangerous Connection!"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
+msgid "One of your applications established a connection through Tor to \"%1\" using a protocol that may leak information about your destination. Please ensure you configure your applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Unknown SOCKS Protocol"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
+msgid "One of your applications tried to establish a connection through Tor using a protocol that Tor does not understand. Please ensure you configure your applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Invalid Destination Hostname"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
+msgid "One of your applications tried to establish a connection through Tor to \"%1\", which Tor does not recognize as a valid hostname. Please check your application's configuration."
msgstr ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "External IP Address Changed"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
+msgid "Tor has determined your relay's public IP address is currently %1%2. If that is not correct, please consider setting the 'Address' option in your relay's configuration."
msgstr ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS Hijacking Detected"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
+msgid "Tor detected that your DNS provider is providing false responses for domains that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are known to do this in order to display their own search or advertising pages."
msgstr ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
+msgid "Tor detected that your DNS provider is providing false responses for well known domains. Since clients rely on Tor network relays to provide accurate DNS repsonses, your relay will not be configured as an exit relay."
msgstr ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Checking Server Port Reachability"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
+msgid "Tor is trying to determine if your relay's server port is reachable from the Tor network by connecting to itself at %1:%2. This test could take several minutes."
msgstr ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Server Port Reachability Test Successful!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Your relay's server port is reachable from the Tor network!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Server Port Reachability Test Failed"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
+msgid "Your relay's server port is not reachable by other Tor clients. This can happen if you are behind a router or firewall that requires you to set up port forwarding. If %1:%2 is not your correct IP address and server port, please check your relay's configuration."
msgstr ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Checking Directory Port Reachability"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
+msgid "Tor is trying to determine if your relay's directory port is reachable from the Tor network by connecting to itself at %1:%2. This test could take several minutes."
msgstr ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Directory Port Reachability Test Successful!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Your relay's directory port is reachable from the Tor network!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Directory Port Reachability Test Failed"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
+msgid "Your relay's directory port is not reachable by other Tor clients. This can happen if you are behind a router or firewall that requires you to set up port forwarding. If %1:%2 is not your correct IP address and directory port, please check your relay's configuration."
msgstr ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Relay Descriptor Rejected"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
+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 ""
-"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"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Your Relay is Online"
+msgstr ""
msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
+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 ""
-"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!"
msgctxt "Stream"
msgid "New"
-msgstr "New"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Resolving"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Connecting"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Open"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Failed"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Closed"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Retrying"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Remapped"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "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 "Process %1 failed to stop. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "The Tor service is not installed."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Unable to start the Tor service."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Failed to hash the control password."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Editing torrc"
+msgstr ""
msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
+msgid "Save settings. If unchecked it will only apply settings to the current Tor instance."
msgstr ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Cut"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Copy"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Paste"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Undo"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Redo"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Select All"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Apply all"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Apply selection only"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Error connecting to Tor"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Selection is empty. Please select some text, or check \"Apply all\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Error at line %1: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "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 "Success"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "No UPnP-enabled devices found"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup failed"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Failed to add a port mapping"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Failed to retrieve a port mapping"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Failed to remove a port mapping"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Unknown error"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Discovering UPnP-enabled devices"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Updating directory port mapping"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Updating relay port mapping"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Test completed successfully!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Testing UPnP Support"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Testing Universal Plug & Play Support"
+msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Checking for available updates..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Hide"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Downloading updates..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Installing updated software..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Done! Your software is now up to date."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Software Updates"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Checking for updates..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Cancel"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Software Updates Available"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Remind Me Later"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Install"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "The following updated software packages are ready for installation:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Package"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Version"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Cancel"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Yes"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "No"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Help"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Retry"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Show Log"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Show Settings"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Continue"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Quit"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Browse"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Invalid Argument"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia is already running"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Displays this usage message and exits."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Resets ALL stored Vidalia settings."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Sets the directory Vidalia uses for data files."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Sets the name and location of Vidalia's pidfile."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Sets the name and location of Vidalia's logfile."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Sets the verbosity of Vidalia's logging."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Sets Vidalia's interface style."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Sets Vidalia's language."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Vidalia Usage Information"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Unable to open log file '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Value required for parameter :"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Invalid language code specified:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Invalid GUI style specified:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Invalid log level specified:"
+msgstr ""
msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
-"\n"
-"Would you like to continue starting Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 secs"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 B/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 MB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 GB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 days"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 hours"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 mins"
-
+msgstr ""
diff --git a/src/vidalia/i18n/po/tg/vidalia_tg.po b/src/vidalia/i18n/po/tg/vidalia_tg.po
index 9fa44e6..041d2e1 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 7762017..26c9c8b 100644
--- a/src/vidalia/i18n/po/th/vidalia_th.po
+++ b/src/vidalia/i18n/po/th/vidalia_th.po
@@ -1,11 +1,12 @@
#
+# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -114,8 +115,7 @@ msgstr "ไฟล์ตั้งค่าการทำงานของโป
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
-"เริ่มการทำงานโปรแกรม Tor ด้วยไฟล์ตั้งค่าการทำงานของโปรแกรม(torrc)ที่ระบุ"
+msgstr "เริ่มการทำงานโปรแกรม Tor ด้วยไฟล์ตั้งค่าการทำงานของโปรแกรม(torrc)ที่ระบุ"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
@@ -233,10 +233,6 @@ msgid "Show Settings"
msgstr "แสดง ส่วนตั้งค่า"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "การใช้ Bandwidth ของ Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "ล้างทิ้ง"
@@ -276,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ยกเลิก"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -429,17 +429,26 @@ msgid "Control socket is not connected."
msgstr "ไม่ได้เชื่อมต่อกับ socket ควบคุม"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "กรุณาใส่รหัสผ่าน"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "จดจำรหัสผ่าน"
+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 ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1335,10 +1344,6 @@ msgid "Browse"
msgstr "เลือก"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "เริ่มการทำงาน Tor ด้วยเมื่อ Vidalia เริ่มทำงาน"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1366,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1527,16 +1536,11 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia จะเปิดเนื้อหาบนอินเตอร์เน็ตที่คุณเลือก "
-"ด้วยโปรแกรมท่องอินเตอร์เน็ตที่คุณใช้ประจำ(default Web browser). "
-"ถ้าคุณยังไม่ได้ตั้งค่าโปรแกรมท่องอินเตอร์เน็ตที่คุณใช้ประจำให้ท่องอินเตอร์เน็ตผ่าน"
-" Tor แล้ว, การทำงานนี้จะไม่ซ่อนตัวตนให้คุณ"
+msgstr "Vidalia จะเปิดเนื้อหาบนอินเตอร์เน็ตที่คุณเลือก ด้วยโปรแกรมท่องอินเตอร์เน็ตที่คุณใช้ประจำ(default Web browser). ถ้าคุณยังไม่ได้ตั้งค่าโปรแกรมท่องอินเตอร์เน็ตที่คุณใช้ประจำให้ท่องอินเตอร์เน็ตผ่าน Tor แล้ว, การทำงานนี้จะไม่ซ่อนตัวตนให้คุณ"
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-"คุณยังต้องการให้ Vidalia เปิดเนื้อหาด้วยโปรแกรมท่องอินเตอร์เน็ตของคุณหรือไม่"
+msgstr "คุณยังต้องการให้ Vidalia เปิดเนื้อหาด้วยโปรแกรมท่องอินเตอร์เน็ตของคุณหรือไม่"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
@@ -1546,9 +1550,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia ไม่สามารถเปิดเนื้อหาที่คุณเืลือในโปรแกรมท่องอินเตอร์เน็ตของคุณได้. "
-"กรุณาคัดลอก URL เพื่อไปเรียกใช้งานโปรแกรมท่องอินเตอร์เน็ตด้วยตนเอง"
+msgstr "Vidalia ไม่สามารถเปิดเนื้อหาที่คุณเืลือในโปรแกรมท่องอินเตอร์เน็ตของคุณได้. กรุณาคัดลอก URL เพื่อไปเรียกใช้งานโปรแกรมท่องอินเตอร์เน็ตด้วยตนเอง"
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1655,34 +1657,6 @@ 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"
@@ -1691,10 +1665,6 @@ msgid "View"
msgstr "มองดู"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "ส่วนช่วยเหลือ Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "ผิดพลาดในการสั่งเริ่มโปรแกรมท่องอินเตอร์เน็ต(web browser)"
@@ -1807,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr "กำลังปิดการทำงาน Tor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "หยุด Tor เดี๋ยวนี้"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "หยุด Tor"
@@ -1830,10 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia ไม่สามารถเริ่มการทำงาน Tor ได้. "
-"กรุณาตรวจสอบการตั้งค่าระบุถึงที่อยู่ของโปรแกรม Tor ในเครื่องของคุณ "
-"ว่าถูกต้องหรือไม่."
+msgstr "Vidalia ไม่สามารถเริ่มการทำงาน Tor ได้. กรุณาตรวจสอบการตั้งค่าระบุถึงที่อยู่ของโปรแกรม Tor ในเครื่องของคุณ ว่าถูกต้องหรือไม่."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1871,8 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"โปรแกรม Tor ต้องการให้ Vidalia ส่ง Cookie เพื่อขอสิทธิ, แต่ Vidalia หาไม่พบ."
+msgstr "โปรแกรม Tor ต้องการให้ Vidalia ส่ง Cookie เพื่อขอสิทธิ, แต่ Vidalia หาไม่พบ."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1894,21 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia ไม่สามารถลงทะเบียนเพื่อรับ event บางอย่างได้. "
-"ทำให้ความสามารถหลายๆอย่างของ 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 ควบคุมของคุณ"
+msgstr "Vidalia ไม่สามารถลงทะเบียนเพื่อรับ event บางอย่างได้. ทำให้ความสามารถหลายๆอย่างของ Vidalia อาจไม่สามารถใช้งานได้"
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1918,9 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"โปรแกรม Tor รุ่นที่ใช้อยู่ปัจจุบัน ตกรุ่น หรือ ไม่แนะนำให้ใช้แล้ว. "
-"กรุณาไปที่ website ของ Tor เพื่อดาวน์โหลด Tor รุ่นใหม่ล่าสุด"
+msgstr "โปรแกรม Tor รุ่นที่ใช้อยู่ปัจจุบัน ตกรุ่น หรือ ไม่แนะนำให้ใช้แล้ว. กรุณาไปที่ website ของ Tor เพื่อดาวน์โหลด Tor รุ่นใหม่ล่าสุด"
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1953,85 +1899,11 @@ 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 ""
@@ -2091,13 +1963,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2115,6 +2005,16 @@ 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 ""
@@ -2122,6 +2022,20 @@ 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 "ผิดพลาด ในการตั้งค่าตัวกรอง"
@@ -2375,22 +2289,14 @@ msgid "Automatically save new log messages to a file"
msgstr "จัดเก็บ ข้อความสิ่งที่เพิ่งทำไปใหม่ๆ ลงไฟล์โดยอัตโนมัติ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2430,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "แผนที่เครือข่าย Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "แสดงใหม่"
@@ -2533,6 +2435,22 @@ 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 ไม่ถูกต้อง "
@@ -2549,17 +2467,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"คุณต้องระบุทั้ง เลข IP หรือ ชื่อเครื่องบนอินเตอร์เน็ต และ เลข port ของ proxy"
-" เพื่อตั้งค่าให้โปรแกรม Tor ใช้งาน proxy ได้ถูกต้อง"
+msgstr "คุณต้องระบุทั้ง เลข IP หรือ ชื่อเครื่องบนอินเตอร์เน็ต และ เลข port ของ proxy เพื่อตั้งค่าให้โปรแกรม Tor ใช้งาน proxy ได้ถูกต้อง"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"คุณจะต้องบอกเลข port ที่ firewall ยินยอมให้คุณติดต่อภายนอกได้. ถ้ามีหลายเลข "
-"port ให้คั่นด้วย เครื่องหมายลูกน้ำ(,)"
+msgstr "คุณจะต้องบอกเลข port ที่ firewall ยินยอมให้คุณติดต่อภายนอกได้. ถ้ามีหลายเลข port ให้คั่นด้วย เครื่องหมายลูกน้ำ(,)"
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2613,9 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"กรุณาเลือก เพื่อเพิ่มการเข้ารหัสการร้องขอเข้าสู่เครือข่าย Tor, โดยจะระุบุเลข"
-" IP และ Port ของ Bridge ด้วยก็ได้"
+msgstr "กรุณาเลือก เพื่อเพิ่มการเข้ารหัสการร้องขอเข้าสู่เครือข่าย Tor, โดยจะระุบุเลข IP และ Port ของ Bridge ด้วยก็ได้"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2623,9 +2535,7 @@ msgstr "ผู้ให้บริการอินเตอร์เน็ต
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr ""
-"ตั้งค่า Bridge (เครื่องที่จะส่งผ่านข้อมูลในการเข้าถึงเครือข่าย Tor "
-"ให้กับเรา)"
+msgstr "ตั้งค่า Bridge (เครื่องที่จะส่งผ่านข้อมูลในการเข้าถึงเครือข่าย Tor ให้กับเรา)"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
@@ -2839,26 +2749,19 @@ msgstr "ลายนิ้วมือ"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr ""
-"ไม่สนับสนุน การทำงานแบบ Bridge "
-"(ส่งผ่านข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย Tor ให้ผู้อื่น)"
+msgstr "ไม่สนับสนุน การทำงานแบบ Bridge (ส่งผ่านข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย Tor ให้ผู้อื่น)"
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"คุณตั้งค่า Tor ให้เป็น bridge relay "
-"(ช่วยส่งผ่านข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย Tor "
-"ให้กับผู้ใช้งานที่ถูกปิดกั้นการเข้าถึงเครือข่าย Tor โดยตรง) แต่ Tor "
-"รุ่นที่คุณใช้อยู่ไม่สนับสนุนการทำงานนี้"
+msgstr "คุณตั้งค่า Tor ให้เป็น bridge relay (ช่วยส่งผ่านข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย Tor ให้กับผู้ใช้งานที่ถูกปิดกั้นการเข้าถึงเครือข่าย Tor โดยตรง) แต่ Tor รุ่นที่คุณใช้อยู่ไม่สนับสนุนการทำงานนี้"
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"กรุณาติดตั้ง Tor รุ่นที่ใหม่กว่า หรือ ตั้งค่าให้เป็น Tor relay แบบปกติ"
+msgstr "กรุณาติดตั้ง Tor รุ่นที่ใหม่กว่า หรือ ตั้งค่าให้เป็น Tor relay แบบปกติ"
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2866,25 +2769,19 @@ msgstr "เครื่องของคุณ ไม่ได้ทำงา
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr ""
-"คุณต้องระบุชื่อเรียกของ relay ที่จะทำงานบนเครื่องของคุณ และเลข port ที่จะใช้"
+msgstr "คุณต้องระบุชื่อเรียกของ relay ที่จะทำงานบนเครื่องของคุณ และเลข port ที่จะใช้"
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr "เป็นตัวลูก (ใช้งานอย่างเดียว)"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "เป็น Tor Relay (ช่วยส่งผ่านข้อมูลต่างๆให้เครือข่าย Tor ด้วย)"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "เลข Port Relay:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr ""
-"ยอมให้เก็บสำเนา คลังรายชื่อของ relay (relay directory) ไว้ในเครื่องด้วย"
+msgstr "ยอมให้เก็บสำเนา คลังรายชื่อของ relay (relay directory) ไว้ในเครื่องด้วย"
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
@@ -2916,9 +2813,7 @@ msgstr "ชื่อ relay ที่จะตั้ง"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"เลข port ที่จะให้ relay ทำงานส่งผ่านข้อมูลระหว่างผู้ใช้คนอื่นๆ และ relay "
-"เครื่องอื่นๆ"
+msgstr "เลข port ที่จะให้ relay ทำงานส่งผ่านข้อมูลระหว่างผู้ใช้คนอื่นๆ และ relay เครื่องอื่นๆ"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2932,9 +2827,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"สำหรับการเชื่อมต่ออินเตอร์เน็ตที่ รับข้อมูลได้เร็วแต่ส่งข้อมูลได้ช้า "
-"กรุณาเลือกตามความเร็วในการส่งข้อมูล"
+msgstr "สำหรับการเชื่อมต่ออินเตอร์เน็ตที่ รับข้อมูลได้เร็วแต่ส่งข้อมูลได้ช้า กรุณาเลือกตามความเร็วในการส่งข้อมูล"
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -2992,9 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"ระดับ bandwidth สูงสุดของคุณ จะต้องมากกว่า หรือ เท่ากับ ระดับ bandwidth "
-"เฉลี่ย, แต่ไม่น้อยกว่า 20 KB ต่อวินาที."
+msgstr "ระดับ bandwidth สูงสุดของคุณ จะต้องมากกว่า หรือ เท่ากับ ระดับ bandwidth เฉลี่ย, แต่ไม่น้อยกว่า 20 KB ต่อวินาที."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3055,17 +2946,13 @@ msgstr "แสดงส่วนช่วยเหลือ หัวข้อ
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"ประเภทบริการที่คุณจะยินยอมให้ ผู้ใช้งาน Tor คนอื่นๆ ใช้งานผ่านเครื่องคุณ"
+msgstr "ประเภทบริการที่คุณจะยินยอมให้ ผู้ใช้งาน Tor คนอื่นๆ ใช้งานผ่านเครื่องคุณ"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"โดยปกติ ระบบ Tor มีการปิดกั้นการทำงานของบางโปรแกรมที่เกี่ยวกับการส่ง E-mail "
-"และการส่งไฟล์ เพื่อลดปัญหาการใช้ระบบ Tor เป็นทางผ่านในการ ส่งเมล์ขยะ(spam) "
-"และ รบกวนผู้อื่น(abuse)"
+msgstr "โดยปกติ ระบบ Tor มีการปิดกั้นการทำงานของบางโปรแกรมที่เกี่ยวกับการส่ง E-mail และการส่งไฟล์ เพื่อลดปัญหาการใช้ระบบ Tor เป็นทางผ่านในการ ส่งเมล์ขยะ(spam) และ รบกวนผู้อื่น(abuse)"
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3078,9 +2965,7 @@ msgstr "ให้ผู้อื่นเข้าถึง Bridge บนเค
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"นี่เป็นรหัสระบุถึงเครื่องของคุณที่ทำงานเป็น Bridge "
-"ซึ่งคุณสามารถส่งให้ผู้อื่นได้"
+msgstr "นี่เป็นรหัสระบุถึงเครื่องของคุณที่ทำงานเป็น Bridge ซึ่งคุณสามารถส่งให้ผู้อื่นได้"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3135,6 +3020,14 @@ 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 ""
@@ -3152,9 +3045,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"กรุณาตั้งค่า ระบุที่จัดเก็บรายละเอียดการให้บริการ และระบุเลข port "
-"เสมือน(virtual port) อย่างน้อยหนึ่ง port. ลบสิ่งที่ไม่เกี่ยวข้องออกให้หมด"
+msgstr "กรุณาตั้งค่า ระบุที่จัดเก็บรายละเอียดการให้บริการ และระบุเลข port เสมือน(virtual port) อย่างน้อยหนึ่ง port. ลบสิ่งที่ไม่เกี่ยวข้องออกให้หมด"
msgctxt "ServicePage"
msgid "Error"
@@ -3174,18 +3065,13 @@ msgstr "เลข port เสมือน (Virtual Port) จะต้องเ
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr ""
-"เป้าหมายในการส่งต่อการทำงาน จะต้องอยู่ในรูป address:port, address หรือ port."
+msgstr "เป้าหมายในการส่งต่อการทำงาน จะต้องอยู่ในรูป address:port, address หรือ port."
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr "ที่จัดเก็บนี้มีบริการอื่นใช้อยู่แล้ว"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "แบบฟอร์ม"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "การให้บริการแบบซ่อนตัวตน"
@@ -3474,6 +3360,22 @@ 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 "สร้างใหม่"
@@ -3510,6 +3412,12 @@ 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]"
@@ -3588,6 +3496,30 @@ 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 "สำเร็จ"
@@ -3866,5 +3798,3 @@ 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 eaa7645..6528cb1 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 797c107..4c3059b 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:43+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/tr/qt_tr.po b/src/vidalia/i18n/po/tr/qt_tr.po
index 7ca2144..1a4d18e 100644
--- a/src/vidalia/i18n/po/tr/qt_tr.po
+++ b/src/vidalia/i18n/po/tr/qt_tr.po
@@ -1,12 +1,10 @@
#
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -444,5 +442,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 bayt"
-
-
diff --git a/src/vidalia/i18n/po/tr/vidalia_tr.po b/src/vidalia/i18n/po/tr/vidalia_tr.po
index 6561bdb..764dd12 100644
--- a/src/vidalia/i18n/po/tr/vidalia_tr.po
+++ b/src/vidalia/i18n/po/tr/vidalia_tr.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-09-08 00:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -194,18 +194,11 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia Tor servisini kaldıramıyor.\n"
-"\n"
-"Kendiniz kaldırmayı deneyebilirsiniz."
+msgstr "Vidalia Tor servisini kaldıramıyor.\n\nKendiniz kaldırmayı deneyebilirsiniz."
msgctxt "AppearancePage"
msgid "Language"
@@ -240,10 +233,6 @@ 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"
@@ -283,6 +272,10 @@ 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..."
@@ -436,20 +429,27 @@ msgid "Control socket is not connected."
msgstr "Kontrol soketi bağlı değil."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Parola Gerekiyor"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Parolamı Hatırla"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
-"Vidalia parola gerektiren bir Tor sürecine bağlandı. Lütfen kontrol "
-"parolasını giriniz:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1272,44 +1272,51 @@ msgid "Vidalia encountered an error and needed to close"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+msgid "Send my crash report to the Vidalia developers"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+msgid "Restart Vidalia"
msgstr ""
msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
+msgid "Don't Restart"
msgstr ""
msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgid "Unable to restart Vidalia"
msgstr ""
msgctxt "CrashReportDialog"
msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
+"We were unable to automatically restart Vidalia. Please restart Vidalia "
+"manually."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
+
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
msgctxt "GeneralPage"
@@ -1337,10 +1344,6 @@ 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"
@@ -1368,6 +1371,10 @@ 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"
@@ -1529,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidali seçmiş olduğunuz adresi web gezgininizde açabiliyor. Eğer web "
-"gezgininiz henüz ayarlanmamıışsa isteğiniz Tor üzerinden "
-"gerçekleşmeyecektir."
+msgstr "Vidali seçmiş olduğunuz adresi web gezgininizde açabiliyor. Eğer web gezgininiz henüz ayarlanmamıışsa isteğiniz Tor üzerinden gerçekleşmeyecektir."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1546,9 +1550,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia seçtiğiniz bağlantıyı web gezgininizde açamıyor. Adresi web "
-"gezgininize kopyalayıp devam edebilirsiniz."
+msgstr "Vidalia seçtiğiniz bağlantıyı web gezgininizde açamıyor. Adresi web gezgininize kopyalayıp devam edebilirsiniz."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1655,34 +1657,6 @@ 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"
@@ -1691,10 +1665,6 @@ 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"
@@ -1807,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr "Kapatılıyor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Durdur"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Durdur"
@@ -1830,8 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia Tor'u başlatamıyor.Ayarlardan belirlediğiniz konumu kontrol ediniz."
+msgstr "Vidalia Tor'u başlatamıyor.Ayarlardan belirlediğiniz konumu kontrol ediniz."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1869,9 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Tor yazılımı kimlik doprulama çerezlerinin içerini vidaliaya göndermesi "
-"gerekiyor, ama çerez bulamıyor."
+msgstr "Tor yazılımı kimlik doprulama çerezlerinin içerini vidaliaya göndermesi gerekiyor, ama çerez bulamıyor."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1893,21 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia bazı olayarın kaydını gerçekleştiremedi.Şu anda bir çok vidalia "
-"fonksiyonu çalışmıyor olabilir."
-
-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."
+msgstr "Vidalia bazı olayarın kaydını gerçekleştiremedi.Şu anda bir çok vidalia fonksiyonu çalışmıyor olabilir."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1917,9 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Tor şu anda kullanmış olduğunuz sürümü tavsiye etmiyor.Lütfen Tor'un "
-"websitesini ziyaret edip en son sürümünü indirin."
+msgstr "Tor şu anda kullanmış olduğunuz sürümü tavsiye etmiyor.Lütfen Tor'un websitesini ziyaret edip en son sürümünü indirin."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1929,8 +1876,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Tüm alt bağlantılarınız önceki bağlantılarınızdan farklı gözükecektir."
+msgstr "Tüm alt bağlantılarınız önceki bağlantılarınızdan farklı gözükecektir."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1953,90 +1899,14 @@ 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 ""
-"Tor şu anda kullanmış olduğunuz versiyonu tavsyie etmiyor.Lütfen Tor'un "
-"websitesini ziyaret edip en son sürümünü indirin."
+msgstr "Tor şu anda kullanmış olduğunuz versiyonu tavsyie etmiyor.Lütfen Tor'un websitesini ziyaret edip en son sürümünü indirin."
msgctxt "MainWindow"
msgid ""
@@ -2051,8 +1921,7 @@ msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr ""
-"Bağlantınız, gizliliğiniz devam etmesi için otomatik olarak kapatıldı."
+msgstr "Bağlantınız, gizliliğiniz devam etmesi için otomatik olarak kapatıldı."
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2082,20 +1951,40 @@ msgstr "Belirtilen hatalar oluştu:"
msgctxt "MainWindow"
msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Hata(%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Bağlantınız sonlandırılıyor."
+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 ""
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2106,33 +1995,45 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"Şu anda bir çok noktaya bağlısınız. Tüm bağlantılarınız sonlandırılacak.\n"
-"\n"
-"Çıkmak istediğinizden emin misiniz?"
+msgstr "Şu anda bir çok noktaya bağlısınız. Tüm bağlantılarınız sonlandırılacak.\n\nÇıkmak istediğinizden emin misiniz?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Tor beklenmedik şekilde sonlandırıldı.\n"
-"\n"
-"Günlük kayıtlarından hata sebebini kontrol edebilirsiniz."
+msgstr "Tor beklenmedik şekilde sonlandırıldı.\n\nGünlük kayıtlarından hata sebebini kontrol edebilirsiniz."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+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 "(probably an email client)"
-msgstr ""
+msgid "failed (%1)"
+msgstr "Hata(%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", e-posta istemcisi,"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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"
@@ -2388,36 +2289,24 @@ msgid "Automatically save new log messages to a file"
msgstr "Yeni günlük mesajlarını otomatik kaydet"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Yeni günlük mesajlarını herzaman kaydet"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Yeni günlük mesajlarını herzaman kaydet"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr ""
-"Bu mesaj büyük bir sorun olduğunda\n"
-"ortaya çıkar ve Tor çalışmaz."
+msgstr "Bu mesaj büyük bir sorun olduğunda\nortaya çıkar ve Tor çalışmaz."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr ""
-"Bu mesaj sadece Tor'da \n"
-"sorun olduğunda ortaya çıkar."
+msgstr "Bu mesaj sadece Tor'da \nsorun olduğunda ortaya çıkar."
msgctxt "MessageLog"
msgid ""
@@ -2425,9 +2314,7 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"Tor çalışırken nadiren oluşan\n"
-"ve hata olarak düşünülmeyen mesajlarla\\ilgilenmek isteyebilirsiniz."
+msgstr "Tor çalışırken nadiren oluşan\nve hata olarak düşünülmeyen mesajlarla\\ilgilenmek isteyebilirsiniz."
msgctxt "MessageLog"
msgid ""
@@ -2446,14 +2333,7 @@ msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"%1 dosyasına yazılamadı\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Ağ haritası"
+msgstr "%1 dosyasına yazılamadı\n\n%2."
msgctxt "NetViewer"
msgid "Refresh"
@@ -2555,6 +2435,22 @@ 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ü"
@@ -2571,17 +2467,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port "
-"numarası girmeniz gerekiyor."
+msgstr "İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Firewall'un Tor ağına bağlanabilmek için birden fazla port belirlemeniz "
-"gerekiyor."
+msgstr "Firewall'un Tor ağına bağlanabilmek için birden fazla port belirlemeniz gerekiyor."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2589,9 +2481,7 @@ msgstr "'%1' geçerli bir port numarası değil."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Eğer internete bağlanmak için bir proxy sunucusuna ihtiyaç duyuyorsa bunu "
-"kontol et."
+msgstr "Eğer internete bağlanmak için bir proxy sunucusuna ihtiyaç duyuyorsa bunu kontol et."
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2615,9 +2505,7 @@ msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Güvenlik duvarı sadece izin verilen portlar üzerinden aktarım izni vermesini"
-" kontrol et"
+msgstr "Güvenlik duvarı sadece izin verilen portlar üzerinden aktarım izni vermesini kontrol et"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2639,9 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Tor ağına bağlanmak için köprü kullan yada şifrelenmiş klasördeki istekleri"
-" kontrol et"
+msgstr "Tor ağına bağlanmak için köprü kullan yada şifrelenmiş klasördeki istekleri kontrol et"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2679,9 +2565,7 @@ msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr ""
-"Yeni bir köprü bulunmuyor. Biraz bekleyip tekrar deneyebilirsiniz ya da yeni"
-" köprü bulmak için başka bir yöntem deneyebilirsiniz."
+msgstr "Yeni bir köprü bulunmuyor. Biraz bekleyip tekrar deneyebilirsiniz ya da yeni köprü bulmak için başka bir yöntem deneyebilirsiniz."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2871,9 +2755,7 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Ayarlarınız Tor'u köprü gibi davranmaya zorluyor, ama şu anki sürümü "
-"köprülemeyi desteklemiyor."
+msgstr "Ayarlarınız Tor'u köprü gibi davranmaya zorluyor, ama şu anki sürümü köprülemeyi desteklemiyor."
msgctxt "ServerPage"
msgid ""
@@ -2894,10 +2776,6 @@ msgid "Run as a client only"
msgstr "Sadece kullanıcı olarak çalıştır"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor ağının bir parçası olmak istiyorum"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Aktarım portu:"
@@ -3007,9 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Maximum bantgenişliği oranı mevcut bandgenişlği ortlamasına büyük veya eşit,"
-" iki değerde en az 20KB/s olmalı."
+msgstr "Maximum bantgenişliği oranı mevcut bandgenişlği ortlamasına büyük veya eşit, iki değerde en az 20KB/s olmalı."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3070,17 +2946,13 @@ msgstr "İzin verilen politikalarla ilgi yardım başlıklarını göster"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Hangi internet kaynakları kullanıcılar tarafından sizin üzerinizden "
-"ulaşabilir?"
+msgstr "Hangi internet kaynakları kullanıcılar tarafından sizin üzerinizden ulaşabilir?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor hala bazı dışarıya giden mail ve dosya paylaşım uygulamalarını "
-"varsayılan ayarlara göre spamları azaltmak için engelliyor."
+msgstr "Tor hala bazı dışarıya giden mail ve dosya paylaşım uygulamalarını varsayılan ayarlara göre spamları azaltmak için engelliyor."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3111,9 +2983,7 @@ msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr ""
-"Geçidinizi çalışır durumda bırakmanız diğer istemcilerin onu bulma ve "
-"kullanma şansını arttıracaktır."
+msgstr "Geçidinizi çalışır durumda bırakmanız diğer istemcilerin onu bulma ve kullanma şansını arttıracaktır."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3127,9 +2997,7 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr ""
-"Vidalia körünüzün kullanım geçmişini sorgularken Tor beklenmedik biçemde bir"
-" yanıt döndürdü."
+msgstr "Vidalia körünüzün kullanım geçmişini sorgularken Tor beklenmedik biçemde bir yanıt döndürdü."
msgctxt "ServerPage"
msgid "The returned response was: %1"
@@ -3137,8 +3005,7 @@ msgstr "Dönen cevap: %1."
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr ""
-"Tor ağına erişirken yardımı gösterme(Tor 0.2.0.8-alpha yada daha yeni)"
+msgstr "Tor ağına erişirken yardımı gösterme(Tor 0.2.0.8-alpha yada daha yeni)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
@@ -3153,6 +3020,14 @@ 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"
@@ -3160,9 +3035,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"Geçidinizle ilgili bir problem olduğundan ulaşılabileceğiniz bir eposta adresi.\n"
-"İsterseniz PGP veya GPG imzanızı da ekleyebilirsiniz."
+msgstr "Geçidinizle ilgili bir problem olduğundan ulaşılabileceğiniz bir eposta adresi.\nİsterseniz PGP veya GPG imzanızı da ekleyebilirsiniz."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3172,9 +3045,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Lütfen sanal port kullanımı için en az biri hizmet klasörü "
-"belirleyiniz.Diğerlerini kaldırın."
+msgstr "Lütfen sanal port kullanımı için en az biri hizmet klasörü belirleyiniz.Diğerlerini kaldırın."
msgctxt "ServicePage"
msgid "Error"
@@ -3201,10 +3072,6 @@ 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"
@@ -3493,6 +3360,22 @@ 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"
@@ -3529,6 +3412,12 @@ 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]"
@@ -3607,6 +3496,30 @@ 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ı"
@@ -3667,16 +3580,13 @@ msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr ""
-"Vidalia yazılımın güncellemesini kontrol edemiyor çünkü %1 bulunamadı."
+msgstr "Vidalia yazılımın güncellemesini kontrol edemiyor çünkü %1 bulunamadı."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr ""
-"Vidalia yazılımın güncellemesini kontrol edemiyor çünkü Tor'un güncelleme "
-"yazılımı beklenmedik bir şekilde sonuçlandı."
+msgstr "Vidalia yazılımın güncellemesini kontrol edemiyor çünkü Tor'un güncelleme yazılımı beklenmedik bir şekilde sonuçlandı."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3738,6 +3648,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "Sürüm"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "Tamam"
@@ -3831,10 +3749,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Günlük dosyası açılamıyor'%1':%2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Yanlış dil kodu belirtildi:"
@@ -3851,9 +3765,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"Şu anda vidalia zaten çalışıyor.Başka bir vidalia uygulaması başlatmak "
-"istediğinden emin misin?"
+msgstr "Şu anda vidalia zaten çalışıyor.Başka bir vidalia uygulaması başlatmak istediğinden emin misin?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3886,5 +3798,3 @@ 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 49d5f5f..219c3e1 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 ff3e342..a3e9723 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ 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 c1711fa..a56b42a 100755
--- a/src/vidalia/i18n/po/vi/vidalia_vi.po
+++ b/src/vidalia/i18n/po/vi/vidalia_vi.po
@@ -1,11 +1,12 @@
#
+# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-07-27 01:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+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,10 +233,6 @@ 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"
@@ -275,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Thôi"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,17 +429,26 @@ msgid "Control socket is not connected."
msgstr "Socket kiểm soát không được kết nối."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Mật khẩu bắt buộc"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ghi nhớ mật khẩu của tôi"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1334,10 +1344,6 @@ 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"
@@ -1365,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1526,10 +1536,7 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr ""
-"Vidalia có thể mở các liên kết mà bạn đã chọn trong trình duyệt web mặc định"
-" của bạn. Nếu trình duyệt của bạn hiện không có cấu hình để sử dụng Tor thì "
-"yêu cầu sẽ không được ẩn danh."
+msgstr "Vidalia có thể mở các liên kết mà bạn đã chọn trong trình duyệt web mặc định của bạn. Nếu trình duyệt của bạn hiện không có cấu hình để sử dụng Tor thì yêu cầu sẽ không được ẩn danh."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
@@ -1543,9 +1550,7 @@ msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
-msgstr ""
-"Vidalia không thể mở liên kết được lựa chọn trong trình duyệt web của bạn. "
-"Bạn vẫn có thể sao chép URL và dán nó vào trình duyệt của bạn."
+msgstr "Vidalia không thể mở liên kết được lựa chọn trong trình duyệt web của bạn. Bạn vẫn có thể sao chép URL và dán nó vào trình duyệt của bạn."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1652,34 +1657,6 @@ 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"
@@ -1688,10 +1665,6 @@ 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"
@@ -1804,10 +1777,6 @@ 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"
@@ -1827,9 +1796,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr ""
-"Vidalia không thể bắt đầu Tor. Kiểm tra các thiết lập của bạn để đảm bảo "
-"đúng tên và vị trí của Tor thực thi được chỉ định của bạn."
+msgstr "Vidalia không thể bắt đầu Tor. Kiểm tra các thiết lập của bạn để đảm bảo đúng tên và vị trí của Tor thực thi được chỉ định của bạn."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1867,9 +1834,7 @@ msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr ""
-"Các phần mềm Tor đòi hỏi Vidalia gửi yêu cầu về nội dung của một cookie xác "
-"thực, nhưng Vidalia đã không thể tìm thấy một cookie."
+msgstr "Các phần mềm Tor đòi hỏi Vidalia gửi yêu cầu về nội dung của một cookie xác thực, nhưng Vidalia đã không thể tìm thấy một cookie."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1891,22 +1856,7 @@ msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr ""
-"Vidalia không thể đăng ghi cho một số sự kiện. Nhiều trong số các tính năng "
-"của Vidalia có thể không có sẵn."
-
-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."
+msgstr "Vidalia không thể đăng ghi cho một số sự kiện. Nhiều trong số các tính năng của Vidalia có thể không có sẵn."
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1916,9 +1866,7 @@ msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr ""
-"Phiên bản cài đặt hiện thời của Tor hết hạn hoặc không còn được đề nghị. Xin"
-" vui lòng truy cập vào trang web Tor để tải phiên bản mới nhất."
+msgstr "Phiên bản cài đặt hiện thời của Tor hết hạn hoặc không còn được đề nghị. Xin vui lòng truy cập vào trang web Tor để tải phiên bản mới nhất."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1928,8 +1876,7 @@ msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr ""
-"Tất cả các kết nối tiếp theo sẽ xuất hiện khác với các kết nối cũ của bạn."
+msgstr "Tất cả các kết nối tiếp theo sẽ xuất hiện khác với các kết nối cũ của bạn."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1952,85 +1899,11 @@ 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 ""
@@ -2090,13 +1963,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2114,6 +2005,16 @@ 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 ""
@@ -2121,6 +2022,20 @@ 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"
@@ -2143,9 +2058,7 @@ msgstr "Tên Tập tin Đăng nhập bắt buộc"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
-"Bạn phải nhập một tên tập tin để có thể lưu các tin nhắn đăng nhập vào một "
-"tập tin."
+msgstr "Bạn phải nhập một tên tập tin để có thể lưu các tin nhắn đăng nhập vào một tập tin."
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2369,31 +2282,21 @@ msgstr "Trình duyệt"
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-"Kích hoạt tính năng ưu tự động ltất cả các tin nhắn đăng nhập mới vào một "
-"tập tin"
+msgstr "Kích hoạt tính năng ưu tự động ltất cả các tin nhắn đăng nhập mới vào một tập tin"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
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 "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2433,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Bản đồ mạng Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Cập nhật"
@@ -2536,6 +2435,22 @@ 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ệ"
@@ -2552,17 +2467,13 @@ msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr ""
-"Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình "
-"Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng"
+msgstr "Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr ""
-"Bạn phải chỉ định một hoặc nhiều cổng để firewall của bạn cho phép bạn kết "
-"nối."
+msgstr "Bạn phải chỉ định một hoặc nhiều cổng để firewall của bạn cho phép bạn kết nối."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
@@ -2570,9 +2481,7 @@ msgstr "'% 1' không phải là một số cổng hợp lệ."
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr ""
-"Kiểm tra nếu mạng địa phương của bạn yêu cầu một máy ủy quyền proxy để truy"
-" cập Liên mạng"
+msgstr "Kiểm tra nếu mạng địa phương của bạn yêu cầu một máy ủy quyền proxy để truy cập Liên mạng"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
@@ -2596,9 +2505,7 @@ msgstr "Cổng:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr ""
-"Kiểm tra chỉ kết nối với những tiếp sức sử dụng cổng được cho phép bởi tường"
-" lửa của bạn"
+msgstr "Kiểm tra chỉ kết nối với những tiếp sức sử dụng cổng được cho phép bởi tường lửa của bạn"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
@@ -2620,9 +2527,7 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr ""
-"Kiểm tra để mã hóa các yêu cầu thư mục và, mo^.t ca'ch tùy chọn, sử dụng "
-"những tiếp sức cầu để truy cập vào mạng Tor"
+msgstr "Kiểm tra để mã hóa các yêu cầu thư mục và, mo^.t ca'ch tùy chọn, sử dụng những tiếp sức cầu để truy cập vào mạng Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2850,17 +2755,13 @@ msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr ""
-"Bạn đã cấu hình Tor để hoạt động như một cầu nối tiếp sức cho người sử dụng "
-"kiểm duyệt, nhưng phiên bản Tor của bạn không hỗ trợ cầu."
+msgstr "Bạn đã cấu hình Tor để hoạt động như một cầu nối tiếp sức cho người sử dụng kiểm duyệt, nhưng phiên bản Tor của bạn không hỗ trợ cầu."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr ""
-"Xin vui lòng nâng cấp phần mềm Tor của bạn hoặc cấu hình Tor để hành động "
-"như là một Tor tiếp sức bình thường."
+msgstr "Xin vui lòng nâng cấp phần mềm Tor của bạn hoặc cấu hình Tor để hành động như là một Tor tiếp sức bình thường."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
@@ -2875,10 +2776,6 @@ msgid "Run as a client only"
msgstr "Chạy chi? như một khách hàng"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tiếp sức giao thông cho mạng Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Cổng tiếp sức:"
@@ -2916,9 +2813,7 @@ msgstr "Tên tiếp sức của bạn"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr ""
-"Cổng mà người sử dụng và những chuyển tiếp khác có thể giao tiếp với tiếp "
-"sức của bạn"
+msgstr "Cổng mà người sử dụng và những chuyển tiếp khác có thể giao tiếp với tiếp sức của bạn"
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2932,9 +2827,7 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr ""
-"Cho các kết nối Liên mạng với tốc độ tải xuống nhanh, nhưng nạp lên chậm, "
-"xin ghi vào danh sách tốc độ nạp lên của bạn ở đây."
+msgstr "Cho các kết nối Liên mạng với tốc độ tải xuống nhanh, nhưng nạp lên chậm, xin ghi vào danh sách tốc độ nạp lên của bạn ở đây."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
@@ -2992,9 +2885,7 @@ msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-"Tỷ lệ băng thông tối đa của bạn phải lớn hơn hoặc bằng mức băng thông trung "
-"bình của bạn. Cả hai giá trị phải có ít nhất 20 kB / s."
+msgstr "Tỷ lệ băng thông tối đa của bạn phải lớn hơn hoặc bằng mức băng thông trung bình của bạn. Cả hai giá trị phải có ít nhất 20 kB / s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -3055,17 +2946,13 @@ msgstr "Hiển thị chủ đề về các chính sách trợ giúp thoát"
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Người sử dụng những nguồn năng lực Liên mạng gì sẽ có thể truy nhập từ "
-"tiếp sức của bạn?"
+msgstr "Người sử dụng những nguồn năng lực Liên mạng gì sẽ có thể truy nhập từ tiếp sức của bạn?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr ""
-"Tor vẫn sẽ chặn một số thư gửi đi và chia sẻ tập tin ứng dụng mặc định để "
-"giảm thư rác và lạm dụng khác."
+msgstr "Tor vẫn sẽ chặn một số thư gửi đi và chia sẻ tập tin ứng dụng mặc định để giảm thư rác và lạm dụng khác."
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3073,15 +2960,12 @@ msgstr "Chính sách xuất cảnh"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr ""
-"Hãy để những người khác tiếp cận cầu của bạn bằng cách cho họ dòng này:"
+msgstr "Hãy để những người khác tiếp cận cầu của bạn bằng cách cho họ dòng này:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr ""
-"Đây là danh tính của cầu tiếp sức của bạn mà bạn có thể cung cấp cho người "
-"khác"
+msgstr "Đây là danh tính của cầu tiếp sức của bạn mà bạn có thể cung cấp cho người khác"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3136,6 +3020,14 @@ 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,9 +3045,7 @@ msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
-msgstr ""
-"Xin cấu hình ít nhất một thư mục dịch vụ và một cổng ảo cho mỗi dịch vụ mà "
-"bạn muốn lưu. Hãy hủy bỏ những cái khác."
+msgstr "Xin cấu hình ít nhất một thư mục dịch vụ và một cổng ảo cho mỗi dịch vụ mà bạn muốn lưu. Hãy hủy bỏ những cái khác."
msgctxt "ServicePage"
msgid "Error"
@@ -3182,10 +3072,6 @@ 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"
@@ -3223,9 +3109,7 @@ msgstr "Sao lại địa chỉ onion của dịch vụ được chọn vào bộ
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
-"Trình duyệt trong hệ thống tập tin địa phương và chọn thư mục cho dịch vụ "
-"được chọn"
+msgstr "Trình duyệt trong hệ thống tập tin địa phương và chọn thư mục cho dịch vụ được chọn"
msgctxt "ServicePage"
msgid "Created by Tor"
@@ -3476,6 +3360,22 @@ 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"
@@ -3512,6 +3412,12 @@ 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]"
@@ -3590,6 +3496,30 @@ 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"
@@ -3868,5 +3798,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po b/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po
index ce8a3aa..fb2aad8 100644
--- a/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po
+++ b/src/vidalia/i18n/po/zh_CN/qt_zh_CN.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# John <dragonandghost 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-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-09-25 13:55+0000\n"
-"Last-Translator: killdragonno1 <dragonandghost at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -439,5 +436,3 @@ msgstr "%1千字节"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1字节"
-
-
diff --git a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
index 861920d..5801871 100644
--- a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
+++ b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
@@ -1,15 +1,14 @@
#
# Translators:
-# Kevin Chen <szescxz at 126.com>, 2011.
+# <reg at 8863.co.cc>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <szescxz at 126.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2011-12-02 13:11+0000\n"
-"Last-Translator: szescxz <szescxz at 126.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2012-02-14 10:03+0000\n"
+"Last-Translator: s10010 <reg at 8863.co.cc>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -141,11 +140,11 @@ msgstr "选择储存Tor软件数据的文件夹"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor控制"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "使用TCP连接（控制端口）"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
@@ -157,11 +156,11 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "编辑当前torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "注意：这将会编辑当前已加载的torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
@@ -185,29 +184,22 @@ msgstr "警告"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "您更改了torrc的路径，您想要重启Tor吗？"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor配置文件 (torrc);;所有文件 (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "自动配置控制端口"
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr ""
-"Vidalia 无法删除 Tor 服务。\n"
-"\n"
-"你需要手工将其删除。"
+msgstr "Vidalia 无法删除 Tor 服务。\n\n你需要手工将其删除。"
msgctxt "AppearancePage"
msgid "Language"
@@ -242,10 +234,6 @@ msgid "Show Settings"
msgstr "显示设定"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor 带宽使用"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "复位设定"
@@ -285,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "取消"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "开始 HTTPS 网桥请求..."
@@ -438,18 +430,27 @@ msgid "Control socket is not connected."
msgstr "控制接口当前未连接。"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "需要密码"
+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 ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "记住我的密码"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia 已经连接至一个运行中的需要密码的 Tor 进程。请输入您的控制密码："
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1165,7 +1166,7 @@ msgstr "津巴布韦"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "扎伊尔"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
@@ -1265,53 +1266,58 @@ msgstr "台湾"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "提交崩溃报告"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia遇到了一个错误，需要关闭"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"A crash report has been created that you can automatically send to the "
+"Vidalia developers to help identify and fix the problem. The submitted "
+"report does not contain any personally identifying information, but your "
+"connection to the crash reporting server may not be anonymous."
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid ""
+"Please also describe what you were doing before the application crashed "
+"(optional):"
+msgstr ""
+
+msgctxt "CrashReportDialog"
+msgid "Send my crash report to the Vidalia developers"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "重启Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "不重启"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "无法重启Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "无法自动重启Vidalia。请手动重启Vidalia。"
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
msgstr ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr "一个错误报告已建立。您可以把它发送给Vidalia的开发者以帮助识别并修正问题。提交的报告不包含任何个人身份信息。"
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
msgstr ""
msgctxt "GeneralPage"
@@ -1339,10 +1345,6 @@ msgid "Browse"
msgstr "浏览"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Vidalia 启动时运行 Tor 软件"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1370,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "现在检查"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/秒"
@@ -1589,27 +1595,27 @@ msgstr "未知"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "调试"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "信息"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "注意"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "警告"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "错误"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "未知"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1652,34 +1658,6 @@ 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"
@@ -1688,10 +1666,6 @@ msgid "View"
msgstr "查看"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia 帮助"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "启动浏览器时发生了错误"
@@ -1804,10 +1778,6 @@ msgid "Tor is shutting down"
msgstr "正在关闭 Tor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "立刻停止 Tor"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "停止 Tor"
@@ -1890,18 +1860,6 @@ 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 更新"
@@ -1942,82 +1900,11 @@ 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版本已经过时，不再推荐使用。"
@@ -2065,22 +1952,40 @@ 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 "失败（%1）"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+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 ""
-"正在关闭您的中继服务。\n"
-"再次单击'停止'立刻关闭中继。"
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
@@ -2091,33 +1996,45 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
-"您目前正在运行中继服务。中断中继将意外中断其与各客户端间的连接。\n"
-"\n"
-"您是否想延迟关闭以便给与您的客户端时间转移至新的中继？"
+msgstr "您目前正在运行中继服务。中断中继将意外中断其与各客户端间的连接。\n\n您是否想延迟关闭以便给与您的客户端时间转移至新的中继？"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr ""
-"Vidalia检测到Tor软件意外退出。\n"
-"\n"
-"请检查消息日志获取最近的警告及错误信息。"
+msgstr "Vidalia检测到Tor软件意外退出。\n\n请检查消息日志获取最近的警告及错误信息。"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+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 "(probably an email client)"
-msgstr ""
+msgid "failed (%1)"
+msgstr "失败（%1）"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "，也许是Telnet程序，"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr "，也许是Email客户端，"
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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"
@@ -2373,22 +2290,14 @@ msgid "Automatically save new log messages to a file"
msgstr "自动保存新的消息内容至文件"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "基本法"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor状态"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "高级"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "总是保存新消息"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2406,9 +2315,7 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr ""
-"此类消息在Tor运行时偶尔出现\n"
-"并非错误但可能需要关注。"
+msgstr "此类消息在Tor运行时偶尔出现\n并非错误但可能需要关注。"
msgctxt "MessageLog"
msgid ""
@@ -2427,14 +2334,7 @@ msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr ""
-"无法写入文件%1\n"
-"\n"
-"%2。"
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor 网络地图"
+msgstr "无法写入文件%1\n\n%2。"
msgctxt "NetViewer"
msgid "Refresh"
@@ -2536,6 +2436,22 @@ 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 "无效网桥"
@@ -2640,7 +2556,7 @@ msgstr "立刻搜索网桥"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">如何通过其他方式获取网桥?</a>"
+msgstr "<a href=\"bridges.finding\">如果通过其他方式获取网桥?</a>"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2658,31 +2574,31 @@ msgstr "单击帮助查看获取新网桥的其他渠道。"
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "地址："
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "类型："
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "您必须选择代理类型。"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr "HTTP"
+msgstr ""
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2861,10 +2777,6 @@ msgid "Run as a client only"
msgstr "仅运行客户端功能"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor 网络中继"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "中继端口:"
@@ -3006,9 +2918,7 @@ msgstr "其它服务"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
-"端口范围: 706,1863,5050,5190,5222,8300 和 8888 {706, 1863, 5050, 5190, 5222, "
-"5223, 8300 ?}"
+msgstr "端口范围: 706,1863,5050,5190,5222,8300 和 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3104,11 +3014,19 @@ msgstr "<a href=\"#bridgeUsage\">谁曾使用过我的网桥?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">这是什么？</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "自动发布我的网桥地址"
+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"
@@ -3118,9 +3036,7 @@ msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr ""
-"中继故障时联系您的Email地址\n"
-"您还可以同时提供您的PGP/GPG指纹。"
+msgstr "中继故障时联系您的Email地址\n您还可以同时提供您的PGP/GPG指纹。"
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3157,10 +3073,6 @@ msgid "Directory already in use by another service."
msgstr "此目录已被其他服务占用。"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "表单"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "已提供隐藏服务"
@@ -3206,19 +3118,19 @@ msgstr "由Tor创建"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "复制到剪贴板"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor软件正在运行"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "您当前正在运行版本为 %1 的Tor。"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor未运行"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3226,7 +3138,6 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
-"单击位于 Vidalia 控制面板的“启动 Tor”以重启 Tor 软件。如果 Tor 意外退出，选中顶端的“高级”选项卡以查看所遇到的错误的信息。"
msgctxt "StatusEventWidget"
msgid ""
@@ -3234,7 +3145,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr "您正在运行版本为 %1 的 Tor 软件，且此版本已经不再推荐使用。请升级到最新的版本，它可以提升重要的安全性、可靠性与性能。"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3243,31 +3154,30 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
-"您正在运行版本为 %1 的 Tor 软件，且此版本已不再支持现在的 Tor 网络。请升级到最新的版本，它可以提升重要的安全性、可靠性与性能。"
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "您的Tor已过时"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "已连接到Tor网络"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr "我们已成功创建一个到 Tor 网络的连接。您可以现在配置您的应用程序以匿名方式访问互联网。"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Tor软件错误"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr "Tor 软件遇到了一个内部错误。请将下列错误信息通过 bugs.torproject.org 发送给 Tor 的开发者：“%1”"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3287,7 +3197,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "您的计算机的时钟可能不正确"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3306,7 +3216,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "含有潜在危险的连接！"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3318,7 +3228,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "未知 SOCKS 协议"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3329,7 +3239,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "错误目标主机名"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3340,18 +3250,18 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "外部 IP 地址已改变"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr "Tor已确定您的中继的当前公共IP地址是 %1%2。如果这不正确，请尝试设置中继配置中的地址选项。"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "检测到 DNS 劫持"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3369,26 +3279,26 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "正在检测服务器端口的连接性"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's server port is reachable from the"
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
-msgstr "Tor正在尝试确定Tor网络可以连接到您的服务器端口 %1:%2。这可能需要几分钟。"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "服务器端口连接性测试成功！"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Tor网络可以连接到您的中继服务器的端口！"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "服务器端口连接性测试失败"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3441,7 +3351,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "您的中继已在线"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3451,6 +3361,22 @@ 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,6 +3413,12 @@ 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]"
@@ -3505,53 +3437,53 @@ msgstr "密码指纹生成失败。"
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "正在编辑 torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr "保存设置。若取消勾选将只在本次 Tor 运行时生效。"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "剪切"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "复制"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "粘贴"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "撤销"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "重做"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "全部选定"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "全部接受"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "只接受选定项"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "与Tor连接发生错误"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "您没有选择任何文本。请选择一些文本，或勾选“全部应用”"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
@@ -3559,11 +3491,35 @@ msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "错误"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "打开torrc文件时发生错误"
+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"
@@ -3693,6 +3649,14 @@ msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr "版本"
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
+
msgctxt "VMessageBox"
msgid "OK"
msgstr "确定"
@@ -3786,10 +3750,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "无法打开日志文件 '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "指定语言代码无效："
@@ -3806,10 +3766,7 @@ msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr ""
-"似乎另一个Vidalia进程已经运行。如果没有其他的Vidalia进程运行，您可以选择继续。\n"
-"\n"
-"您要启动Vidalia吗?"
+msgstr "似乎另一个Vidalia进程已经运行。如果没有其他的Vidalia进程运行，您可以选择继续。\n\n您要启动Vidalia吗?"
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3842,5 +3799,3 @@ 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 093bf99..6877ae2 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po b/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po
index 888f88c..73fac17 100644
--- a/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po
+++ b/src/vidalia/i18n/po/zh_TW/qt_zh_TW.po
@@ -1,15 +1,11 @@
#
-# Translators:
-# <random3098 at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
-# tylerlin <msn at tylerlin.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-01-18 02:48+0000\n"
-"Last-Translator: whyme <random3098 at gmail.com>\n"
+"PO-Revision-Date: 2011-03-18 11:08+0000\n"
+"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -204,8 +200,6 @@ msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
msgstr ""
-"%1 已經存在。\n"
-"你要取代原來的嗎?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -214,9 +208,6 @@ msgid ""
"File not found.\n"
"Please verify the correct file name was given."
msgstr ""
-"%1\n"
-"檔案不存在。\n"
-"請確認檔名無誤。"
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -275,9 +266,6 @@ msgid ""
"Directory not found.\n"
"Please verify the correct directory name was given."
msgstr ""
-"%1\n"
-"找不到目錄。\n"
-"請確認您輸入正確的目錄名。"
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
@@ -285,8 +273,6 @@ msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
msgstr ""
-"%1' 有防寫保護。\n"
-"您仍舊要刪除它嗎?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -444,5 +430,3 @@ msgstr "%1 KB"
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr "%1 位元組"
-
-
diff --git a/src/vidalia/i18n/po/zu/vidalia_zu.po b/src/vidalia/i18n/po/zu/vidalia_zu.po
index 2da7607..68927a4 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-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-08-10 10:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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 ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"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."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ 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 ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ 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 ""
@@ -1936,138 +1897,115 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
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."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything 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 ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"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 ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"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"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
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."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ 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 ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ 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 ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ 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,6 +3410,12 @@ 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 ""
@@ -3536,6 +3494,30 @@ 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 ""
@@ -3814,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/vidalia_i18n.qrc b/src/vidalia/i18n/vidalia_i18n.qrc
index 80aab11..1105cf7 100644
--- a/src/vidalia/i18n/vidalia_i18n.qrc
+++ b/src/vidalia/i18n/vidalia_i18n.qrc
@@ -2,58 +2,62 @@
<qresource prefix="/lang">
<file>vidalia_ar.qm</file>
<file>vidalia_bg.qm</file>
+ <file>vidalia_my.qm</file>
<file>vidalia_cs.qm</file>
<file>vidalia_da.qm</file>
<file>vidalia_de.qm</file>
- <file>vidalia_el.qm</file>
<file>vidalia_es.qm</file>
<file>vidalia_fa.qm</file>
+ <file>vidalia_fi.qm</file>
<file>vidalia_fr.qm</file>
+ <file>vidalia_he.qm</file>
<file>vidalia_hu.qm</file>
<file>vidalia_it.qm</file>
- <file>vidalia_ko.qm</file>
+ <file>vidalia_ja.qm</file>
+ <file>vidalia_nb.qm</file>
<file>vidalia_nl.qm</file>
+ <file>vidalia_pl.qm</file>
<file>vidalia_pt.qm</file>
<file>vidalia_pt_BR.qm</file>
+ <file>vidalia_ro.qm</file>
<file>vidalia_ru.qm</file>
- <file>vidalia_id.qm</file>
+ <file>vidalia_sq.qm</file>
+ <file>vidalia_sv.qm</file>
+ <file>vidalia_th.qm</file>
<file>vidalia_tr.qm</file>
+ <file>vidalia_vi.qm</file>
<file>vidalia_zh_CN.qm</file>
- <file>vidalia_ro.qm</file>
- <file>vidalia_fi.qm</file>
- <file>vidalia_he.qm</file>
- <file>vidalia_sv.qm</file>
- <file>vidalia_nb.qm</file>
- <file>vidalia_pl.qm</file>
- <file>vidalia_ca.qm</file>
+ <file>vidalia_zh_TW.qm</file>
</qresource>
<qresource prefix="/lang">
<file>qt_ar.qm</file>
<file>qt_bg.qm</file>
+ <file>qt_my.qm</file>
<file>qt_cs.qm</file>
<file>qt_da.qm</file>
<file>qt_de.qm</file>
- <file>qt_el.qm</file>
<file>qt_es.qm</file>
<file>qt_fa.qm</file>
+ <file>qt_fi.qm</file>
<file>qt_fr.qm</file>
+ <file>qt_he.qm</file>
<file>qt_hu.qm</file>
<file>qt_it.qm</file>
- <file>qt_ko.qm</file>
+ <file>qt_ja.qm</file>
+ <file>qt_nb.qm</file>
<file>qt_nl.qm</file>
+ <file>qt_pl.qm</file>
<file>qt_pt.qm</file>
<file>qt_pt_BR.qm</file>
+ <file>qt_ro.qm</file>
<file>qt_ru.qm</file>
- <file>qt_id.qm</file>
+ <file>qt_sq.qm</file>
+ <file>qt_sv.qm</file>
+ <file>qt_th.qm</file>
<file>qt_tr.qm</file>
+ <file>qt_vi.qm</file>
<file>qt_zh_CN.qm</file>
- <file>qt_ro.qm</file>
- <file>qt_fi.qm</file>
- <file>qt_he.qm</file>
- <file>qt_sv.qm</file>
- <file>qt_nb.qm</file>
- <file>qt_pl.qm</file>
- <file>qt_ca.qm</file>
+ <file>qt_zh_TW.qm</file>
</qresource>
</RCC>
diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp
index 7e3e9c2..0f1c0c9 100644
--- a/src/vidalia/log/MessageLog.cpp
+++ b/src/vidalia/log/MessageLog.cpp
@@ -26,6 +26,8 @@
#include <QMessageBox>
#include <QClipboard>
+#include <QToolBar>
+
/* Message log settings */
#define SETTING_MSG_FILTER "MessageFilter"
#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
@@ -54,8 +56,9 @@
* \param parent The parent widget of this MessageLog object.
* \param flags Any desired window creation flags.
*/
-MessageLog::MessageLog(QWidget *parent, Qt::WFlags flags)
-: VidaliaWindow("MessageLog", parent, flags)
+MessageLog::MessageLog(QStatusBar *st, QWidget *parent)
+: VidaliaTab(tr("Message Log"), "MessageLog", parent),
+ _statusBar(st)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -77,7 +80,8 @@ MessageLog::MessageLog(QWidget *parent, Qt::WFlags flags)
/* Sort in ascending chronological order */
ui.listMessages->sortItems(LogTreeWidget::TimeColumn,
Qt::AscendingOrder);
- ui.listNotifications->sortItems(0, Qt::AscendingOrder);
+
+ ui.frmSettings->setVisible(false);
}
/** Default Destructor. Simply frees up any memory allocated for member
@@ -121,6 +125,19 @@ 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
@@ -152,6 +169,7 @@ void
MessageLog::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Message Log"));
setToolTips();
}
@@ -164,7 +182,6 @@ 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,
@@ -262,7 +279,6 @@ 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;
@@ -351,29 +367,20 @@ MessageLog::save(const QStringList &messages)
void
MessageLog::saveSelected()
{
- if (ui.tabWidget->currentIndex() == 0)
- save(ui.listNotifications->selectedEvents());
- else
- save(ui.listMessages->selectedMessages());
+ save(ui.listMessages->selectedMessages());
}
/** Saves all shown messages to a file. */
void
MessageLog::saveAll()
{
- if (ui.tabWidget->currentIndex() == 0)
- save(ui.listNotifications->allEvents());
- else
- save(ui.listMessages->allMessages());
+ save(ui.listMessages->allMessages());
}
void
MessageLog::selectAll()
{
- if (ui.tabWidget->currentIndex() == 0)
- ui.listNotifications->selectAll();
- else
- ui.listMessages->selectAll();
+ ui.listMessages->selectAll();
}
/** Copies contents of currently selected messages to the 'clipboard'. */
@@ -382,10 +389,7 @@ MessageLog::copy()
{
QString contents;
- if (ui.tabWidget->currentIndex() == 0)
- contents = ui.listNotifications->selectedEvents().join("\n");
- else
- contents = ui.listMessages->selectedMessages().join("\n");
+ contents = ui.listMessages->selectedMessages().join("\n");
if (!contents.isEmpty()) {
/* Copy the selected messages to the clipboard */
@@ -398,10 +402,7 @@ MessageLog::copy()
void
MessageLog::clear()
{
- if (ui.tabWidget->currentIndex() == 0)
- ui.listNotifications->clear();
- else
- ui.listMessages->clearMessages();
+ ui.listMessages->clearMessages();
}
/** Prompts the user for a search string. If the search string is not found in
@@ -421,18 +422,10 @@ MessageLog::find()
QTreeWidgetItem *firstItem = 0;
/* Pick the right tree widget to search based on the current tab */
- 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));
- }
+ QList<LogTreeItem *> results = ui.listMessages->find(text, true);
+ if (results.size() > 0) {
+ tree = ui.listMessages;
+ firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
}
if (! firstItem) {
@@ -461,11 +454,13 @@ 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 = ui.statusbar->currentMessage();
- if (!currStatusTip.isEmpty()) {
- currStatusTip = ui.listMessages->statusTip();
- ui.statusbar->showMessage(currStatusTip);
- }
+ QString currStatusTip;
+ if(_statusBar && _onTop)
+ currStatusTip = _statusBar->currentMessage();
+ if (!currStatusTip.isEmpty()) {
+ currStatusTip = ui.listMessages->statusTip();
+ _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 f9905e1..a4bad9d 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 "VidaliaWindow.h"
+#include "VidaliaTab.h"
#include "LogFile.h"
#include "TorControl.h"
#include "VidaliaSettings.h"
@@ -25,13 +25,13 @@
class LogTreeItem;
class QStringList;
-class MessageLog : public VidaliaWindow
+class MessageLog : public VidaliaTab
{
Q_OBJECT
public:
/** Default constructor **/
- MessageLog(QWidget *parent = 0, Qt::WFlags flags = 0);
+ MessageLog(QStatusBar *st = 0, QWidget *parent = 0);
/** Default destructor **/
~MessageLog();
@@ -90,6 +90,8 @@ 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 f5a90cf..c72c0ba 100644
--- a/src/vidalia/log/MessageLog.ui
+++ b/src/vidalia/log/MessageLog.ui
@@ -1,237 +1,273 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MessageLog</class>
- <widget class="QMainWindow" name="MessageLog">
+ <widget class="QWidget" name="MessageLog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>698</width>
- <height>625</height>
+ <width>534</width>
+ <height>521</height>
</rect>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
<property name="windowTitle">
- <string>Message Log</string>
- </property>
- <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>
+ <string notr="true"/>
</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>
+ <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>
- <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>
+ </column>
+ <column>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Message</string>
+ </property>
+ </column>
</widget>
- <widget class="QWidget" name="tabAdvanced">
- <attribute name="title">
- <string>Advanced</string>
- </attribute>
- <layout class="QGridLayout" name="advancedTabLayout">
+ </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">
<property name="margin">
- <number>12</number>
+ <number>3</number>
</property>
- <item row="0" column="0">
- <widget class="LogTreeWidget" name="listMessages">
+ <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">
<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 name="title">
+ <string>Message Filter</string>
</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">
+ <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>
<item>
- <widget class="QPushButton" name="btnSaveSettings">
+ <widget class="QCheckBox" name="chkTorDebug">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string>Saves the current Message Log settings</string>
+ <string/>
</property>
<property name="text">
- <string>Save Settings</string>
+ <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" name="_5">
<item>
- <widget class="QPushButton" name="btnCancelSettings">
+ <widget class="QSpinBox" name="spnbxMaxCount">
<property name="minimumSize">
<size>
- <width>90</width>
+ <width>50</width>
<height>0</height>
</size>
</property>
@@ -239,261 +275,98 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string>Cancels changes made to settings</string>
+ <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>Cancel</string>
+ <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>
- </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>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</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>
- </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>
+ <property name="title">
+ <string>Always Save New Log Messages </string>
+ </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>
<action name="actionMessage_Filters">
<property name="text">
<string>Message Filters...</string>
@@ -667,33 +540,12 @@
<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>
@@ -704,8 +556,8 @@
<y>-1</y>
</hint>
<hint type="destinationlabel">
- <x>407</x>
- <y>393</y>
+ <x>264</x>
+ <y>424</y>
</hint>
</hints>
</connection>
@@ -716,12 +568,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>373</x>
- <y>491</y>
+ <x>283</x>
+ <y>461</y>
</hint>
<hint type="destinationlabel">
- <x>348</x>
- <y>516</y>
+ <x>283</x>
+ <y>487</y>
</hint>
</hints>
</connection>
@@ -732,12 +584,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>20</x>
- <y>20</y>
+ <x>283</x>
+ <y>461</y>
</hint>
<hint type="destinationlabel">
- <x>20</x>
- <y>20</y>
+ <x>473</x>
+ <y>487</y>
</hint>
</hints>
</connection>
diff --git a/src/vidalia/main.cpp b/src/vidalia/main.cpp
index 7e9ad28..cf87c84 100644
--- a/src/vidalia/main.cpp
+++ b/src/vidalia/main.cpp
@@ -204,11 +204,13 @@ main(int argc, char *argv[])
Vidalia::setQuitOnLastWindowClosed(false);
/* Create an instance of the main window */
- MainWindow mainWin;
+ MainWindow *mainWin = new MainWindow();
/* Run Vidalia */
int ret = vidalia.run();
+ delete mainWin;;
+
/* Vidalia exited, so cleanup our pidfile and return */
QFile::remove(pidfile);
vNotice("Vidalia is exiting cleanly (return code %1).").arg(ret);
diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
index 6a67d57..0e0a161 100644
--- a/src/vidalia/network/NetViewer.cpp
+++ b/src/vidalia/network/NetViewer.cpp
@@ -20,6 +20,7 @@
#include "VMessageBox.h"
#include <QMessageBox>
+#include <QToolBar>
#include <QHeaderView>
#include <QCoreApplication>
@@ -41,7 +42,7 @@
* \param parent The parent widget of this NetViewer object.\
*/
NetViewer::NetViewer(QWidget *parent)
- : VidaliaWindow("NetViewer", parent)
+ : VidaliaTab(tr("Network Map"), "", parent)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -51,8 +52,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();
@@ -99,7 +100,6 @@ 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()));
@@ -128,8 +128,23 @@ NetViewer::NetViewer(QWidget *parent)
_torControl, SLOT(closeCircuit(CircuitId)));
connect(ui.treeCircuitList, SIGNAL(closeStream(StreamId)),
_torControl, SLOT(closeStream(StreamId)));
+ connect(ui.lineRouterSearch, SIGNAL(returnPressed()),
+ this, SLOT(onRouterSearch()));
+ connect(ui.lineRouterSearch, SIGNAL(textChanged(QString)),
+ ui.treeRouterList, SLOT(onRouterSearch(QString)));
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. */
@@ -137,6 +152,7 @@ void
NetViewer::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Network Map"));
ui.treeRouterList->retranslateUi();
ui.treeCircuitList->retranslateUi();
@@ -234,6 +250,14 @@ NetViewer::clear()
ui.textRouterInfo->clear();
}
+/** Called when the search of a router is triggered by the signal
+ * returnPressed from the search field. */
+void
+NetViewer::onRouterSearch()
+{
+ ui.treeRouterList->searchNextRouter(ui.lineRouterSearch->text());
+}
+
/** Loads a list of all current address mappings. */
void
NetViewer::loadAddressMap()
diff --git a/src/vidalia/network/NetViewer.h b/src/vidalia/network/NetViewer.h
index 1d1f85f..b1c40be 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 "VidaliaWindow.h"
+#include "VidaliaTab.h"
#include "GeoIpResolver.h"
#if defined(USE_MARBLE)
@@ -38,7 +38,7 @@
class QDateTime;
-class NetViewer : public VidaliaWindow
+class NetViewer : public VidaliaTab
{
Q_OBJECT
@@ -101,6 +101,9 @@ private slots:
/** Called when the user clicks "Full Screen" or presses Escape on the map.
* Toggles the map between normal and a full screen viewing modes. */
void toggleFullScreen();
+ /** Called when the search of a router is triggered by the signal
+ * returnPressed from the search field. */
+ void onRouterSearch();
private:
/** */
diff --git a/src/vidalia/network/NetViewer.ui b/src/vidalia/network/NetViewer.ui
index 63c8d88..11fd0a2 100644
--- a/src/vidalia/network/NetViewer.ui
+++ b/src/vidalia/network/NetViewer.ui
@@ -1,353 +1,371 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>NetViewer</class>
- <widget class="QMainWindow" name="NetViewer" >
- <property name="geometry" >
+ <widget class="QWidget" name="NetViewer">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>844</width>
- <height>596</height>
+ <width>694</width>
+ <height>552</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="windowTitle">
+ <string>Network Map</string>
</property>
- <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" >
+ <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="QSplitter" name="splitter4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <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::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="RouterListWidget" name="treeRouterList" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>7</vsizetype>
+ <widget class="QLineEdit" name="lineRouterSearch">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>30</height>
+ </size>
+ </property>
+ </widget>
+ <widget class="RouterListWidget" name="treeRouterList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
</size>
</property>
- <property name="contextMenuPolicy" >
+ <property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string/>
</property>
- <property name="indentation" >
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="indentation">
<number>0</number>
</property>
- <property name="sortingEnabled" >
+ <property name="sortingEnabled">
<bool>true</bool>
</property>
- <property name="selectionMode" >
- <enum>QAbstractItemView::ExtendedSelection</enum>
+ <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>5</hsizetype>
- <vsizetype>5</vsizetype>
+ </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">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="childrenCollapsible">
+ <bool>false</bool>
+ </property>
+ <widget class="QFrame" name="frmMap">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>100</horstretch>
- <verstretch>0</verstretch>
+ <verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy" >
+ <property name="minimumSize">
+ <size>
+ <width>400</width>
+ <height>300</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</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">
+ <horstretch>100</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <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>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <widget class="CircuitListWidget" name="treeCircuitList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
<verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
- <width>400</width>
- <height>300</height>
+ <width>300</width>
+ <height>0</height>
</size>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="statusTip">
+ <string/>
</property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
+ <property name="sortingEnabled">
+ <bool>false</bool>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
+ <property name="columnCount">
+ <number>2</number>
</property>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
+ <column>
+ <property name="text">
+ <string>Connection</string>
</property>
- <property name="spacing" >
- <number>6</number>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
</property>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- </layout>
- </item>
- </layout>
+ </column>
</widget>
- <widget class="QSplitter" name="splitter2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>1</vsizetype>
+ <widget class="RouterDescriptorView" name="textRouterInfo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
- <verstretch>1</verstretch>
+ <verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
</property>
- <property name="childrenCollapsible" >
- <bool>false</bool>
+ <property name="readOnly">
+ <bool>true</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>
- </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" >
+ </widget>
+ </item>
+ </layout>
+ <action name="actionRefresh">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/view-refresh.png</normaloff>:/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" >:/images/32x32/system-help.png</iconset>
+ <action name="actionHelp">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/system-help.png</normaloff>:/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" >:/images/32x32/window-close.png</iconset>
+ <action name="actionClose">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/window-close.png</normaloff>:/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" >:/images/32x32/zoom-in.png</iconset>
+ <action name="actionZoomIn">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/zoom-in.png</normaloff>:/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" >:/images/32x32/zoom-out.png</iconset>
+ <action name="actionZoomOut">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/zoom-out.png</normaloff>:/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" >:/images/32x32/zoom-fit-best.png</iconset>
+ <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>
</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" >:/images/32x32/view-fullscreen.png</iconset>
+ <action name="actionZoomFullScreen">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/view-fullscreen.png</normaloff>:/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>
@@ -370,24 +388,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../res/vidalia.qrc" />
+ <include location="../res/vidalia.qrc"/>
</resources>
- <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>
+ <connections/>
</ui>
diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp
index e35bc22..851a5ea 100644
--- a/src/vidalia/network/RouterListWidget.cpp
+++ b/src/vidalia/network/RouterListWidget.cpp
@@ -152,6 +152,40 @@ RouterListWidget::clearRouters()
setStatusTip(tr("%1 relays online").arg(0));
}
+/** Called when the search of a router is triggered by the signal
+ * textChanged from the search field. */
+void
+RouterListWidget::onRouterSearch(const QString routerNickname)
+{
+ if (!currentIndex().data().toString().toLower().startsWith(routerNickname.toLower()))
+ {
+ searchNextRouter(routerNickname);
+ } else {
+ /* If item at currentIndex() isn't visible, make it visible. */
+ scrollToItem(itemFromIndex(currentIndex()));
+ }
+}
+
+/** Selects the following router whose name starts by routerNickname. */
+void
+RouterListWidget::searchNextRouter(const QString routerNickname)
+{
+ /* currentIndex().row() = -1 if no item is selected. */
+ int startIndex = currentIndex().row() + 1;
+ /* Search for a router whose name start with routerNickname. Case-insensitive search. */
+ QModelIndexList qmIndList = model()->match(model()->index(startIndex, NameColumn),
+ Qt::DisplayRole,
+ QVariant(routerNickname),
+ 1,
+ (Qt::MatchStartsWith | Qt::MatchWrap));
+ if (qmIndList.count() > 0) {
+ setCurrentIndex(qmIndList.at(0));
+ /* If item at currentIndex() was already selected but not visible,
+ * make it visible. */
+ scrollToItem(itemFromIndex(currentIndex()));
+ }
+}
+
/** Called when the user selects a router from the list. This will search the
* list for a router whose names starts with the key pressed. */
void
diff --git a/src/vidalia/network/RouterListWidget.h b/src/vidalia/network/RouterListWidget.h
index 04d7263..95b471e 100644
--- a/src/vidalia/network/RouterListWidget.h
+++ b/src/vidalia/network/RouterListWidget.h
@@ -54,6 +54,8 @@ public:
void deselectAll();
/** Called when the user changes the UI translation. */
void retranslateUi();
+ /** Selects the following router whose name starts by routerNickname. */
+ void searchNextRouter(const QString routerNickname);
signals:
/** Emitted when the user selects a router from the list. */
@@ -64,6 +66,9 @@ signals:
public slots:
/** Clears the list of router items. */
void clearRouters();
+ /** Called when the search of a router is triggered by the signal
+ * textChanged from the search field. */
+ void onRouterSearch(const QString routerNickname);
private slots:
/** Called when the user clicks on an item in the list. */
diff --git a/src/vidalia/plugin/DebugDialog.cpp b/src/vidalia/plugin/DebugDialog.cpp
new file mode 100644
index 0000000..683ed6a
--- /dev/null
+++ b/src/vidalia/plugin/DebugDialog.cpp
@@ -0,0 +1,69 @@
+/*
+** 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 DebugDialog.cpp
+** \brief Simple dialog to see exceptions, syntaxis problems, and general
+** output for pluging
+*/
+
+#include "DebugDialog.h"
+
+QStringList DebugDialog::outputBuffer;
+QStringList DebugDialog::syntaxBuffer;
+QStringList DebugDialog::exceptBuffer;
+
+DebugDialog::DebugDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ fillText(ui.tedOutput, outputBuffer);
+ fillText(ui.tedSyntax, syntaxBuffer);
+ fillText(ui.tedExceptions, exceptBuffer);
+}
+
+DebugDialog::~DebugDialog() {}
+
+void
+DebugDialog::fillText(QTextEdit *tedit, QStringList buffer)
+{
+ foreach(QString line, buffer) {
+ tedit->setPlainText(QString("%1\n%2")
+ .arg(tedit->toPlainText())
+ .arg(line));
+ }
+}
+
+void
+DebugDialog::outputDebug(const QString &msg)
+{
+ outputBuffer << msg;
+}
+
+void
+DebugDialog::syntaxDebug(const QString &msg)
+{
+ syntaxBuffer << msg;
+}
+
+void
+DebugDialog::exceptDebug(const QString &msg)
+{
+ exceptBuffer << msg;
+}
+
+void
+DebugDialog::clear()
+{
+ outputBuffer.clear();
+ syntaxBuffer.clear();
+ exceptBuffer.clear();
+}
diff --git a/src/vidalia/plugin/DebugDialog.h b/src/vidalia/plugin/DebugDialog.h
new file mode 100644
index 0000000..7f6ff0a
--- /dev/null
+++ b/src/vidalia/plugin/DebugDialog.h
@@ -0,0 +1,49 @@
+/*
+** 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 DebugDialog.h
+** \brief Simple dialog to see exceptions, syntaxis problems, and general
+** output for pluging
+*/
+
+#ifndef DEBUGDIALOG_H
+#define DEBUGDIALOG_H
+
+#include <QtGui>
+
+#include "ui_DebugDialog.h"
+
+class DebugDialog : public QDialog
+{
+ Q_OBJECT
+
+ public:
+ DebugDialog(QWidget *parent = 0);
+ ~DebugDialog();
+
+ void fillText(QTextEdit *tedit, QStringList buffer);
+
+ static void outputDebug(const QString &msg);
+ static void syntaxDebug(const QString &msg);
+ static void exceptDebug(const QString &msg);
+
+ static void clear();
+
+ private:
+ static QStringList outputBuffer;
+ static QStringList syntaxBuffer;
+ static QStringList exceptBuffer;
+
+ Ui::DebugDialog ui;
+};
+
+#endif
+
diff --git a/src/vidalia/plugin/DebugDialog.ui b/src/vidalia/plugin/DebugDialog.ui
new file mode 100644
index 0000000..1107c3a
--- /dev/null
+++ b/src/vidalia/plugin/DebugDialog.ui
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DebugDialog</class>
+ <widget class="QDialog" name="DebugDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>491</width>
+ <height>254</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Plugin debug output</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/applications-system.png</normaloff>:/images/16x16/applications-system.png</iconset>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="outputTab">
+ <attribute name="title">
+ <string>Plugin Output</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTextEdit" name="tedOutput"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="syntaxTab">
+ <attribute name="title">
+ <string>Syntax Errors</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QTextEdit" name="tedSyntax"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="errorTab">
+ <attribute name="title">
+ <string>Exceptions</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QTextEdit" name="tedExceptions"/>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp
new file mode 100644
index 0000000..b3c35c1
--- /dev/null
+++ b/src/vidalia/plugin/PluginEngine.cpp
@@ -0,0 +1,221 @@
+/*
+** 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 PluginEngine.cpp
+** \brief Engine that handles all plugin related features
+*/
+
+#include "PluginEngine.h"
+#include "VidaliaSettings.h"
+#include "PluginWrapper.h"
+#include "DebugDialog.h"
+
+#include "Vidalia.h"
+
+PluginEngine::PluginEngine(QObject *parent)
+ : QScriptEngine(parent)
+{
+ ADD_PROTOTYPE(VidaliaTabPrototype)
+ MAKE_CREATABLE(VidaliaTabPrototype)
+ ADD_PROTOTYPE(HelperProcessPrototype)
+ MAKE_CREATABLE(HelperProcessPrototype)
+ ADD_PROTOTYPE(TorControlPrototype)
+
+ globalObject().setProperty("torControl", newQObject(Vidalia::torControl()));
+ globalObject().setProperty("vidaliaApp", newQObject(vApp));
+
+// globalObject().setProperty("include", newFunction(includeScript));
+ globalObject().setProperty("importExtension", newFunction(importExtension));
+ globalObject().setProperty("vdebug", newFunction(vdebug));
+ globalObject().setProperty("findWidget", newFunction(findWidget));
+ globalObject().setProperty("sleep", newFunction(sleep));
+
+ VidaliaSettings settings;
+ globalObject().setProperty("pluginPath", QScriptValue(settings.pluginPath()));
+
+ DebugDialog::outputDebug("Available extensions:");
+ foreach(QString ext, availableExtensions())
+ DebugDialog::outputDebug(QString(" %1").arg(ext));
+
+ loadAllPlugins();
+}
+
+PluginEngine::~PluginEngine()
+{
+ foreach(PluginWrapper *wrapper, wrappers)
+ wrapper->stop();
+}
+
+void
+PluginEngine::loadAllPlugins()
+{
+ DebugDialog::outputDebug("Loading all plugins...");
+
+ VidaliaSettings settings;
+ QDir path = QDir(settings.pluginPath());
+
+ DebugDialog::outputDebug(QString("PluginPath=%1").arg(path.absolutePath()));
+
+ foreach(QString pdir, path.entryList(QDir::NoDotAndDotDot|QDir::AllDirs)) {
+ QFileInfo finfo(QString("%1%2%3")
+ .arg(path.absolutePath())
+ .arg(QDir::separator())
+ .arg(pdir));
+
+ if(finfo.isDir()) {
+ tryLoadPlugin(finfo.filePath());
+ }
+ }
+}
+
+void
+PluginEngine::tryLoadPlugin(QDir path)
+{
+ QStringList files = path.entryList();
+
+ if(!files.contains("info.xml")) {
+ DebugDialog::outputDebug(tr("WARNING: %1 doesn't have an info file.")
+ .arg(path.absolutePath()));
+ return;
+ }
+
+ PluginWrapper *wrapper = new PluginWrapper(QString("%1%2info.xml")
+ .arg(path.absolutePath())
+ .arg(QDir::separator()), this);
+
+ // if it's persistent, start it right away
+ if(wrapper->isPersistent()) {
+ wrapper->start();
+ }
+
+ wrappers << wrapper;
+
+ connect(wrapper, SIGNAL(pluginTab(VidaliaTab *)), this, SIGNAL(pluginTab(VidaliaTab *)));
+}
+
+QList<QAction *>
+PluginEngine::getAllActions()
+{
+ QList<QAction *> actions;
+ foreach(PluginWrapper *wrapper, wrappers)
+ actions << wrapper->menuAction();
+
+ return actions;
+}
+
+QScriptValue
+PluginEngine::importExtension(QScriptContext *context, QScriptEngine *engine)
+{
+ return engine->importExtension(context->argument(0).toString());
+}
+
+//QScriptValue
+//PluginEngine::includeScript(QScriptContext *context, QScriptEngine *engine)
+//{
+// VidaliaSettings settings;
+// QString path = settings.pluginPath();
+// QString importFile = context->argument(0).toString();
+// QFileInfo importInfo(importFile);
+// if (importInfo.isRelative()) {
+// importFile = path + "/" + importInfo.filePath();
+// }
+
+// if (!loadFile(importFile, engine)) {
+// return context->throwError(QString("Failed to resolve include: %1").arg(importFile));
+// }
+// return engine->toScriptValue(true);
+//}
+
+//bool
+//PluginEngine::loadFile(QString fileName, QScriptEngine *engine)
+//{
+// static QSet<QString> loadedFiles;
+// QFileInfo fileInfo(fileName);
+// QString absoluteFileName = fileInfo.absoluteFilePath();
+// QString absolutePath = fileInfo.absolutePath();
+// QString canonicalFileName = fileInfo.canonicalFilePath();
+// if (loadedFiles.contains(canonicalFileName)) {
+// return true;
+// }
+// loadedFiles.insert(canonicalFileName);
+// QString path = fileInfo.path();
+
+// QFile file(fileName);
+// if (file.open(QFile::ReadOnly)) {
+// QTextStream stream(&file);
+// QString contents = stream.readAll();
+// file.close();
+
+// QScriptValue r = engine->evaluate(contents);
+// if (engine->hasUncaughtException()) {
+// QStringList backtrace = engine->uncaughtExceptionBacktrace();
+// qDebug() << QString(" %1\n%2\n\n").arg(r.toString()).arg(backtrace.join("\n"));
+// return true;
+// }
+// } else {
+// return false;
+// }
+// return true;
+//}
+
+QScriptValue
+PluginEngine::vdebug(QScriptContext *context, QScriptEngine *engine)
+{
+ QString result;
+ for(int i = 0; i<context->argumentCount(); i++) {
+ if(i>0)
+ result.append(" ");
+ result.append(context->argument(i).toString());
+ }
+
+ vInfo(result);
+
+ return engine->undefinedValue();
+}
+
+QScriptValue
+PluginEngine::findWidget(QScriptContext *context, QScriptEngine *engine)
+{
+ if(context->argumentCount() != 2)
+ return context->throwError(QString("findWidget called with the wrong argument count. Expected 2."));
+
+ QWidget *widget = qscriptvalue_cast<QWidget *>(context->argument(0));
+ QString name = context->argument(1).toString();
+
+ QObjectList list = widget->children();
+ QScriptValue ret = engine->nullValue();
+
+ for(int i = 0; i < list.length(); i++) {
+ if(list[i]->objectName() == name) {
+ ret = QScriptValue(i);
+ break;
+ }
+ }
+
+ return ret;
+}
+
+QScriptValue
+PluginEngine::sleep(QScriptContext *context, QScriptEngine *engine)
+{
+ if(context->argumentCount() != 1)
+ return context->throwError(QString("sleep must be called with 1 parameter."));
+
+ int s = context->argument(1).toInt32();
+
+#if defined(Q_WS_WIN)
+ Sleep(s*1000);
+#else
+ !::sleep(s);
+#endif
+
+ return engine->nullValue();
+}
diff --git a/src/vidalia/plugin/PluginEngine.h b/src/vidalia/plugin/PluginEngine.h
new file mode 100644
index 0000000..eea0d81
--- /dev/null
+++ b/src/vidalia/plugin/PluginEngine.h
@@ -0,0 +1,62 @@
+/*
+** 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 PluginEngine.h
+** \brief Engine that handles all plugin related features
+*/
+
+#ifndef PLUGINENGINE_H
+#define PLUGINENGINE_H
+
+#include <QtGui>
+#include <QtScript>
+
+#include "VidaliaTabPrototype.h"
+#include "HelperProcessPrototype.h"
+#include "TorControlPrototype.h"
+
+class PluginWrapper;
+
+#define ADD_PROTOTYPE(protoType) \
+ QScriptValue __script##protoType = newQObject(new protoType); \
+ setDefaultPrototype(protoType::metaTypeId(), __script##protoType); \
+
+#define MAKE_CREATABLE(protoType) \
+ globalObject().setProperty(protoType::name(), newFunction(protoType::constructor, __script##protoType));
+
+class PluginEngine : public QScriptEngine {
+ Q_OBJECT
+
+ public:
+ PluginEngine(QObject *parent = 0);
+ ~PluginEngine();
+
+ QList<QAction *> getAllActions();
+
+ signals:
+ void pluginTab(VidaliaTab *);
+
+ protected:
+ static QScriptValue importExtension(QScriptContext *context, QScriptEngine *engine);
+// static bool loadFile(QString fileName, QScriptEngine *engine);
+// static QScriptValue includeScript(QScriptContext *context, QScriptEngine *engine);
+ static QScriptValue vdebug(QScriptContext *context, QScriptEngine *engine);
+ static QScriptValue findWidget(QScriptContext *context, QScriptEngine *engine);
+ static QScriptValue sleep(QScriptContext *context, QScriptEngine *engine);
+
+ void loadAllPlugins();
+ void tryLoadPlugin(QDir path);
+
+ QList<PluginWrapper *> wrappers;
+};
+
+#endif
+
diff --git a/src/vidalia/plugin/PluginWrapper.cpp b/src/vidalia/plugin/PluginWrapper.cpp
new file mode 100644
index 0000000..476b1db
--- /dev/null
+++ b/src/vidalia/plugin/PluginWrapper.cpp
@@ -0,0 +1,244 @@
+/*
+** 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 PluginWrapper.cpp
+** \brief Wrapper for the plugin scripts
+*/
+
+#include "PluginWrapper.h"
+#include "PluginEngine.h"
+#include "DebugDialog.h"
+#include "Vidalia.h"
+
+#include <QtXml>
+
+PluginWrapper::PluginWrapper(const QString &info_path, PluginEngine *engine, QObject *parent)
+ : QObject(parent), _engine(engine)
+{
+ _action = 0;
+ _gui = false;
+ _persistent = false;
+ processInfo(info_path);
+
+ foreach(QString path, _files) {
+ DebugDialog::outputDebug(tr("%1: Processing...").arg(name()));
+
+ QFile file(path);
+ if(file.open(QIODevice::ReadOnly)) {
+ QString contents = file.readAll();
+ QScriptSyntaxCheckResult res = QScriptEngine::checkSyntax(contents);
+ if(res.state() == QScriptSyntaxCheckResult::Valid) {
+ DebugDialog::outputDebug("Everything's ok, evaluating...");
+ _engine->evaluate(contents);
+ checkExceptions();
+ } else {
+ DebugDialog::syntaxDebug(tr("%4: ERROR: Line: %1 - Column: %2\n%3")
+ .arg(res.errorLineNumber())
+ .arg(res.errorColumnNumber())
+ .arg(res.errorMessage())
+ .arg(name()));
+ }
+ } else
+ DebugDialog::outputDebug(tr("%1: Error opening file %2")
+ .arg(name()).arg(path));
+ }
+}
+
+PluginWrapper::~PluginWrapper() {}
+
+void
+PluginWrapper::processInfo(const QString &path)
+{
+ QDomDocument info("Plugin Info");
+ QFile file(path);
+ if(!file.open(QIODevice::ReadOnly)) {
+ DebugDialog::outputDebug(tr("%2: ERROR: Cannot open %1")
+ .arg(path).arg(name()));
+ return;
+ }
+
+ QString errMsg;
+ int errLine, errCol;
+
+ if(!info.setContent(&file, false, &errMsg, &errLine, &errCol)) {
+ DebugDialog::syntaxDebug(tr("%2: ERROR: Parsing %1")
+ .arg(file.fileName()).arg(name()));
+ DebugDialog::syntaxDebug(tr("Line: %1 - Column: %2\nMessage: %3")
+ .arg(errLine).arg(errCol).arg(errMsg));
+
+ file.close();
+ return;
+ }
+
+ QDomElement root = info.documentElement();
+
+ if(root.tagName() != "VidaliaPlugin") {
+ return;
+ }
+
+ QDomNode n = root.firstChild();
+ while(!n.isNull()) {
+ QDomElement e = n.toElement();
+ if(!e.isNull()) {
+ if(e.tagName() == "name")
+ _name = e.text();
+ else if(e.tagName() == "author")
+ _author = e.text();
+ else if(e.tagName() == "date")
+ _date = e.text();
+ else if(e.tagName() == "type") {
+ _persistent = (e.attribute("persistent", "false") == "true");
+ _gui = (e.attribute("gui", "false") == "true");
+ } else if(e.tagName() == "files") {
+ QDomNode froot = e.firstChild();
+ while(!froot.isNull()) {
+ QDomElement fe = froot.toElement();
+ if(fe.tagName() == "file")
+ _files << QString("%1%2%3").arg(QFileInfo(path).path()).arg(QDir::separator()).arg(fe.text());
+ froot = froot.nextSibling();
+ }
+ } else if(e.tagName() == "namespace") {
+ _nspace = e.text();
+ }
+ }
+ n = n.nextSibling();
+ }
+
+ file.close();
+}
+
+void
+PluginWrapper::start()
+{
+ DebugDialog::outputDebug(tr("%1: Starting...").arg(name()));
+ _engine->evaluate(QString("%1.start()").arg(nspace()));
+ checkExceptions();
+}
+
+void
+PluginWrapper::stop()
+{
+ DebugDialog::outputDebug(tr("%1: Stoping...").arg(name()));
+ _engine->evaluate(QString("%1.stop()").arg(nspace()));
+ checkExceptions();
+}
+
+VidaliaTab *
+PluginWrapper::buildGUI()
+{
+ if(!hasGUI()) {
+ DebugDialog::outputDebug(tr("%1: WARNING: doesn't have a GUI, and buildGUI() was called")
+ .arg(name()));
+ if(checkExceptions())
+ return NULL;
+ }
+
+ VidaliaTab *tab = qscriptvalue_cast<VidaliaTab *>(
+ _engine->evaluate(QString("%1.buildGUI()").arg(nspace())));
+
+ if(checkExceptions())
+ return NULL;
+
+ return tab;
+}
+
+bool
+PluginWrapper::checkExceptions()
+{
+ if(_engine->hasUncaughtException()) {
+ DebugDialog::exceptDebug(tr("%2:\n*** Exception in line %1")
+ .arg(_engine->uncaughtExceptionLineNumber())
+ .arg(_engine->uncaughtException().toString()));
+ DebugDialog::exceptDebug(tr("*** Backtrace:"));
+ foreach(QString line, _engine->uncaughtExceptionBacktrace()) {
+ vInfo(line);
+ DebugDialog::exceptDebug(line);
+ }
+
+ _engine->clearExceptions();
+
+ return true;
+ }
+
+ return false;
+}
+
+bool
+PluginWrapper::hasGUI()
+{
+ return _gui;
+}
+
+bool
+PluginWrapper::isPersistent()
+{
+ return _persistent;
+}
+
+QString
+PluginWrapper::name() const
+{
+ if(_name.isEmpty())
+ return tr("(untitled)");
+ return _name;
+}
+
+QString
+PluginWrapper::date() const
+{
+ return _date;
+}
+
+QString
+PluginWrapper::author() const
+{
+ return _author;
+}
+
+QString
+PluginWrapper::nspace() const
+{
+ return _nspace;
+}
+
+QStringList
+PluginWrapper::files() const
+{
+ return _files;
+}
+
+QAction *
+PluginWrapper::menuAction()
+{
+ _action = new QAction(_name, this);
+
+ if(hasGUI()) {
+ connect(_action, SIGNAL(triggered()), this, SLOT(emitPluginTab()));
+ }
+
+ // if it hasn't been started yet
+ if(!isPersistent()) {
+ connect(_action, SIGNAL(triggered()), this, SLOT(start()));
+ }
+
+ return _action;
+}
+
+void
+PluginWrapper::emitPluginTab()
+{
+ VidaliaTab *tab = buildGUI();
+ if(tab)
+ emit pluginTab(tab);
+ else
+ DebugDialog::exceptDebug(tr("Error: buildGUI() failed for plugin %1")
+ .arg(name()));
+}
diff --git a/src/vidalia/plugin/PluginWrapper.h b/src/vidalia/plugin/PluginWrapper.h
new file mode 100644
index 0000000..1253bee
--- /dev/null
+++ b/src/vidalia/plugin/PluginWrapper.h
@@ -0,0 +1,68 @@
+/*
+** 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 PluginWrapper.h
+** \brief Wrapper for the plugin scripts
+*/
+
+#ifndef PLUGINWRAPPER_H
+#define PLUGINWRAPPER_H
+
+#include <QtCore>
+
+#include "VidaliaTab.h"
+
+class PluginEngine;
+
+class PluginWrapper : public QObject {
+ Q_OBJECT
+
+ public:
+ PluginWrapper(const QString &info_path, PluginEngine *engine, QObject *parent = 0);
+ ~PluginWrapper();
+
+ bool hasGUI();
+ bool isPersistent();
+
+ QString name() const;
+ QString date() const;
+ QString author() const;
+ QString nspace() const;
+ QStringList files() const;
+
+ QAction *menuAction();
+
+ signals:
+ void pluginTab(VidaliaTab *);
+
+ public slots:
+ void start();
+ void stop();
+ VidaliaTab *buildGUI();
+
+ private slots:
+ void emitPluginTab();
+
+ protected:
+ void processInfo(const QString &path);
+ bool checkExceptions();
+
+ PluginEngine *_engine;
+ QString _name, _date, _author;
+ bool _persistent, _gui;
+ QStringList _files;
+ QString _nspace;
+
+ QAction *_action;
+};
+
+#endif
+
diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp
new file mode 100644
index 0000000..2de8cf6
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp
@@ -0,0 +1,100 @@
+/*
+** 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 HelperProcessPrototype.cpp
+** \brief Prototype for the HelperProcess class
+*/
+
+#include "HelperProcessPrototype.h"
+
+HelperProcessPrototype::HelperProcessPrototype(QObject *parent)
+ : QObject(parent)
+{}
+
+QScriptValue
+HelperProcessPrototype::constructor(QScriptContext *context, QScriptEngine *engine)
+{
+ return engine->newQObject(new HelperProcess(), QScriptEngine::ScriptOwnership);
+}
+
+int
+HelperProcessPrototype::metaTypeId()
+{
+ return qMetaTypeId<HelperProcess *>();
+}
+
+QString
+HelperProcessPrototype::name()
+{
+ return QString("HelperProcess");
+}
+
+void
+HelperProcessPrototype::start(const QString &app, const QString &args)
+{
+ HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject());
+
+ if(obj)
+ obj->start(app, args);
+}
+
+void
+HelperProcessPrototype::start(const QString &app, const QStringList &args)
+{
+ HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject());
+
+ if(obj)
+ obj->start(app, args);
+}
+
+bool
+HelperProcessPrototype::isDone() const
+{
+ HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject());
+
+ if(obj)
+ return obj->isDone();
+}
+
+QStringList
+HelperProcessPrototype::systemEnvironment()
+{
+ return HelperProcess::systemEnvironment();
+}
+
+void
+HelperProcessPrototype::setEnvironment(const QStringList &env)
+{
+ HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject());
+
+ if(obj)
+ obj->setEnvironment(env);
+}
+
+HelperProcess::ProcessState
+HelperProcessPrototype::state()
+{
+ HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject());
+
+ if(obj)
+ return obj->state();
+
+ return HelperProcess::NotRunning;
+}
+
+void
+HelperProcessPrototype::toForeground()
+{
+ HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject());
+
+ if(obj)
+ obj->toForeground();
+}
diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h
new file mode 100644
index 0000000..671a9f4
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h
@@ -0,0 +1,32 @@
+#ifndef HELPERPROCESSPROT_H
+#define HELPERPROCESSPROT_H
+
+#include <QtGui>
+#include <QtScript>
+
+#include "HelperProcess.h"
+
+class HelperProcessPrototype : public QObject, public QScriptable
+{
+ Q_OBJECT
+
+ public:
+ HelperProcessPrototype(QObject *parent = 0);
+ static QScriptValue constructor(QScriptContext *context, QScriptEngine *engine);
+ static int metaTypeId();
+ static QString name();
+
+ Q_INVOKABLE void start(const QString &app, const QString &args);
+ Q_INVOKABLE void start(const QString &app, const QStringList &args);
+ Q_INVOKABLE bool isDone() const;
+ Q_INVOKABLE QStringList systemEnvironment();
+ Q_INVOKABLE void setEnvironment(const QStringList &env);
+ Q_INVOKABLE QProcess::ProcessState state();
+ Q_INVOKABLE void toForeground();
+};
+
+Q_DECLARE_METATYPE(HelperProcess *);
+
+#endif
+
+
diff --git a/src/vidalia/plugin/prototypes/TorControlPrototype.cpp b/src/vidalia/plugin/prototypes/TorControlPrototype.cpp
new file mode 100644
index 0000000..742a428
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/TorControlPrototype.cpp
@@ -0,0 +1,428 @@
+/*
+** 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 TorControlPrototype.cpp
+** \brief Prototype for TorControl class
+*/
+
+#include "TorControlPrototype.h"
+
+#define GET_AND_CALL(type, func, res) \
+ type obj = qscriptvalue_cast<type>(thisObject()); \
+ if(obj) \
+ res = obj->func;
+
+#define MERGE2(result, errmsg) \
+ QVariant(QList<QVariant>() << result << errmsg);
+
+#define DEF_TYPE0(type, retType, func, call) \
+retType \
+type##Prototype::func \
+{ \
+ type *obj = qscriptvalue_cast<type *>(thisObject()); \
+ if(obj) \
+ return obj->call; \
+}
+
+#define DEF_TYPE1(type, resType, func, call) \
+QVariant \
+type##Prototype::func \
+{ \
+ resType res; \
+ QString errmsg; \
+\
+ type *obj = qscriptvalue_cast<type *>(thisObject()); \
+ if(obj) \
+ res = obj->call; \
+ QList<QVariant> vals; \
+ vals << res << QVariant(errmsg); \
+\
+ return vals; \
+}
+
+#define DEF_TYPE2(type, resType, ansType, func, call) \
+QVariant \
+type##Prototype::func \
+{ \
+ resType res; \
+ ansType ans; \
+ QString errmsg; \
+\
+ type *obj = qscriptvalue_cast<type *>(thisObject()); \
+ if(obj) \
+ res = obj->call; \
+ QList<QVariant> vals; \
+ vals << QVariant(ans) << res << QVariant(errmsg); \
+\
+ return vals; \
+}
+
+TorControlPrototype::TorControlPrototype()
+ : QObject(), QScriptable() {}
+
+int
+TorControlPrototype::metaTypeId() {
+ return qMetaTypeId<TorControl *>();
+}
+
+QString
+TorControlPrototype::name() {
+ return QString("TorControl");
+}
+
+DEF_TYPE0(TorControl, void,
+ start(const QString &tor, const QStringList &args),
+ start(tor, args))
+
+DEF_TYPE1(TorControl, bool,
+ stop(),
+ stop(&errmsg))
+
+DEF_TYPE0(TorControl, bool,
+ isRunning(),
+ isRunning())
+
+DEF_TYPE0(TorControl, bool,
+ isVidaliaRunningTor(),
+ isVidaliaRunningTor())
+
+DEF_TYPE0(TorControl, void,
+ closeTorStdout(),
+ closeTorStdout())
+
+DEF_TYPE0(TorControl, void,
+ connect(const QHostAddress &address, quint16 port),
+ connect(address, port))
+
+DEF_TYPE0(TorControl, void,
+ connect(const QString &path),
+ connect(path))
+
+DEF_TYPE0(TorControl, void,
+ disconnect(),
+ disconnect())
+
+DEF_TYPE0(TorControl, bool,
+ isConnected(),
+ isConnected())
+
+DEF_TYPE1(TorControl, bool,
+ authenticate(const QByteArray cookie),
+ authenticate(cookie, &errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ authenticate(const QString &password),
+ authenticate(password, &errmsg))
+
+// TODO: make a QVariant for this two
+//QVariant
+//TorControlPrototype::protocolInfo()
+//{
+// ProtocolInfo info;
+// QString errmsg;
+
+// GET_AND_CALL(TorControl *, protocolInfo(&errmsg), info)
+
+// return MERGE2(info, errmsg);
+//}
+
+//BootstrapStatus
+//TorControlPrototype::bootstrapStatus(QString *errmsg)
+//{
+// BootstrapStatus status;
+// QString errmsg;
+
+// GET_AND_CALL(TorControl *, protocolInfo(&errmsg), status)
+
+// return MERGE2(status, errmsg);
+//}
+
+DEF_TYPE0(TorControl, bool,
+ isCircuitEstablished(),
+ isCircuitEstablished())
+
+DEF_TYPE1(TorControl, bool,
+ getInfo(QHash<QString,QString> &map),
+ getInfo(map, &errmsg))
+
+// TODO: this one may be useless
+//QVariant
+//TorControlPrototype::getInfo(QString key)
+//{
+// TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+// QString val, *errmsg = new QString();
+// bool res = false;
+// QList<QVariant> vals;
+
+// if(obj)
+// res = obj->getInfo(key, val, errmsg);
+
+// vals.append(QVariant(res));
+// vals.append(QVariant(val));
+// vals.append(QVariant(*errmsg));
+
+// return QVariant(vals);
+//}
+
+// TODO: There is no StringList, this may be useless
+//DEF_TYPE1(TorControl, QVariantMap,
+// getInfo(const QStringList &keys),
+// getInfo(keys, &errmsg))
+
+DEF_TYPE1(TorControl, QVariant,
+ getInfo(const QString &key),
+ getInfo(key, &errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ signal(TorSignal::Signal sig),
+ signal(sig, &errmsg))
+
+// TODO: QVariant don't like QHostAddress
+//DEF_TYPE1(TorControl, QHostAddress,
+// getSocksAddress(),
+// getSocksAddress(&errmsg))
+
+// TODO: make it a QVariant(QList<QVariant>() << QVariant(QString) <<
+// QVariant(QString) ...
+QStringList
+TorControlPrototype::getSocksAddressList(QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getSocksAddressList(errmsg);
+}
+
+DEF_TYPE1(TorControl, quint16,
+ getSocksPort(),
+ getSocksPort(&errmsg))
+
+// TODO: same as getSocksAddressList but with quint16
+QList<quint16>
+TorControlPrototype::getSocksPortList(QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getSocksPortList(errmsg);
+}
+
+DEF_TYPE0(TorControl, QString,
+ getTorVersionString(),
+ getTorVersionString())
+
+DEF_TYPE0(TorControl, quint32,
+ getTorVersion(),
+ getTorVersion())
+
+DEF_TYPE1(TorControl, bool,
+ setEvent(TorEvents::Event e, bool add, bool set),
+ setEvent(e, add, set, &errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ setEvents(),
+ setEvents(&errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ setConf(QHash<QString,QString> map),
+ setConf(map, &errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ setConf(QString key, QString value),
+ setConf(key, value, &errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ setConf(QString keyAndValue),
+ setConf(keyAndValue, &errmsg))
+
+// TODO: macros don't like template variables
+// do this one by hand
+//DEF_TYPE2(TorControl, bool, QHash<QString,QString>,
+// getConf(QHash<QString,QString> &map),
+// getConf(map, &errmsg))
+bool
+TorControlPrototype::getConf(QHash<QString,QString> &map, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getConf(map, errmsg);
+}
+
+// TODO: this one too
+bool
+TorControlPrototype::getConf(QHash<QString,QStringList> &map, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getConf(map, errmsg);
+}
+
+DEF_TYPE2(TorControl, bool, QString,
+ getConf(QString key),
+ getConf(key, ans, &errmsg))
+
+// TODO: same as the last one with StringList
+bool
+TorControlPrototype::getConf(QString key, QStringList &value, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getConf(key, value, errmsg);
+}
+
+// TODO: idem
+QVariantMap
+TorControlPrototype::getConf(const QStringList &keys, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getConf(keys, errmsg);
+}
+
+// TODO: possibly useless
+//QVariant
+//TorControlPrototype::getConf(const QString &key, QString *errmsg)
+//{
+// TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+// if(obj)
+// return obj->getConf(key, errmsg);
+//}
+
+DEF_TYPE1(TorControl, QString,
+ getHiddenServiceConf(const QString &key),
+ getHiddenServiceConf(key, &errmsg))
+
+DEF_TYPE1(TorControl, bool,
+ saveConf(),
+ saveConf(&errmsg))
+
+// TODO: another stringlist one
+bool
+TorControlPrototype::resetConf(QStringList keys, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->resetConf(keys, errmsg);
+}
+
+DEF_TYPE1(TorControl, bool,
+ resetConf(QString key),
+ resetConf(key, &errmsg))
+
+// TODO: you know
+QStringList
+TorControlPrototype::getRouterDescriptorText(const QString &id, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getRouterDescriptorText(id, errmsg);
+}
+
+// TODO: QVariantize RouterDescriptor
+RouterDescriptor
+TorControlPrototype::getRouterDescriptor(const QString &id, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getRouterDescriptor(id, errmsg);
+}
+
+// TODO: QVariantize RouterStatus
+RouterStatus
+TorControlPrototype::getRouterStatus(const QString &id, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getRouterStatus(id, errmsg);
+}
+
+// TODO: QVariantize NetworkStatus
+NetworkStatus
+TorControlPrototype::getNetworkStatus(QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getNetworkStatus(errmsg);
+}
+
+// TODO: QVariantize DescriptorAnnotations
+DescriptorAnnotations
+TorControlPrototype::getDescriptorAnnotations(const QString &id, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getDescriptorAnnotations(id, errmsg);
+}
+
+// TODO: QVariantize CircuitList
+CircuitList
+TorControlPrototype::getCircuits(QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getCircuits(errmsg);
+}
+
+// TODO: QVariantize StreamList
+StreamList
+TorControlPrototype::getStreams(QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getStreams(errmsg);
+}
+
+// TODO: QVariantize AddressMap
+AddressMap
+TorControlPrototype::getAddressMap(AddressMap::AddressMapType type, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->getAddressMap(type, errmsg);
+}
+
+DEF_TYPE1(TorControl, QString,
+ ipToCountry(const QHostAddress &ip),
+ ipToCountry(ip, &errmsg))
+
+// TODO: migrate CircuitId
+bool
+TorControlPrototype::closeCircuit(const CircuitId &circId, bool ifUnused, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->closeCircuit(circId, ifUnused, errmsg);
+}
+
+// TODO: migrate StreamId
+bool
+TorControlPrototype::closeStream(const StreamId &streamId, QString *errmsg)
+{
+ TorControl *obj = qscriptvalue_cast<TorControl *>(thisObject());
+
+ if(obj)
+ return obj->closeStream(streamId, errmsg);
+}
diff --git a/src/torcontrol/TorControl.h b/src/vidalia/plugin/prototypes/TorControlPrototype.h
similarity index 70%
copy from src/torcontrol/TorControl.h
copy to src/vidalia/plugin/prototypes/TorControlPrototype.h
index c16758c..eb0cc6b 100644
--- a/src/torcontrol/TorControl.h
+++ b/src/vidalia/plugin/prototypes/TorControlPrototype.h
@@ -1,205 +1,180 @@
/*
** 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
+** 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 TorControl.h
-** \brief Object for interacting with the Tor process and control interface
+/*
+** \file TorControlPrototype.h
+** \brief Prototype for TorControl class
*/
-#ifndef _TORCONTROL_H
-#define _TORCONTROL_H
-
-#include "tcglobal.h"
-#include "ControlConnection.h"
-#include "TorProcess.h"
-#include "TorEvents.h"
-#include "TorSignal.h"
-#include "RouterDescriptor.h"
-#include "RouterStatus.h"
-#include "BootstrapStatus.h"
-#include "Circuit.h"
-#include "Stream.h"
-#include "AddressMap.h"
-#include "ControlMethod.h"
-
-#if defined(Q_OS_WIN32)
-#include "TorService.h"
-#endif
-
-#include <QObject>
-#include <QHash>
-#include <QList>
-#include <QStringList>
-#include <QVariantMap>
+#ifndef _TORCONTROLPROTO_H
+#define _TORCONTROLPROTO_H
-class ProtocolInfo;
+#include <QtGui>
+#include <QtScript>
-/** DescriptorAnnotations stores a map of annotation keys to (possibly empty)
- * annotation values. */
-typedef QHash<QString,QString> DescriptorAnnotations;
+#include "TorControl.h"
+#include "ProtocolInfo.h"
-
-class TorControl : public QObject
+class TorControlPrototype : public QObject, QScriptable
{
Q_OBJECT
public:
- /** Default constructor */
- TorControl(ControlMethod::Method method = ControlMethod::Port);
- /** Default destructor */
- ~TorControl();
+ TorControlPrototype();
+
+ static int metaTypeId();
+ static QString name();
/** Start the Tor process */
- void start(const QString &tor, const QStringList &args);
+ Q_INVOKABLE void start(const QString &tor, const QStringList &args);
/** Stop the Tor process */
- bool stop(QString *errmsg = 0);
+ Q_INVOKABLE QVariant stop();
/** Detect if the Tor process is running */
- bool isRunning();
+ Q_INVOKABLE bool isRunning();
/** Detects if the Tor process is running under Vidalia. */
- bool isVidaliaRunningTor();
+ Q_INVOKABLE bool isVidaliaRunningTor();
/** Stops reading log messages from the Tor process's stdout. This has no
* effect if isVidaliaRunningTor() is false. */
- void closeTorStdout();
+ Q_INVOKABLE void closeTorStdout();
/** Connect to Tor's control socket */
- void connect(const QHostAddress &address, quint16 port);
- void connect(const QString &path);
+ Q_INVOKABLE void connect(const QHostAddress &address, quint16 port);
+ Q_INVOKABLE void connect(const QString &path);
/** Disconnect from Tor's control socket */
- void disconnect();
+ Q_INVOKABLE void disconnect();
/** Check if we're connected to Tor's control socket */
- bool isConnected();
+ Q_INVOKABLE bool isConnected();
/** Sends an authentication cookie to Tor. */
- bool authenticate(const QByteArray cookie, QString *errmsg = 0);
+ Q_INVOKABLE QVariant authenticate(const QByteArray cookie);
/** Sends an authentication password to Tor. */
- bool authenticate(const QString &password = QString(), QString *errmsg = 0);
+ Q_INVOKABLE QVariant authenticate(const QString &password = QString());
/** Sends a PROTOCOLINFO command to Tor and parses the response. */
- ProtocolInfo protocolInfo(QString *errmsg = 0);
+// Q_INVOKABLE QVariant protocolInfo();
/** Returns the Tor software's current bootstrap phase and status. */
- BootstrapStatus bootstrapStatus(QString *errmsg = 0);
+// Q_INVOKABLE BootstrapStatus bootstrapStatus(QString *errmsg = 0);
/** Returns true if Tor either has an open circuit or (on Tor >=
* 0.2.0.1-alpha) has previously decided it's able to establish a circuit. */
- bool isCircuitEstablished();
+ Q_INVOKABLE bool isCircuitEstablished();
/** Sends a GETINFO message to Tor based on the given keys */
- bool getInfo(QHash<QString,QString> &map, QString *errmsg = 0);
+ Q_INVOKABLE QVariant getInfo(QHash<QString,QString> &map);
/** Sends a GETINFO message for a single info value to Tor */
- bool getInfo(QString key, QString &val, QString *errmsg = 0);
+// Q_INVOKABLE QVariant getInfo(QString key);
/** Sends a GETINFO message to Tor using the given list of <b>keys</b> and
* returns a QVariantMap containing the specified keys and their values as
* returned by Tor. Returns a default constructed QVariantMap on failure. */
- QVariantMap getInfo(const QStringList &keys, QString *errmsg = 0);
+// Q_INVOKABLE QVariantMap getInfo(const QStringList &keys, QString *errmsg = 0);
/** Sends a GETINFO message to Tor with a single <b>key</b> and returns a
* QVariant containing the value returned by Tor. Returns a default
* constructed QVariant on failure. */
- QVariant getInfo(const QString &key, QString *errmsg = 0);
+ Q_INVOKABLE QVariant getInfo(const QString &key);
/** Sends a signal to Tor */
- bool signal(TorSignal::Signal sig, QString *errmsg = 0);
+ Q_INVOKABLE QVariant signal(TorSignal::Signal sig);
/** Returns an address on which Tor is listening for application
* requests. If none are available, a null QHostAddress is returned. */
- QHostAddress getSocksAddress(QString *errmsg = 0);
+// Q_INVOKABLE QVariant getSocksAddress();
/** Returns a (possibly empty) list of all currently configured
* SocksListenAddress entries. */
- QStringList getSocksAddressList(QString *errmsg = 0);
+ Q_INVOKABLE QStringList getSocksAddressList(QString *errmsg = 0);
/** Returns a valid SOCKS port for Tor, or 0 if Tor is not accepting
* application requests. */
- quint16 getSocksPort(QString *errmsg = 0);
+ Q_INVOKABLE QVariant getSocksPort();
/** Returns a list of all currently configured SOCKS ports. If Tor is not
* accepting any application connections, an empty list will be returned. */
- QList<quint16> getSocksPortList(QString *errmsg = 0);
+ Q_INVOKABLE QList<quint16> getSocksPortList(QString *errmsg = 0);
/** Returns Tor's version as a string. */
- QString getTorVersionString();
+ Q_INVOKABLE QString getTorVersionString();
/** Returns Tor's version as a numeric value. */
- quint32 getTorVersion();
+ Q_INVOKABLE quint32 getTorVersion();
/** Sets an event and its handler. If add is true, then the event is added,
* otherwise it is removed. If set is true, then the given event will be
* registered with Tor. */
- bool setEvent(TorEvents::Event e, bool add = true, bool set = true,
- QString *errmsg = 0);
+ Q_INVOKABLE QVariant setEvent(TorEvents::Event e, bool add = true, bool set = true);
/** Register events of interest with Tor */
- bool setEvents(QString *errmsg = 0);
+ Q_INVOKABLE QVariant setEvents();
/** Sets each configuration key in <b>map</b> to the value associated with its key. */
- bool setConf(QHash<QString,QString> map, QString *errmsg = 0);
+ Q_INVOKABLE QVariant setConf(QHash<QString,QString> map);
/** Sets a single configuration key to the given value. */
- bool setConf(QString key, QString value, QString *errmsg = 0);
+ Q_INVOKABLE QVariant setConf(QString key, QString value);
/** Sets a single configuration string that is formatted <key=escaped value>. */
- bool setConf(QString keyAndValue, QString *errmsg = 0);
+ Q_INVOKABLE QVariant setConf(QString keyAndValue);
/** Gets values for a set of configuration keys, each of which has a single
* value. */
- bool getConf(QHash<QString,QString> &map, QString *errmsg = 0);
+ Q_INVOKABLE bool getConf(QHash<QString,QString> &map, QString *errmsg);
/** Gets a set of configuration keyvalues and stores them in <b>map</b>. */
- bool getConf(QHash<QString,QStringList> &map, QString *errmsg = 0);
+ Q_INVOKABLE bool getConf(QHash<QString,QStringList> &map, QString *errmsg = 0);
/** Gets a single configuration value for <b>key</b>. */
- bool getConf(QString key, QString &value, QString *errmsg = 0);
+ Q_INVOKABLE QVariant getConf(QString key);
/** Gets a list of configuration values for <b>key</b>. */
- bool getConf(QString key, QStringList &value, QString *errmsg = 0);
+ Q_INVOKABLE bool getConf(QString key, QStringList &value, QString *errmsg = 0);
/** Sends a GETCONF message to Tor using the given list of <b>keys</b> and
* returns a QVariantMap containing the specified keys and their values as
* returned by Tor. Returns a default constructed QVariantMap on failure. */
- QVariantMap getConf(const QStringList &keys, QString *errmsg = 0);
+ Q_INVOKABLE QVariantMap getConf(const QStringList &keys, QString *errmsg = 0);
/** Sends a GETCONF message to Tor with a single <b>key</b> and returns a
* QVariant containing the value returned by Tor. Returns a default
* constructed QVariant on failure. */
- QVariant getConf(const QString &key, QString *errmsg = 0);
+// Q_INVOKABLE QVariant getConf(const QString &key, QString *errmsg = 0);
/** Sends a GETCONF message to Tor with the single key and returns a QString
* containing the value returned by Tor */
- QString getHiddenServiceConf(const QString &key, QString *errmsg = 0);
+ Q_INVOKABLE QVariant getHiddenServiceConf(const QString &key);
/** Asks Tor to save the current configuration to its torrc */
- bool saveConf(QString *errmsg = 0);
+ Q_INVOKABLE QVariant saveConf();
/** Tells Tor to reset the given configuration keys back to defaults. */
- bool resetConf(QStringList keys, QString *errmsg = 0);
+ Q_INVOKABLE bool resetConf(QStringList keys, QString *errmsg = 0);
/** Tells Tor to reset a configuration key back to its default value. */
- bool resetConf(QString key, QString *errmsg = 0);
+ Q_INVOKABLE QVariant resetConf(QString key);
/** Returns an unparsed router descriptor for the router whose fingerprint
* matches <b>id</b>. The returned text can later be parsed by the
* RouterDescriptor class. If <b>id</b> is invalid, then an empty
* QStringList is returned. */
- QStringList getRouterDescriptorText(const QString &id, QString *errmsg = 0);
+ Q_INVOKABLE QStringList getRouterDescriptorText(const QString &id, QString *errmsg = 0);
/** Returns the descriptor for the router whose fingerprint matches
* <b>id</b>. If <b>id</b> is invalid or the router's descriptor cannot be
* parsed, then an invalid RouterDescriptor is returned. */
- RouterDescriptor getRouterDescriptor(const QString &id, QString *errmsg = 0);
+ Q_INVOKABLE RouterDescriptor getRouterDescriptor(const QString &id, QString *errmsg = 0);
/** Returns the status of the router whose fingerprint matches <b>id</b>. If
* <b>id</b> is invalid or the router's status cannot be parsed, then an
* invalid RouterStatus is returned. */
- RouterStatus getRouterStatus(const QString &id, QString *errmsg = 0);
+ Q_INVOKABLE RouterStatus getRouterStatus(const QString &id, QString *errmsg = 0);
/** Returns a RouterStatus object for every known router in the network. If
* the network status document cannot be parsed, then an empty NetworkStatus
* is returned. */
- NetworkStatus getNetworkStatus(QString *errmsg = 0);
+ Q_INVOKABLE NetworkStatus getNetworkStatus(QString *errmsg = 0);
/** Returns the annotations for the router whose fingerprint matches
* <b>id</b>. If <b>id</b> is invalid or the router's descriptor cannot be
* parsed, then an empty DescriptorAnnotations is returned and
* <b>errmsg</b> is set if it's not NULL. (Tor >= 0.2.0.13-alpha only) */
- DescriptorAnnotations getDescriptorAnnotations(const QString &id,
+ Q_INVOKABLE DescriptorAnnotations getDescriptorAnnotations(const QString &id,
QString *errmsg = 0);
/** Gets a list of current circuits. */
- CircuitList getCircuits(QString *errmsg = 0);
+ Q_INVOKABLE CircuitList getCircuits(QString *errmsg = 0);
/** Gets a list of current streams. */
- StreamList getStreams(QString *errmsg = 0);
+ Q_INVOKABLE StreamList getStreams(QString *errmsg = 0);
/** Gets a list of address mappings of the type specified by <b>type</b>
* (defaults to <i>AddressMapAll</i>. */
- AddressMap getAddressMap(
+ Q_INVOKABLE AddressMap getAddressMap(
AddressMap::AddressMapType type = AddressMap::AddressMapAll,
QString *errmsg = 0);
@@ -207,10 +182,7 @@ public:
* Returns a default-constructed QString on failure or if a country code
* is not known for <b>ip</b>. On failure, <b>errmsg</b> will be set if
* it's not NULL. */
- QString ipToCountry(const QHostAddress &ip, QString *errmsg = 0);
-
- /** Takes ownership of the tor process it's communicating to */
- bool takeOwnership(QString *errmsg);
+ Q_INVOKABLE QVariant ipToCountry(const QHostAddress &ip);
public slots:
/** Closes the circuit specified by <b>circId</b>. If <b>ifUnused</b> is
@@ -375,40 +347,10 @@ signals:
* server descriptor.
*/
void serverDescriptorAccepted();
-
-private:
- /** Instantiates a connection used to talk to Tor's control port */
- ControlConnection* _controlConn;
- /** Manages and monitors the Tor process */
- TorProcess* _torProcess;
- /** Keep track of which events we're interested in */
- TorEvents* _eventHandler;
- TorEvents::Events _events;
- /** The version of Tor we're currently talking to. */
- QString _torVersion;
- ControlMethod::Method _method;
-#if defined(Q_OS_WIN32)
- /** Manages the Tor service, if supported and enabled */
- TorService* _torService;
-#endif
-
- /** Send a message to Tor and read the response */
- bool send(ControlCommand cmd, ControlReply &reply, QString *errmsg = 0);
- /** Send a message to Tor and discard the response */
- bool send(ControlCommand cmd, QString *errmsg = 0);
- /** Tells Tor the controller wants to enable <b>feature</b> via the
- * USEFEATURE control command. Returns true if the given feature was
- * successfully enabled. */
- bool useFeature(const QString &feature, QString *errmsg = 0);
-
-/* The slots below simply relay signals from the appropriate member objects */
-private slots:
- void onStopped(int exitCode, QProcess::ExitStatus exitStatus);
- void getBootstrapPhase();
- void onDisconnected();
- void onLogStdout(const QString &severity, const QString &message);
- void onAuthenticated();
};
+Q_DECLARE_METATYPE(TorControl *);
+
#endif
+
diff --git a/src/vidalia/plugin/prototypes/VidaliaTabPrototype.cpp b/src/vidalia/plugin/prototypes/VidaliaTabPrototype.cpp
new file mode 100644
index 0000000..8f71a37
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/VidaliaTabPrototype.cpp
@@ -0,0 +1,75 @@
+/*
+** 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 VidaliaTabPrototype.cpp
+** \brief Prototype for VidaliaTab class
+*/
+
+#include "VidaliaTabPrototype.h"
+
+VidaliaTabPrototype::VidaliaTabPrototype(QObject *parent)
+ : QObject(parent)
+{}
+
+QScriptValue
+VidaliaTabPrototype::constructor(QScriptContext *context, QScriptEngine *engine)
+{
+ if((context->argumentCount() > 2) or (context->argumentCount() < 1))
+ return QScriptValue(QScriptValue::NullValue);
+
+ QString title = "";
+ QString name = "";
+
+ title = qscriptvalue_cast<QString>(context->argument(0));
+ if(context->argumentCount() > 1)
+ name = qscriptvalue_cast<QString>(context->argument(1));
+
+ return engine->newQObject(new VidaliaTab(title, name), QScriptEngine::ScriptOwnership);
+}
+
+int
+VidaliaTabPrototype::metaTypeId()
+{
+ return qMetaTypeId<VidaliaTab *>();
+}
+
+QString
+VidaliaTabPrototype::name()
+{
+ return QString("VidaliaTab");
+}
+
+void
+VidaliaTabPrototype::setLayout(QLayout *layout)
+{
+ VidaliaTab *obj = qscriptvalue_cast<VidaliaTab *>(thisObject());
+
+ if(obj)
+ obj->setLayout(layout);
+}
+
+QVariant
+VidaliaTabPrototype::getSetting(QString name, QVariant defaultValue)
+{
+ VidaliaTab *obj = qscriptvalue_cast<VidaliaTab *>(thisObject());
+
+ if(obj)
+ return obj->getSetting(name, defaultValue);
+}
+
+void
+VidaliaTabPrototype::saveSetting(QString name, QVariant value)
+{
+ VidaliaTab *obj = qscriptvalue_cast<VidaliaTab *>(thisObject());
+
+ if(obj)
+ obj->saveSetting(name, value);
+}
diff --git a/src/vidalia/plugin/prototypes/VidaliaTabPrototype.h b/src/vidalia/plugin/prototypes/VidaliaTabPrototype.h
new file mode 100644
index 0000000..dcc355b
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/VidaliaTabPrototype.h
@@ -0,0 +1,42 @@
+/*
+** 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 VidaliaTabPrototype.h
+** \brief Prototype for VidaliaTab class
+*/
+
+#ifndef VIDALIATABPROT_H
+#define VIDALIATABPROT_H
+
+#include <QtGui>
+#include <QtScript>
+
+#include "VidaliaTab.h"
+
+class VidaliaTabPrototype : public QObject, public QScriptable
+{
+ Q_OBJECT
+
+ public:
+ VidaliaTabPrototype(QObject *parent = 0);
+ static QScriptValue constructor(QScriptContext *context, QScriptEngine *engine);
+ static int metaTypeId();
+ static QString name();
+
+ Q_INVOKABLE void setLayout(QLayout *layout);
+ Q_INVOKABLE QVariant getSetting(QString name, QVariant defaultValue);
+ Q_INVOKABLE void saveSetting(QString name, QVariant value);
+};
+
+Q_DECLARE_METATYPE(VidaliaTab *);
+
+#endif
+
diff --git a/src/vidalia/res/16x16/detach-arrow.png b/src/vidalia/res/16x16/detach-arrow.png
new file mode 100644
index 0000000..8beaf74
Binary files /dev/null and b/src/vidalia/res/16x16/detach-arrow.png differ
diff --git a/src/vidalia/res/credits.html b/src/vidalia/res/credits.html
index c73c1cc..28d2bd0 100644
--- a/src/vidalia/res/credits.html
+++ b/src/vidalia/res/credits.html
@@ -4,6 +4,7 @@
<ul>
<li>Matt Edman</li>
<li>Justin Hipple (<i>retired</i>)</li>
+ <li>Tomás Touceda</li>
</ul>
<h3>Contributors</h3>
diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc
index cfb1004..aa5cfe1 100644
--- a/src/vidalia/res/vidalia.qrc
+++ b/src/vidalia/res/vidalia.qrc
@@ -27,6 +27,7 @@
<file>16x16/utilities-log-viewer.png</file>
<file>16x16/utilities-system-monitor.png</file>
<file>16x16/view-media-artist.png</file>
+ <file>16x16/detach-arrow.png</file>
</qresource>
<qresource prefix="/images">
<file>22x22/edit_undo.png</file>
--
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